Remove FWL globals.

xfa/fwl/core/ifwl_widget.h

 // Copyright 2014 PDFium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
 #ifndef XFA_FWL_CORE_IFWL_WIDGET_H_
 #define XFA_FWL_CORE_IFWL_WIDGET_H_
 
 #include <memory>
@@ skipping 48 matching lines @@
 class IFWL_App;
 class IFWL_DataProvider;
 class IFWL_ThemeProvider;
 class IFWL_Widget;
 enum class FWL_Type;
 
 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;
 
   virtual FWL_Error GetWidgetRect(CFX_RectF& rect, FX_BOOL bAutoSize = FALSE);
   virtual FWL_Error GetGlobalRect(CFX_RectF& rect);
   virtual FWL_Error SetWidgetRect(const CFX_RectF& rect);
   virtual FWL_Error GetClientRect(CFX_RectF& rect);
 
   virtual IFWL_Widget* GetParent();
@@ skipping 27 matching lines @@
 
   virtual FWL_Error GetMatrix(CFX_Matrix& matrix, FX_BOOL bGlobal = FALSE);
   virtual FWL_Error SetMatrix(const CFX_Matrix& matrix);
 
   virtual FWL_Error DrawWidget(CFX_Graphics* pGraphics,
                                const CFX_Matrix* pMatrix = nullptr);
 
   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;
   void SetEventKey(uint32_t key);
 
   void* GetLayoutItem() const;
   void SetLayoutItem(void* pItem);
 
   void SetAssociateWidget(CFWL_Widget* pAssociate);
 
  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;
   FX_BOOL IsActive() const;
   FX_BOOL IsOverLapper() const;
   FX_BOOL IsPopup() const;
   FX_BOOL IsChild() const;
   FX_BOOL IsLocked() const;
   FX_BOOL IsOffscreen() const;
   FX_BOOL HasBorder() const;
@@ skipping 48 matching lines @@
                   IFWL_ThemeProvider* pTheme,
                   const CFX_Matrix* pMatrix = nullptr);
   void DrawEdge(CFX_Graphics* pGraphics,
                 CFWL_Part iPartEdge,
                 IFWL_ThemeProvider* pTheme,
                 const CFX_Matrix* pMatrix = nullptr);
   void NotifyDriver();
 
   FX_BOOL IsParent(IFWL_Widget* pParent);
 
+  const IFWL_App* m_pOwnerApp;

[Tom Sepez, 2016/10/28 23:11:47]

nit: is this const IFWL_App* const m_pOwnerApp; ?

[dsinclair, 2016/10/31 14:13:18]

Done.   C++, just add const before every symbol .....

   CFWL_WidgetMgr* const m_pWidgetMgr;
-  IFWL_App* m_pOwnerApp;
   std::unique_ptr<CFWL_WidgetImpProperties> m_pProperties;
   IFWL_WidgetDelegate* m_pDelegate;
   IFWL_WidgetDelegate* m_pCurDelegate;
   IFWL_Widget* m_pOuter;
   void* m_pLayoutItem;
   CFWL_Widget* m_pAssociate;
   int32_t m_iLock;
   uint32_t m_nEventKey;
 };
 
 class CFWL_WidgetImpDelegate : public IFWL_WidgetDelegate {
  public:
   CFWL_WidgetImpDelegate();
   ~CFWL_WidgetImpDelegate() override {}
   void OnProcessMessage(CFWL_Message* pMessage) override;
   void OnProcessEvent(CFWL_Event* pEvent) override;
   void OnDrawWidget(CFX_Graphics* pGraphics,
                     const CFX_Matrix* pMatrix = nullptr) override;
 };
 
 #endif  // XFA_FWL_CORE_IFWL_WIDGET_H_