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_checkbox.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_checkbox.cpp')
| -rw-r--r-- | xfa/fwl/cfwl_checkbox.cpp | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/xfa/fwl/cfwl_checkbox.cpp b/xfa/fwl/cfwl_checkbox.cpp index d39cd534af..7e062289e0 100644 --- a/xfa/fwl/cfwl_checkbox.cpp +++ b/xfa/fwl/cfwl_checkbox.cpp @@ -65,14 +65,13 @@ void CFWL_CheckBox::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; - if (HasBorder()) { - DrawBorder(pGraphics, CFWL_Part::Border, m_pProperties->m_pThemeProvider, - matrix); - } + if (HasBorder()) + DrawBorder(pGraphics, CFWL_Part::Border, pTheme, matrix); int32_t dwStates = GetPartStates(); @@ -136,8 +135,8 @@ void CFWL_CheckBox::Layout() { CFX_RectF rtFocus(m_rtCaption.left, m_rtCaption.top, m_rtCaption.width, m_rtCaption.height); - CalcTextRect(L"Check box", m_pProperties->m_pThemeProvider, m_dwTTOStyles, - m_iTTOAlign, &rtFocus); + CalcTextRect(L"Check box", m_pProperties->m_pThemeProvider.Get(), + m_dwTTOStyles, m_iTTOAlign, &rtFocus); m_rtFocus = CFX_RectF(m_rtCaption.TopLeft(), std::max(m_rtCaption.width, rtFocus.width), |