diff options
| author | Tom Sepez <tsepez@chromium.org> | 2015-06-17 10:01:00 -0700 |
|---|---|---|
| committer | Tom Sepez <tsepez@chromium.org> | 2015-06-17 10:01:00 -0700 |
| commit | b7d358b498800e4c240d381fa6f098af17a4d95b (patch) | |
| tree | aa0d8677af748caf9881ecd011af2b00af925188 /core/src/fxge/apple | |
| parent | 9555022ee550ee97415a86957686cc28716c4dee (diff) | |
| download | pdfium-b7d358b498800e4c240d381fa6f098af17a4d95b.tar.xz | |
Merge to XFA: Separate agg-authored code from fx-authored code.
Original Review URL: https://codereview.chromium.org/1152743007.
BUG=pdfium:166
R=brucedawson@chromium.org, thestig@chromium.org
TBR=brucedawson@chromium.org, thestig@chromium.org
Review URL: https://codereview.chromium.org/1186423003.
Diffstat (limited to 'core/src/fxge/apple')
| -rw-r--r-- | core/src/fxge/apple/fx_apple_platform.cpp | 17 | ||||
| -rw-r--r-- | core/src/fxge/apple/fx_quartz_device.cpp | 10 |
2 files changed, 14 insertions, 13 deletions
diff --git a/core/src/fxge/apple/fx_apple_platform.cpp b/core/src/fxge/apple/fx_apple_platform.cpp index 5186ed449b..176526b83b 100644 --- a/core/src/fxge/apple/fx_apple_platform.cpp +++ b/core/src/fxge/apple/fx_apple_platform.cpp @@ -6,15 +6,16 @@ #include "../../../include/fxcrt/fx_ext.h" #include "../../../include/fxge/fx_ge.h" + #if _FXM_PLATFORM_ == _FXM_PLATFORM_APPLE_ -#include "apple_int.h" + +#include "../../../include/fxge/fx_freetype.h" #include "../../../include/fxge/fx_ge_apple.h" -#include "../agg/include/fxfx_agg_clip_liang_barsky.h" -#include "../ge/text_int.h" -#include "../dib/dib_int.h" #include "../agg/include/fx_agg_driver.h" -#include "../../../include/fxge/fx_freetype.h" -#if _FXM_PLATFORM_ == _FXM_PLATFORM_APPLE_ +#include "../dib/dib_int.h" +#include "../ge/text_int.h" +#include "apple_int.h" + void CFX_AggDeviceDriver::InitPlatform() { CQuartz2D & quartz2d = ((CApplePlatform *) CFX_GEModule::Get()->GetPlatformData())->_quartz2d; @@ -169,5 +170,5 @@ void CFX_Font::ReleasePlatformResource() m_pPlatformFont = NULL; } } -#endif -#endif + +#endif // _FXM_PLATFORM_ == _FXM_PLATFORM_APPLE_ diff --git a/core/src/fxge/apple/fx_quartz_device.cpp b/core/src/fxge/apple/fx_quartz_device.cpp index a9bb1e1b72..0b8353f4b0 100644 --- a/core/src/fxge/apple/fx_quartz_device.cpp +++ b/core/src/fxge/apple/fx_quartz_device.cpp @@ -5,12 +5,12 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com #include "../../../include/fxcrt/fx_ext.h" +#include "../../../include/fxge/fx_freetype.h" #include "../../../include/fxge/fx_ge.h" -#include "../agg/include/fxfx_agg_clip_liang_barsky.h" -#include "../ge/text_int.h" -#include "../dib/dib_int.h" #include "../agg/include/fx_agg_driver.h" -#include "../../../include/fxge/fx_freetype.h" +#include "../dib/dib_int.h" +#include "../ge/text_int.h" + #if _FXM_PLATFORM_ == _FXM_PLATFORM_APPLE_ #include "apple_int.h" #include "../../../include/fxge/fx_ge_apple.h" @@ -1134,4 +1134,4 @@ FX_BOOL CFX_QuartzDevice::Create(int32_t width, int32_t height, FXDIB_Format for m_bOwnedBitmap = TRUE; return Attach(pBitmap); } -#endif +#endif // _FXM_PLATFORM_ == _FXM_PLATFORM_APPLE_ |