1 files changed, 26 insertions, 24 deletions
diff --git a/xfa/fwl/lightwidget/cfwl_widget.h b/xfa/fwl/lightwidget/cfwl_widget.h
index 5ec370ecea..fd30b71b4c 100644
--- a/xfa/fwl/lightwidget/cfwl_widget.h
+++ b/xfa/fwl/lightwidget/cfwl_widget.h
@@ -21,41 +21,43 @@ class CFWL_Widget {
  public:
   virtual ~CFWL_Widget();
   IFWL_Widget* GetWidget();
-  FWL_ERR GetClassName(CFX_WideString& wsClass) const;
+  FWL_Error GetClassName(CFX_WideString& wsClass) const;
   uint32_t GetClassID() const;
   virtual FX_BOOL IsInstance(const CFX_WideStringC& wsClass) const;
 
-  FWL_ERR GetWidgetRect(CFX_RectF& rect, FX_BOOL bAutoSize = FALSE);
-  FWL_ERR GetGlobalRect(CFX_RectF& rect);
-  FWL_ERR SetWidgetRect(const CFX_RectF& rect);
-  FWL_ERR GetClientRect(CFX_RectF& rtClient);
+  FWL_Error GetWidgetRect(CFX_RectF& rect, FX_BOOL bAutoSize = FALSE);
+  FWL_Error GetGlobalRect(CFX_RectF& rect);
+  FWL_Error SetWidgetRect(const CFX_RectF& rect);
+  FWL_Error GetClientRect(CFX_RectF& rtClient);
   CFWL_Widget* GetParent();
-  FWL_ERR SetParent(CFWL_Widget* pParent);
+  FWL_Error SetParent(CFWL_Widget* pParent);
   CFWL_Widget* GetOwner();
-  FWL_ERR SetOwner(CFWL_Widget* pOwner);
+  FWL_Error SetOwner(CFWL_Widget* pOwner);
   uint32_t GetStyles();
-  FWL_ERR ModifyStyles(uint32_t dwStylesAdded, uint32_t dwStylesRemoved);
+  FWL_Error ModifyStyles(uint32_t dwStylesAdded, uint32_t dwStylesRemoved);
   uint32_t GetStylesEx();
-  FWL_ERR ModifyStylesEx(uint32_t dwStylesExAdded, uint32_t dwStylesExRemoved);
+  FWL_Error ModifyStylesEx(uint32_t dwStylesExAdded,
+                           uint32_t dwStylesExRemoved);
   uint32_t GetStates();
   void SetStates(uint32_t dwStates, FX_BOOL bSet = TRUE);
-  FWL_ERR SetPrivateData(void* module_id,
-                         void* pData,
-                         PD_CALLBACK_FREEDATA callback);
+  FWL_Error SetPrivateData(void* module_id,
+                           void* pData,
+                           PD_CALLBACK_FREEDATA callback);
   void* GetPrivateData(void* module_id);
-  FWL_ERR Update();
-  FWL_ERR LockUpdate();
-  FWL_ERR UnlockUpdate();
+  FWL_Error Update();
+  FWL_Error LockUpdate();
+  FWL_Error UnlockUpdate();
   FWL_WidgetHit HitTest(FX_FLOAT fx, FX_FLOAT fy);
-  FWL_ERR TransformTo(CFWL_Widget* pWidget, FX_FLOAT& fx, FX_FLOAT& fy);
-  FWL_ERR TransformTo(CFWL_Widget* pWidget, CFX_RectF& rt);
-  FWL_ERR GetMatrix(CFX_Matrix& matrix, FX_BOOL bGlobal = FALSE);
-  FWL_ERR SetMatrix(const CFX_Matrix& matrix);
-  FWL_ERR DrawWidget(CFX_Graphics* pGraphics, const CFX_Matrix* pMatrix = NULL);
+  FWL_Error TransformTo(CFWL_Widget* pWidget, FX_FLOAT& fx, FX_FLOAT& fy);
+  FWL_Error TransformTo(CFWL_Widget* pWidget, CFX_RectF& rt);
+  FWL_Error GetMatrix(CFX_Matrix& matrix, FX_BOOL bGlobal = FALSE);
+  FWL_Error SetMatrix(const CFX_Matrix& matrix);
+  FWL_Error DrawWidget(CFX_Graphics* pGraphics,
+                       const CFX_Matrix* pMatrix = NULL);
   IFWL_WidgetDelegate* SetDelegate(IFWL_WidgetDelegate* pDelegate);
-  FWL_ERR Repaint(const CFX_RectF* pRect = NULL);
-  FWL_ERR SetFocus(FX_BOOL bFocus);
-  FWL_ERR SetGrab(FX_BOOL bSet);
+  FWL_Error Repaint(const CFX_RectF* pRect = NULL);
+  FWL_Error SetFocus(FX_BOOL bFocus);
+  FWL_Error SetGrab(FX_BOOL bSet);
   CFWL_Widget();
 
   void RegisterEventTarget(CFWL_Widget* pEventSource = NULL,
@@ -70,7 +72,7 @@ class CFWL_Widget {
   CFWL_WidgetProperties* m_pProperties;
 
  protected:
-  FWL_ERR Initialize(const CFWL_WidgetProperties* pProperties = NULL);
+  FWL_Error Initialize(const CFWL_WidgetProperties* pProperties = NULL);
 };
 
 #endif  // XFA_FWL_LIGHTWIDGET_CFWL_WIDGET_H_