summaryrefslogtreecommitdiff
path: root/xfa/fxfa/app/xfa_fwltheme.h
diff options
context:
space:
mode:
authortsepez <tsepez@chromium.org>2016-05-18 14:01:15 -0700
committerCommit bot <commit-bot@chromium.org>2016-05-18 14:01:16 -0700
commit0aae2a773cf51632b7808ab0e5b5c1635cf6a5fa (patch)
tree44ab45c6fba0487bb776fffb4dafe198fe8dbb32 /xfa/fxfa/app/xfa_fwltheme.h
parentf1a52caa6756049922a16203c9a0faee92cc07c3 (diff)
downloadpdfium-0aae2a773cf51632b7808ab0e5b5c1635cf6a5fa.tar.xz
Remove Release() from CXFA_FWLTheme
Cleanup virtual overrides along the way. Add final to other class deriving from pure virtual interface. Review-Url: https://codereview.chromium.org/1988373002
Diffstat (limited to 'xfa/fxfa/app/xfa_fwltheme.h')
-rw-r--r--xfa/fxfa/app/xfa_fwltheme.h59
1 files changed, 29 insertions, 30 deletions
diff --git a/xfa/fxfa/app/xfa_fwltheme.h b/xfa/fxfa/app/xfa_fwltheme.h
index 319df8dfa5..1f75e90437 100644
--- a/xfa/fxfa/app/xfa_fwltheme.h
+++ b/xfa/fxfa/app/xfa_fwltheme.h
@@ -24,47 +24,46 @@
#include "xfa/fwl/theme/cfwl_widgettp.h"
#include "xfa/fxfa/include/xfa_ffapp.h"
-class CXFA_FWLTheme : public IFWL_ThemeProvider {
+class CXFA_FWLTheme final : public IFWL_ThemeProvider {
public:
CXFA_FWLTheme(CXFA_FFApp* pApp);
- virtual ~CXFA_FWLTheme();
- virtual FWL_Error Release() {
- delete this;
- return FWL_Error::Succeeded;
- }
- virtual IFWL_Widget* Retain() { return NULL; }
- virtual FWL_Error GetClassName(CFX_WideString& wsClass) const {
+ ~CXFA_FWLTheme() override;
+
+ FWL_Error GetClassName(CFX_WideString& wsClass) const {
return FWL_Error::Succeeded;
}
- virtual uint32_t GetHashCode() const { return 0; }
- virtual FWL_Error Initialize();
- virtual FWL_Error Finalize();
- virtual bool IsValidWidget(IFWL_Widget* pWidget);
- virtual uint32_t GetThemeID(IFWL_Widget* pWidget);
- virtual uint32_t SetThemeID(IFWL_Widget* pWidget,
- uint32_t dwThemeID,
- FX_BOOL bChildren = TRUE);
- virtual FX_BOOL DrawBackground(CFWL_ThemeBackground* pParams);
- virtual FX_BOOL DrawText(CFWL_ThemeText* pParams);
- virtual void* GetCapacity(CFWL_ThemePart* pThemePart,
- CFWL_WidgetCapacity dwCapacity);
- virtual FX_BOOL IsCustomizedLayout(IFWL_Widget* pWidget);
- virtual FWL_Error GetPartRect(CFWL_ThemePart* pThemePart);
- virtual FX_BOOL IsInPart(CFWL_ThemePart* pThemePart,
- FX_FLOAT fx,
- FX_FLOAT fy);
+ uint32_t GetHashCode() const { return 0; }
+ FWL_Error Initialize();
+ FWL_Error Finalize();
- virtual FX_BOOL CalcTextRect(CFWL_ThemeText* pParams, CFX_RectF& rect);
- virtual FWL_Error GetThemeMatrix(IFWL_Widget* pWidget, CFX_Matrix& matrix) {
+ // IFWL_ThemeProvider:
+ bool IsValidWidget(IFWL_Widget* pWidget) override;
+ uint32_t GetThemeID(IFWL_Widget* pWidget) override;
+ uint32_t SetThemeID(IFWL_Widget* pWidget,
+ uint32_t dwThemeID,
+ FX_BOOL bChildren = TRUE) override;
+ FWL_Error GetThemeMatrix(IFWL_Widget* pWidget, CFX_Matrix& matrix) override {
return FWL_Error::Succeeded;
}
- virtual FWL_Error SetThemeMatrix(IFWL_Widget* pWidget,
- const CFX_Matrix& matrix) {
+ FWL_Error SetThemeMatrix(IFWL_Widget* pWidget,
+ const CFX_Matrix& matrix) override {
return FWL_Error::Succeeded;
}
- virtual FWL_Error GetPartRect(CFWL_ThemePart* pThemePart, CFX_RectF& rtPart) {
+ FX_BOOL DrawBackground(CFWL_ThemeBackground* pParams) override;
+ FX_BOOL DrawText(CFWL_ThemeText* pParams) override;
+ void* GetCapacity(CFWL_ThemePart* pThemePart,
+ CFWL_WidgetCapacity dwCapacity) override;
+ FX_BOOL IsCustomizedLayout(IFWL_Widget* pWidget) override;
+ FWL_Error GetPartRect(CFWL_ThemePart* pThemePart,
+ CFX_RectF& rtPart) override {
return FWL_Error::Succeeded;
}
+ FX_BOOL IsInPart(CFWL_ThemePart* pThemePart,
+ FX_FLOAT fx,
+ FX_FLOAT fy) override;
+ FX_BOOL CalcTextRect(CFWL_ThemeText* pParams, CFX_RectF& rect) override;
+
+ FWL_Error GetPartRect(CFWL_ThemePart* pThemePart);
protected:
CFWL_WidgetTP* GetTheme(IFWL_Widget* pWidget);