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_form.cpp | |
| 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_form.cpp')
| -rw-r--r-- | xfa/fwl/cfwl_form.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/xfa/fwl/cfwl_form.cpp b/xfa/fwl/cfwl_form.cpp index f2ae46ddfd..f779c43468 100644 --- a/xfa/fwl/cfwl_form.cpp +++ b/xfa/fwl/cfwl_form.cpp @@ -76,15 +76,14 @@ FWL_WidgetHit CFWL_Form::HitTest(const CFX_PointF& point) { void CFWL_Form::DrawWidget(CXFA_Graphics* pGraphics, const CFX_Matrix& matrix) { if (!pGraphics) return; - if (!m_pProperties->m_pThemeProvider) + + IFWL_ThemeProvider* pTheme = m_pProperties->m_pThemeProvider.Get(); + if (!pTheme) return; - IFWL_ThemeProvider* pTheme = m_pProperties->m_pThemeProvider; DrawBackground(pGraphics, pTheme); -#if _FX_OS_ == _FX_OS_MACOSX_ - return; -#endif +#if _FX_OS_ != _FX_OS_MACOSX_ CFWL_ThemeBackground param; param.m_pWidget = this; param.m_dwStates = CFWL_PartState_Normal; @@ -95,6 +94,7 @@ void CFWL_Form::DrawWidget(CXFA_Graphics* pGraphics, const CFX_Matrix& matrix) { param.m_iPart = CFWL_Part::Border; pTheme->DrawBackground(¶m); } +#endif } CFWL_Widget* CFWL_Form::DoModal() { |