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_combobox.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_combobox.cpp')
| -rw-r--r-- | xfa/fwl/cfwl_combobox.cpp | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/xfa/fwl/cfwl_combobox.cpp b/xfa/fwl/cfwl_combobox.cpp index 9cd2119aaf..41541c8774 100644 --- a/xfa/fwl/cfwl_combobox.cpp +++ b/xfa/fwl/cfwl_combobox.cpp @@ -98,8 +98,7 @@ FWL_WidgetHit CFWL_ComboBox::HitTest(const CFX_PointF& point) { void CFWL_ComboBox::DrawWidget(CXFA_Graphics* pGraphics, const CFX_Matrix& matrix) { - IFWL_ThemeProvider* pTheme = m_pProperties->m_pThemeProvider; - + IFWL_ThemeProvider* pTheme = m_pProperties->m_pThemeProvider.Get(); pGraphics->SaveGraphState(); pGraphics->ConcatMatrix(&matrix); if (!m_rtBtn.IsEmpty(0.1f)) { @@ -327,11 +326,10 @@ void CFWL_ComboBox::Layout() { } void CFWL_ComboBox::ResetTheme() { - IFWL_ThemeProvider* pTheme = m_pProperties->m_pThemeProvider; - if (!pTheme) { - pTheme = GetAvailableTheme(); - m_pProperties->m_pThemeProvider = pTheme; - } + if (!m_pProperties->m_pThemeProvider) + m_pProperties->m_pThemeProvider = GetAvailableTheme(); + + IFWL_ThemeProvider* pTheme = m_pProperties->m_pThemeProvider.Get(); if (m_pListBox && !m_pListBox->GetThemeProvider()) m_pListBox->SetThemeProvider(pTheme); if (m_pEdit && !m_pEdit->GetThemeProvider()) |