| Index: xfa/fwl/theme/cfwl_widgettp.h
 | 
| diff --git a/xfa/fwl/theme/cfwl_widgettp.h b/xfa/fwl/theme/cfwl_widgettp.h
 | 
| index ddd504b05040dbb92c18afa9666ed2e606e35bf6..02f39810772c11ad05e1af09566e0d57b74b01fc 100644
 | 
| --- a/xfa/fwl/theme/cfwl_widgettp.h
 | 
| +++ b/xfa/fwl/theme/cfwl_widgettp.h
 | 
| @@ -107,36 +107,36 @@ class CFWL_WidgetTP {
 | 
|   public:
 | 
|    virtual ~CFWL_WidgetTP();
 | 
|  
 | 
| -  virtual FWL_Error Initialize();
 | 
| -  virtual FWL_Error Finalize();
 | 
| +  virtual void Initialize();
 | 
| +  virtual void Finalize();
 | 
|  
 | 
|    virtual bool IsValidWidget(IFWL_Widget* pWidget);
 | 
|    virtual uint32_t GetThemeID(IFWL_Widget* pWidget);
 | 
|    virtual uint32_t SetThemeID(IFWL_Widget* pWidget, uint32_t dwThemeID);
 | 
| -  virtual FWL_Error GetThemeMatrix(IFWL_Widget* pWidget, CFX_Matrix& matrix);
 | 
| -  virtual FWL_Error SetThemeMatrix(IFWL_Widget* pWidget,
 | 
| -                                   const CFX_Matrix& matrix);
 | 
| -  virtual FX_BOOL DrawBackground(CFWL_ThemeBackground* pParams);
 | 
| -  virtual FX_BOOL DrawText(CFWL_ThemeText* pParams);
 | 
| +
 | 
| +  virtual void DrawBackground(CFWL_ThemeBackground* pParams);
 | 
| +  virtual void DrawText(CFWL_ThemeText* pParams);
 | 
|    virtual void* GetCapacity(CFWL_ThemePart* pThemePart,
 | 
|                              CFWL_WidgetCapacity dwCapacity);
 | 
| -  virtual FX_BOOL IsCustomizedLayout(IFWL_Widget* pWidget);
 | 
| -  virtual FX_BOOL CalcTextRect(CFWL_ThemeText* pParams, CFX_RectF& rect);
 | 
| +  virtual bool IsCustomizedLayout(IFWL_Widget* pWidget);
 | 
| +  virtual void CalcTextRect(CFWL_ThemeText* pParams, CFX_RectF& rect);
 | 
|  
 | 
| -  FWL_Error SetFont(IFWL_Widget* pWidget,
 | 
| -                    const FX_WCHAR* strFont,
 | 
| -                    FX_FLOAT fFontSize,
 | 
| -                    FX_ARGB rgbFont);
 | 
| -  FWL_Error SetFont(IFWL_Widget* pWidget,
 | 
| -                    CFGAS_GEFont* pFont,
 | 
| -                    FX_FLOAT fFontSize,
 | 
| -                    FX_ARGB rgbFont);
 | 
| +  void SetFont(IFWL_Widget* pWidget,
 | 
| +               const FX_WCHAR* strFont,
 | 
| +               FX_FLOAT fFontSize,
 | 
| +               FX_ARGB rgbFont);
 | 
| +  void SetFont(IFWL_Widget* pWidget,
 | 
| +               CFGAS_GEFont* pFont,
 | 
| +               FX_FLOAT fFontSize,
 | 
| +               FX_ARGB rgbFont);
 | 
|    CFGAS_GEFont* GetFont(IFWL_Widget* pWidget);
 | 
|  
 | 
|   protected:
 | 
|    CFWL_WidgetTP();
 | 
| -  FWL_Error InitTTO();
 | 
| -  FWL_Error FinalizeTTO();
 | 
| +
 | 
| +  void InitTTO();
 | 
| +  void FinalizeTTO();
 | 
| +
 | 
|    void DrawEdge(CFX_Graphics* pGraphics,
 | 
|                  uint32_t dwStyles,
 | 
|                  const CFX_RectF* pRect,
 | 
| @@ -219,7 +219,6 @@ class CFWL_WidgetTP {
 | 
|    uint32_t m_dwValue;
 | 
|    CFX_RectF m_rtMargin;
 | 
|    uint32_t m_dwThemeID;
 | 
| -  CFX_Matrix _ctm;
 | 
|  };
 | 
|  
 | 
|  void FWLTHEME_Release();
 | 
| 
 |