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 /xfa | |
| 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 'xfa')
| -rw-r--r-- | xfa/fgas/font/cfgas_fontmgr.h | 6 | ||||
| -rw-r--r-- | xfa/fgas/font/cfgas_pdffontmgr.h | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/xfa/fgas/font/cfgas_fontmgr.h b/xfa/fgas/font/cfgas_fontmgr.h index 946486be2a..642ba6fb67 100644 --- a/xfa/fgas/font/cfgas_fontmgr.h +++ b/xfa/fgas/font/cfgas_fontmgr.h @@ -14,10 +14,10 @@ #include <vector> #include "core/fxcrt/cfx_crtfileaccess.h" -#include "core/fxcrt/cfx_observable.h" #include "core/fxcrt/cfx_retain_ptr.h" #include "core/fxcrt/cfx_seekablestreamproxy.h" #include "core/fxcrt/fx_extension.h" +#include "core/fxcrt/observable.h" #include "core/fxge/cfx_fontmapper.h" #include "core/fxge/fx_freetype.h" #include "core/fxge/ifx_systemfontinfo.h" @@ -81,7 +81,7 @@ typedef void (*FX_LPEnumAllFonts)(std::deque<FX_FONTDESCRIPTOR>* fonts, FX_LPEnumAllFonts FX_GetDefFontEnumerator(); -class CFGAS_FontMgr : public CFX_Observable<CFGAS_FontMgr> { +class CFGAS_FontMgr : public Observable<CFGAS_FontMgr> { public: static std::unique_ptr<CFGAS_FontMgr> Create(FX_LPEnumAllFonts pEnumerator); @@ -180,7 +180,7 @@ class CFX_FontSourceEnum_File { std::vector<ByteString> m_FolderPaths; }; -class CFGAS_FontMgr : public CFX_Observable<CFGAS_FontMgr> { +class CFGAS_FontMgr : public Observable<CFGAS_FontMgr> { public: static std::unique_ptr<CFGAS_FontMgr> Create( CFX_FontSourceEnum_File* pFontEnum); diff --git a/xfa/fgas/font/cfgas_pdffontmgr.h b/xfa/fgas/font/cfgas_pdffontmgr.h index 8a09a95bd1..a31d865cec 100644 --- a/xfa/fgas/font/cfgas_pdffontmgr.h +++ b/xfa/fgas/font/cfgas_pdffontmgr.h @@ -11,16 +11,16 @@ #include "core/fpdfapi/parser/cpdf_dictionary.h" #include "core/fpdfapi/parser/cpdf_document.h" -#include "core/fxcrt/cfx_observable.h" #include "core/fxcrt/cfx_retain_ptr.h" #include "core/fxcrt/fx_string.h" +#include "core/fxcrt/observable.h" class CFGAS_FontMgr; class CFGAS_GEFont; class CPDF_Document; class CPDF_Font; -class CFGAS_PDFFontMgr : public CFX_Observable<CFGAS_PDFFontMgr> { +class CFGAS_PDFFontMgr : public Observable<CFGAS_PDFFontMgr> { public: explicit CFGAS_PDFFontMgr(CPDF_Document* pDoc, CFGAS_FontMgr* pFontMgr); ~CFGAS_PDFFontMgr(); |