diff options
| author | npm <npm@chromium.org> | 2016-08-10 07:51:38 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2016-08-10 07:51:39 -0700 |
| commit | 9ada2d83cbb629f286936ebc7a208a61164f873b (patch) | |
| tree | 227aa12df825dbda00a961bd894c35d9987638f2 /core/fxge/apple | |
| parent | f3dc8c6941635e5c4cc20c8388289f6b148dc9eb (diff) | |
| download | pdfium-9ada2d83cbb629f286936ebc7a208a61164f873b.tar.xz | |
Move CFX_RenderDevice, CFX_FxgeDevice, and CFX_GraphStateData into their own files.
This is the third CL to separate fx_ge into classes, one per file.
All fx_ge.h includes had to be replaced with new includes
The method definitions for CFX_FxgeDevice were not moved to a single file.
These methods are defined in two folders different from fxge/ge, so they were left untouched for now.
Review-Url: https://codereview.chromium.org/2223213002
Diffstat (limited to 'core/fxge/apple')
| -rw-r--r-- | core/fxge/apple/apple_int.h | 2 | ||||
| -rw-r--r-- | core/fxge/apple/cfx_quartzdevice.h | 2 | ||||
| -rw-r--r-- | core/fxge/apple/fx_apple_platform.cpp | 2 | ||||
| -rw-r--r-- | core/fxge/apple/fx_mac_imp.cpp | 1 | ||||
| -rw-r--r-- | core/fxge/apple/fx_quartz_device.cpp | 3 |
5 files changed, 6 insertions, 4 deletions
diff --git a/core/fxge/apple/apple_int.h b/core/fxge/apple/apple_int.h index 56e458bba7..b81f7835d8 100644 --- a/core/fxge/apple/apple_int.h +++ b/core/fxge/apple/apple_int.h @@ -11,7 +11,9 @@ #if _FXM_PLATFORM_ == _FXM_PLATFORM_APPLE_ +#include "core/fxge/include/cfx_graphstatedata.h" #include "core/fxge/include/cfx_pathdata.h" +#include "core/fxge/include/cfx_renderdevice.h" #include "core/fxge/include/fx_dib.h" #include "core/fxge/include/ifx_renderdevicedriver.h" diff --git a/core/fxge/apple/cfx_quartzdevice.h b/core/fxge/apple/cfx_quartzdevice.h index e9261d62b8..826309f3d7 100644 --- a/core/fxge/apple/cfx_quartzdevice.h +++ b/core/fxge/apple/cfx_quartzdevice.h @@ -9,7 +9,7 @@ #if _FXM_PLATFORM_ == _FXM_PLATFORM_APPLE_ -#include "core/fxge/include/fx_ge.h" +#include "core/fxge/include/cfx_renderdevice.h" class CFX_QuartzDevice : public CFX_RenderDevice { public: diff --git a/core/fxge/apple/fx_apple_platform.cpp b/core/fxge/apple/fx_apple_platform.cpp index 744bc522d6..c02e8ae354 100644 --- a/core/fxge/apple/fx_apple_platform.cpp +++ b/core/fxge/apple/fx_apple_platform.cpp @@ -5,7 +5,6 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com #include "core/fxcrt/include/fx_system.h" -#include "core/fxge/include/fx_ge.h" #if _FXM_PLATFORM_ == _FXM_PLATFORM_APPLE_ @@ -19,6 +18,7 @@ #include "core/fxge/ge/cfx_cliprgn.h" #include "core/fxge/ge/fx_text_int.h" #include "core/fxge/include/cfx_gemodule.h" +#include "core/fxge/include/cfx_renderdevice.h" #include "core/fxge/include/fx_freetype.h" #ifndef _SKIA_SUPPORT_ diff --git a/core/fxge/apple/fx_mac_imp.cpp b/core/fxge/apple/fx_mac_imp.cpp index a14bd022ab..78bb90fdc2 100644 --- a/core/fxge/apple/fx_mac_imp.cpp +++ b/core/fxge/apple/fx_mac_imp.cpp @@ -7,7 +7,6 @@ #include "core/fxge/apple/apple_int.h" #include "core/fxge/ge/cfx_folderfontinfo.h" #include "core/fxge/include/cfx_gemodule.h" -#include "core/fxge/include/fx_ge.h" #include "core/fxge/include/ifx_systemfontinfo.h" #if _FX_OS_ == _FX_MACOSX_ diff --git a/core/fxge/apple/fx_quartz_device.cpp b/core/fxge/apple/fx_quartz_device.cpp index 46d98e0a70..c877715d11 100644 --- a/core/fxge/apple/fx_quartz_device.cpp +++ b/core/fxge/apple/fx_quartz_device.cpp @@ -14,9 +14,10 @@ #include "core/fxge/dib/dib_int.h" #include "core/fxge/ge/fx_text_int.h" #include "core/fxge/include/cfx_gemodule.h" +#include "core/fxge/include/cfx_graphstatedata.h" #include "core/fxge/include/cfx_pathdata.h" +#include "core/fxge/include/cfx_renderdevice.h" #include "core/fxge/include/fx_freetype.h" -#include "core/fxge/include/fx_ge.h" #if _FXM_PLATFORM_ == _FXM_PLATFORM_APPLE_ #include "core/fxge/apple/apple_int.h" |