diff options
| author | dsinclair <dsinclair@chromium.org> | 2016-10-31 07:29:34 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2016-10-31 07:29:34 -0700 |
| commit | 20855384b8149a631c3c1d229551523c12eb767b (patch) | |
| tree | e3cef278e322742bea6c4b48f40ed580754ebd80 /xfa/fwl/core/ifwl_widget.h | |
| parent | 747dcf775c5cb661e96a639f73322cc489d8590f (diff) | |
| download | pdfium-20855384b8149a631c3c1d229551523c12eb767b.tar.xz | |
Remove FWL globals.
This CL removes the FWL_GetApp, FWL_SetApp and FWL_GetWidgetAdapter methods.
In the process it changes the various Initialize methods to return void.
Review-Url: https://codereview.chromium.org/2436103002
Diffstat (limited to 'xfa/fwl/core/ifwl_widget.h')
| -rw-r--r-- | xfa/fwl/core/ifwl_widget.h | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/xfa/fwl/core/ifwl_widget.h b/xfa/fwl/core/ifwl_widget.h index 6cb241d363..38a8d337f6 100644 --- a/xfa/fwl/core/ifwl_widget.h +++ b/xfa/fwl/core/ifwl_widget.h @@ -66,7 +66,7 @@ class IFWL_Widget { public: virtual ~IFWL_Widget(); - virtual FWL_Error Initialize(); + virtual void Initialize(); virtual void Finalize(); virtual FWL_Type GetClassID() const = 0; virtual FX_BOOL IsInstance(const CFX_WideStringC& wsClass) const; @@ -114,9 +114,9 @@ class IFWL_Widget { virtual IFWL_ThemeProvider* GetThemeProvider(); virtual FWL_Error SetThemeProvider(IFWL_ThemeProvider* pThemeProvider); virtual IFWL_WidgetDelegate* SetDelegate(IFWL_WidgetDelegate* pDelegate); - virtual IFWL_App* GetOwnerApp() const; - FWL_Error SetOwnerApp(IFWL_App* pOwnerApp); + const IFWL_App* GetOwnerApp() const; + CFX_SizeF GetOffsetFromParent(IFWL_Widget* pParent); uint32_t GetEventKey() const; @@ -130,7 +130,9 @@ class IFWL_Widget { protected: friend class CFWL_WidgetImpDelegate; - IFWL_Widget(const CFWL_WidgetImpProperties& properties, IFWL_Widget* pOuter); + IFWL_Widget(const IFWL_App* app, + const CFWL_WidgetImpProperties& properties, + IFWL_Widget* pOuter); FX_BOOL IsEnabled() const; FX_BOOL IsVisible() const; @@ -199,8 +201,8 @@ class IFWL_Widget { FX_BOOL IsParent(IFWL_Widget* pParent); + const IFWL_App* const m_pOwnerApp; CFWL_WidgetMgr* const m_pWidgetMgr; - IFWL_App* m_pOwnerApp; std::unique_ptr<CFWL_WidgetImpProperties> m_pProperties; IFWL_WidgetDelegate* m_pDelegate; IFWL_WidgetDelegate* m_pCurDelegate; |