diff options
author | Tom Sepez <tsepez@chromium.org> | 2018-10-26 23:56:27 +0000 |
---|---|---|
committer | Chromium commit bot <commit-bot@chromium.org> | 2018-10-26 23:56:27 +0000 |
commit | b7c4a0243e82f6c4ff91cd90b5bae336100c3c70 (patch) | |
tree | 782b8b225dbc01d78c0dff7b126f90f606d13fb1 /fpdfsdk/pwl/cpwl_scroll_bar.cpp | |
parent | 314380e271d0a1e3117c67cb5a417cbc5b5b81b3 (diff) | |
download | pdfium-chromium/3594.tar.xz |
Pass CreateParams to CPWL_Wnd constructor.chromium/3595chromium/3594
The previous reshuffling means we always have the create params
earlier, so pass them in at create time.
Clean up two forward declarations that were not needed as
noticed in the process.
Change-Id: I5d3861f3c1e3508e0d25950e919859244fac5f8b
Reviewed-on: https://pdfium-review.googlesource.com/c/44710
Reviewed-by: Tom Sepez <tsepez@chromium.org>
Reviewed-by: Lei Zhang <thestig@chromium.org>
Commit-Queue: Tom Sepez <tsepez@chromium.org>
Diffstat (limited to 'fpdfsdk/pwl/cpwl_scroll_bar.cpp')
-rw-r--r-- | fpdfsdk/pwl/cpwl_scroll_bar.cpp | 22 |
1 files changed, 12 insertions, 10 deletions
diff --git a/fpdfsdk/pwl/cpwl_scroll_bar.cpp b/fpdfsdk/pwl/cpwl_scroll_bar.cpp index fb2060a149..0209ba09c2 100644 --- a/fpdfsdk/pwl/cpwl_scroll_bar.cpp +++ b/fpdfsdk/pwl/cpwl_scroll_bar.cpp @@ -105,10 +105,11 @@ void PWL_SCROLL_PRIVATEDATA::SubBig() { SetPos(ScrollRange.fMin); } -CPWL_SBButton::CPWL_SBButton(std::unique_ptr<PrivateData> pAttachedData, +CPWL_SBButton::CPWL_SBButton(const CreateParams& cp, + std::unique_ptr<PrivateData> pAttachedData, PWL_SCROLLBAR_TYPE eScrollBarType, PWL_SBBUTTON_TYPE eButtonType) - : CPWL_Wnd(std::move(pAttachedData)), + : CPWL_Wnd(cp, std::move(pAttachedData)), m_eScrollBarType(eScrollBarType), m_eSBButtonType(eButtonType) {} @@ -298,9 +299,10 @@ bool CPWL_SBButton::OnMouseMove(const CFX_PointF& point, uint32_t nFlag) { return true; } -CPWL_ScrollBar::CPWL_ScrollBar(std::unique_ptr<PrivateData> pAttachedData, +CPWL_ScrollBar::CPWL_ScrollBar(const CreateParams& cp, + std::unique_ptr<PrivateData> pAttachedData, PWL_SCROLLBAR_TYPE sbType) - : CPWL_Wnd(std::move(pAttachedData)), m_sbType(sbType) {} + : CPWL_Wnd(cp, std::move(pAttachedData)), m_sbType(sbType) {} CPWL_ScrollBar::~CPWL_ScrollBar() = default; @@ -541,29 +543,29 @@ void CPWL_ScrollBar::CreateButtons(const CreateParams& cp) { PWS_VISIBLE | PWS_CHILD | PWS_BORDER | PWS_BACKGROUND | PWS_NOREFRESHCLIP; if (!m_pMinButton) { - auto pButton = pdfium::MakeUnique<CPWL_SBButton>(CloneAttachedData(), + auto pButton = pdfium::MakeUnique<CPWL_SBButton>(scp, CloneAttachedData(), m_sbType, PSBT_MIN); m_pMinButton = pButton.get(); AddChild(std::move(pButton)); - m_pMinButton->Realize(scp); + m_pMinButton->Realize(); } if (!m_pMaxButton) { - auto pButton = pdfium::MakeUnique<CPWL_SBButton>(CloneAttachedData(), + auto pButton = pdfium::MakeUnique<CPWL_SBButton>(scp, CloneAttachedData(), m_sbType, PSBT_MAX); m_pMaxButton = pButton.get(); AddChild(std::move(pButton)); - m_pMaxButton->Realize(scp); + m_pMaxButton->Realize(); } if (!m_pPosButton) { - auto pButton = pdfium::MakeUnique<CPWL_SBButton>(CloneAttachedData(), + auto pButton = pdfium::MakeUnique<CPWL_SBButton>(scp, CloneAttachedData(), m_sbType, PSBT_POS); m_pPosButton = pButton.get(); ObservedPtr thisObserved(this); if (m_pPosButton->SetVisible(false) && thisObserved) { AddChild(std::move(pButton)); - m_pPosButton->Realize(scp); + m_pPosButton->Realize(); } } } |