diff options
author | Tom Sepez <tsepez@chromium.org> | 2018-08-21 23:07:21 +0000 |
---|---|---|
committer | Chromium commit bot <commit-bot@chromium.org> | 2018-08-21 23:07:21 +0000 |
commit | bcdbeaea96d53800ee806f463108f54f79a19347 (patch) | |
tree | e302a98da36cd67b709c6d75a4940c2975edfa0e /xfa/fwl/cfwl_widget.h | |
parent | 1a3e186e975aa8eb6a6e42f2626b6f8ca980db19 (diff) | |
download | pdfium-bcdbeaea96d53800ee806f463108f54f79a19347.tar.xz |
Use UnownedPtr<> to theme provider in cfwl_widgetproperties.h
Mark two other fields which must remain raw.
Change-Id: Idcd9b074aad23f35dc6607feeaa4fa6701efffaa
Reviewed-on: https://pdfium-review.googlesource.com/40916
Reviewed-by: Lei Zhang <thestig@chromium.org>
Commit-Queue: Tom Sepez <tsepez@chromium.org>
Diffstat (limited to 'xfa/fwl/cfwl_widget.h')
-rw-r--r-- | xfa/fwl/cfwl_widget.h | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/xfa/fwl/cfwl_widget.h b/xfa/fwl/cfwl_widget.h index 59cdb60826..13b06a9b49 100644 --- a/xfa/fwl/cfwl_widget.h +++ b/xfa/fwl/cfwl_widget.h @@ -16,6 +16,7 @@ #include "xfa/fwl/cfwl_event.h" #include "xfa/fwl/cfwl_themepart.h" #include "xfa/fwl/cfwl_widgetmgr.h" +#include "xfa/fwl/cfwl_widgetproperties.h" #include "xfa/fwl/fwl_widgethit.h" #include "xfa/fwl/ifwl_widgetdelegate.h" @@ -44,7 +45,6 @@ class CFWL_AppImp; class CFWL_MessageKey; class CFWL_Widget; class CFWL_WidgetMgr; -class CFWL_WidgetProperties; class CXFA_FFWidget; class IFWL_ThemeProvider; @@ -93,8 +93,10 @@ class CFWL_Widget : public IFWL_WidgetDelegate { } CFX_PointF TransformTo(CFWL_Widget* pWidget, const CFX_PointF& point); - CFX_Matrix GetMatrix(); - IFWL_ThemeProvider* GetThemeProvider() const; + CFX_Matrix GetMatrix() const; + IFWL_ThemeProvider* GetThemeProvider() const { + return m_pProperties->m_pThemeProvider.Get(); + } void SetDelegate(IFWL_WidgetDelegate* delegate) { m_pDelegate = delegate; } IFWL_WidgetDelegate* GetDelegate() { @@ -150,7 +152,7 @@ class CFWL_Widget : public IFWL_WidgetDelegate { int32_t m_iLock; private: - CFWL_Widget* GetParent() { return m_pWidgetMgr->GetParentWidget(this); } + CFWL_Widget* GetParent() const { return m_pWidgetMgr->GetParentWidget(this); } CFX_SizeF GetOffsetFromParent(CFWL_Widget* pParent); bool IsVisible() const; |