summaryrefslogtreecommitdiff
path: root/fpdfsdk/pwl/cpwl_wnd.h
diff options
context:
space:
mode:
authorDan Sinclair <dsinclair@chromium.org>2017-09-21 16:53:58 -0400
committerChromium commit bot <commit-bot@chromium.org>2017-09-21 21:25:26 +0000
commitaee0db0e6a12bdaacebeb8fb791f4e0d45e18a0d (patch)
tree1e14d60adcffeb0791a0a6c8792d3e9c0109384e /fpdfsdk/pwl/cpwl_wnd.h
parent8e9e3d8975eeea3429c3b3ea703f04ac34e20e28 (diff)
downloadpdfium-aee0db0e6a12bdaacebeb8fb791f4e0d45e18a0d.tar.xz
Move CFX_UnownedPtr to UnownedPtr
This CL moves CFX_UnownedPtr to UnownedPtr and places in the fxcrt namespace. Bug: pdfium:898 Change-Id: I6d1fa463f365e5cb3aafa8c8a7a5f7eff62ed8e0 Reviewed-on: https://pdfium-review.googlesource.com/14620 Reviewed-by: Tom Sepez <tsepez@chromium.org> Commit-Queue: dsinclair <dsinclair@chromium.org>
Diffstat (limited to 'fpdfsdk/pwl/cpwl_wnd.h')
-rw-r--r--fpdfsdk/pwl/cpwl_wnd.h8
1 files changed, 4 insertions, 4 deletions
diff --git a/fpdfsdk/pwl/cpwl_wnd.h b/fpdfsdk/pwl/cpwl_wnd.h
index ecef1e2e10..11b62b337c 100644
--- a/fpdfsdk/pwl/cpwl_wnd.h
+++ b/fpdfsdk/pwl/cpwl_wnd.h
@@ -11,8 +11,8 @@
#include <vector>
#include "core/fpdfdoc/cpdf_formcontrol.h"
-#include "core/fxcrt/cfx_unowned_ptr.h"
#include "core/fxcrt/observable.h"
+#include "core/fxcrt/unowned_ptr.h"
#include "core/fxge/cfx_color.h"
#include "fpdfsdk/cpdfsdk_formfillenvironment.h"
#include "fpdfsdk/cpdfsdk_widget.h"
@@ -131,7 +131,7 @@ class CPWL_Wnd : public CPWL_TimerHandler, public Observable<CPWL_Wnd> {
CFX_SystemHandler* pSystemHandler; // required
IPVT_FontMap* pFontMap; // required
ProviderIface::ObservedPtr pProvider; // required
- CFX_UnownedPtr<FocusHandlerIface> pFocusHandler; // optional
+ UnownedPtr<FocusHandlerIface> pFocusHandler; // optional
uint32_t dwFlags; // optional
CFX_Color sBackgroundColor; // optional
CPDFSDK_Widget::ObservedPtr pAttachedWidget; // required
@@ -142,7 +142,7 @@ class CPWL_Wnd : public CPWL_TimerHandler, public Observable<CPWL_Wnd> {
int32_t nTransparency; // optional
float fFontSize; // optional
CPWL_Dash sDash; // optional
- CFX_UnownedPtr<PrivateData> pAttachedData; // optional
+ UnownedPtr<PrivateData> pAttachedData; // optional
CPWL_Wnd* pParentWnd; // ignore
CPWL_MsgControl* pMsgControl; // ignore
int32_t eCursorType; // ignore
@@ -311,7 +311,7 @@ class CPWL_Wnd : public CPWL_TimerHandler, public Observable<CPWL_Wnd> {
CreateParams m_CreationParams;
std::vector<CPWL_Wnd*> m_Children;
- CFX_UnownedPtr<CPWL_ScrollBar> m_pVScrollBar;
+ UnownedPtr<CPWL_ScrollBar> m_pVScrollBar;
CFX_FloatRect m_rcWindow;
CFX_FloatRect m_rcClip;
bool m_bCreated;