diff options
| author | Tom Sepez <tsepez@chromium.org> | 2018-10-26 21:27:41 +0000 |
|---|---|---|
| committer | Chromium commit bot <commit-bot@chromium.org> | 2018-10-26 21:27:41 +0000 |
| commit | 8fba261fb6584169c5788326dd49e91bc9babda5 (patch) | |
| tree | c3a66ab343f20c15427f131c320d1e77afd7aac8 /fpdfsdk/pwl/cpwl_wnd.h | |
| parent | d0ad4a785dbaf71ab0ccf626c7ef38c692484a60 (diff) | |
| download | pdfium-8fba261fb6584169c5788326dd49e91bc9babda5.tar.xz | |
Remove pParentWnd field entirely from CreateParams.
Put it into CPWL_Wnd directly, and set/clear it when a child
is added/removed from a parent.
Change-Id: I7a8cd0cf22dbd6173e64bec5d844df56ad373722
Reviewed-on: https://pdfium-review.googlesource.com/c/44692
Reviewed-by: Lei Zhang <thestig@chromium.org>
Commit-Queue: Tom Sepez <tsepez@chromium.org>
Diffstat (limited to 'fpdfsdk/pwl/cpwl_wnd.h')
| -rw-r--r-- | fpdfsdk/pwl/cpwl_wnd.h | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/fpdfsdk/pwl/cpwl_wnd.h b/fpdfsdk/pwl/cpwl_wnd.h index 8d7eebc5e9..3a4c9a5914 100644 --- a/fpdfsdk/pwl/cpwl_wnd.h +++ b/fpdfsdk/pwl/cpwl_wnd.h @@ -127,7 +127,6 @@ class CPWL_Wnd : public CPWL_TimerHandler, public Observable<CPWL_Wnd> { int32_t nTransparency; // optional float fFontSize; // optional CPWL_Dash sDash; // optional - UnownedPtr<CPWL_Wnd> pParentWnd; // ignore CPWL_MsgControl* pMsgControl; // ignore int32_t eCursorType; // ignore CFX_Matrix mtChild; // ignore @@ -215,9 +214,7 @@ class CPWL_Wnd : public CPWL_TimerHandler, public Observable<CPWL_Wnd> { void SetClipRect(const CFX_FloatRect& rect); const CFX_FloatRect& GetClipRect() const; - CPWL_Wnd* GetParentWindow() const { - return m_CreationParams.pParentWnd.Get(); - } + CPWL_Wnd* GetParentWindow() const { return m_pParent.Get(); } const PrivateData* GetAttachedData() const { return m_pAttachedData.get(); } std::unique_ptr<PrivateData> CloneAttachedData() const; @@ -308,6 +305,7 @@ class CPWL_Wnd : public CPWL_TimerHandler, public Observable<CPWL_Wnd> { CreateParams m_CreationParams; std::unique_ptr<PrivateData> m_pAttachedData; + UnownedPtr<CPWL_Wnd> m_pParent; std::vector<CPWL_Wnd*> m_Children; UnownedPtr<CPWL_ScrollBar> m_pVScrollBar; CFX_FloatRect m_rcWindow; |