diff options
author | Dan Sinclair <dsinclair@chromium.org> | 2017-09-21 15:25:32 -0400 |
---|---|---|
committer | Chromium commit bot <commit-bot@chromium.org> | 2017-09-21 19:41:49 +0000 |
commit | 65ecca4bc9c8e043b355c459486870ac1518095d (patch) | |
tree | 2cca0a32a7873f2743e9d927010533019e4c85b9 /fpdfsdk | |
parent | 3418f710f923785a0fd05f7c556d09bc9a8d3447 (diff) | |
download | pdfium-65ecca4bc9c8e043b355c459486870ac1518095d.tar.xz |
Move CFX_Observable to Observable
This CL renames CFX_Observable to Observable and moves into the fxcrt
namespace.
The test suite names were updated to ObservedPtr from fxcrt.
Bug: pdfium:898
Change-Id: Ia507482bc0a1d6d8bbf12c0c55c4a88f6c8910e2
Reviewed-on: https://pdfium-review.googlesource.com/14615
Reviewed-by: Tom Sepez <tsepez@chromium.org>
Commit-Queue: dsinclair <dsinclair@chromium.org>
Diffstat (limited to 'fpdfsdk')
-rw-r--r-- | fpdfsdk/cpdfsdk_annot.h | 4 | ||||
-rw-r--r-- | fpdfsdk/cpdfsdk_formfillenvironment.h | 4 | ||||
-rw-r--r-- | fpdfsdk/fpdfxfa/cpdfxfa_context.h | 4 | ||||
-rw-r--r-- | fpdfsdk/javascript/Field.h | 2 | ||||
-rw-r--r-- | fpdfsdk/javascript/cjs_runtime.h | 4 | ||||
-rw-r--r-- | fpdfsdk/pwl/cpwl_wnd.cpp | 2 | ||||
-rw-r--r-- | fpdfsdk/pwl/cpwl_wnd.h | 6 |
7 files changed, 13 insertions, 13 deletions
diff --git a/fpdfsdk/cpdfsdk_annot.h b/fpdfsdk/cpdfsdk_annot.h index 47049556cc..325b4298ef 100644 --- a/fpdfsdk/cpdfsdk_annot.h +++ b/fpdfsdk/cpdfsdk_annot.h @@ -10,8 +10,8 @@ #include "core/fpdfdoc/cpdf_aaction.h" #include "core/fpdfdoc/cpdf_annot.h" #include "core/fpdfdoc/cpdf_defaultappearance.h" -#include "core/fxcrt/cfx_observable.h" #include "core/fxcrt/cfx_unowned_ptr.h" +#include "core/fxcrt/observable.h" #include "fpdfsdk/cfx_systemhandler.h" #include "fpdfsdk/fsdk_common.h" #include "fpdfsdk/fsdk_define.h" @@ -22,7 +22,7 @@ class CPDF_Page; class CPDF_RenderOptions; class CPDFSDK_PageView; -class CPDFSDK_Annot : public CFX_Observable<CPDFSDK_Annot> { +class CPDFSDK_Annot : public Observable<CPDFSDK_Annot> { public: explicit CPDFSDK_Annot(CPDFSDK_PageView* pPageView); virtual ~CPDFSDK_Annot(); diff --git a/fpdfsdk/cpdfsdk_formfillenvironment.h b/fpdfsdk/cpdfsdk_formfillenvironment.h index 9e3c92561b..ea7b3c7e38 100644 --- a/fpdfsdk/cpdfsdk_formfillenvironment.h +++ b/fpdfsdk/cpdfsdk_formfillenvironment.h @@ -14,7 +14,7 @@ #include "core/fpdfapi/page/cpdf_page.h" #include "core/fpdfapi/parser/cpdf_document.h" #include "core/fpdfdoc/cpdf_occontext.h" -#include "core/fxcrt/cfx_observable.h" +#include "core/fxcrt/observable.h" #include "fpdfsdk/cfx_systemhandler.h" #include "fpdfsdk/cpdfsdk_annot.h" #include "fpdfsdk/fsdk_define.h" @@ -41,7 +41,7 @@ class IJS_Runtime; // lingering lifetime issues via the memory tools. class CPDFSDK_FormFillEnvironment - : public CFX_Observable<CPDFSDK_FormFillEnvironment> { + : public Observable<CPDFSDK_FormFillEnvironment> { public: CPDFSDK_FormFillEnvironment(UnderlyingDocumentType* pDoc, FPDF_FORMFILLINFO* pFFinfo); diff --git a/fpdfsdk/fpdfxfa/cpdfxfa_context.h b/fpdfsdk/fpdfxfa/cpdfxfa_context.h index a0f90ab37b..0dbc51e54b 100644 --- a/fpdfsdk/fpdfxfa/cpdfxfa_context.h +++ b/fpdfsdk/fpdfxfa/cpdfxfa_context.h @@ -10,9 +10,9 @@ #include <memory> #include <vector> -#include "core/fxcrt/cfx_observable.h" #include "core/fxcrt/cfx_unowned_ptr.h" #include "core/fxcrt/fx_system.h" +#include "core/fxcrt/observable.h" #include "fpdfsdk/fpdfxfa/cpdfxfa_docenvironment.h" #include "fpdfsdk/fpdfxfa/cpdfxfa_page.h" #include "xfa/fxfa/cxfa_ffdoc.h" @@ -104,7 +104,7 @@ class CPDFXFA_Context : public IXFA_AppProvider { XFA_DocType m_iDocType; std::unique_ptr<CPDF_Document> m_pPDFDoc; std::unique_ptr<CXFA_FFDoc> m_pXFADoc; - CFX_Observable<CPDFSDK_FormFillEnvironment>::ObservedPtr m_pFormFillEnv; + Observable<CPDFSDK_FormFillEnvironment>::ObservedPtr m_pFormFillEnv; CFX_UnownedPtr<CXFA_FFDocView> m_pXFADocView; std::unique_ptr<CXFA_FFApp> m_pXFAApp; std::unique_ptr<CJS_Runtime> m_pRuntime; diff --git a/fpdfsdk/javascript/Field.h b/fpdfsdk/javascript/Field.h index 2ca1da4491..69e27d0639 100644 --- a/fpdfsdk/javascript/Field.h +++ b/fpdfsdk/javascript/Field.h @@ -10,7 +10,7 @@ #include <string> #include <vector> -#include "core/fxcrt/cfx_observable.h" +#include "core/fxcrt/observable.h" #include "core/fxge/cfx_color.h" #include "fpdfsdk/cpdfsdk_formfillenvironment.h" #include "fpdfsdk/javascript/JS_Define.h" diff --git a/fpdfsdk/javascript/cjs_runtime.h b/fpdfsdk/javascript/cjs_runtime.h index 39919957f8..0d6951f8c0 100644 --- a/fpdfsdk/javascript/cjs_runtime.h +++ b/fpdfsdk/javascript/cjs_runtime.h @@ -13,7 +13,7 @@ #include <utility> #include <vector> -#include "core/fxcrt/cfx_observable.h" +#include "core/fxcrt/observable.h" #include "fpdfsdk/cpdfsdk_formfillenvironment.h" #include "fpdfsdk/javascript/JS_EventHandler.h" #include "fpdfsdk/javascript/ijs_runtime.h" @@ -23,7 +23,7 @@ class CJS_EventContext; class CJS_Runtime : public IJS_Runtime, public CFXJS_Engine, - public CFX_Observable<CJS_Runtime> { + public Observable<CJS_Runtime> { public: using FieldEvent = std::pair<WideString, JS_EVENT_T>; diff --git a/fpdfsdk/pwl/cpwl_wnd.cpp b/fpdfsdk/pwl/cpwl_wnd.cpp index 4e4abd2017..9abe03c3fb 100644 --- a/fpdfsdk/pwl/cpwl_wnd.cpp +++ b/fpdfsdk/pwl/cpwl_wnd.cpp @@ -46,7 +46,7 @@ CPWL_Wnd::CreateParams::CreateParams(const CreateParams& other) = default; CPWL_Wnd::CreateParams::~CreateParams() = default; -class CPWL_MsgControl : public CFX_Observable<CPWL_MsgControl> { +class CPWL_MsgControl : public Observable<CPWL_MsgControl> { friend class CPWL_Wnd; public: diff --git a/fpdfsdk/pwl/cpwl_wnd.h b/fpdfsdk/pwl/cpwl_wnd.h index 17ed06450a..ecef1e2e10 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_observable.h" #include "core/fxcrt/cfx_unowned_ptr.h" +#include "core/fxcrt/observable.h" #include "core/fxge/cfx_color.h" #include "fpdfsdk/cpdfsdk_formfillenvironment.h" #include "fpdfsdk/cpdfsdk_widget.h" @@ -100,14 +100,14 @@ inline bool operator!=(const CFX_Color& c1, const CFX_Color& c2) { #define PWL_DEFAULT_BLACKCOLOR CFX_Color(COLORTYPE_GRAY, 0) #define PWL_DEFAULT_WHITECOLOR CFX_Color(COLORTYPE_GRAY, 1) -class CPWL_Wnd : public CPWL_TimerHandler, public CFX_Observable<CPWL_Wnd> { +class CPWL_Wnd : public CPWL_TimerHandler, public Observable<CPWL_Wnd> { public: class PrivateData { protected: ~PrivateData() {} }; - class ProviderIface : public CFX_Observable<ProviderIface> { + class ProviderIface : public Observable<ProviderIface> { public: virtual ~ProviderIface() {} |