diff options
| author | Tom Sepez <tsepez@chromium.org> | 2015-06-16 16:29:44 -0700 |
|---|---|---|
| committer | Tom Sepez <tsepez@chromium.org> | 2015-06-16 16:29:44 -0700 |
| commit | 2ca8fcbc8a7a3ef6adfac154c47068c1696205d0 (patch) | |
| tree | de3f825c75b1b92908825f68af8a4e7146cf97fd /core/src/fxge/apple | |
| parent | ea44bd064a86679a47a7265020f997d6e3b88336 (diff) | |
| download | pdfium-2ca8fcbc8a7a3ef6adfac154c47068c1696205d0.tar.xz | |
Separate agg-authored code from fx-authored code.chromium/2439chromium/2438chromium/2437chromium/2436chromium/2435
Creates a separate library so we can apply less-strict warnings to
the code we can't change from upstream vs. the code we can change,
reducing noise in the standalone build.
Remove needless foo.{cpp,h} files that merely perform indirection
via #include "some_other_path/foo.{cpp,h}".
BUG=pdfium:166
R=brucedawson@chromium.org, thestig@chromium.org
Review URL: https://codereview.chromium.org/1152743007.
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 07c5b6cf98..9db807c3af 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_system.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 0638e15f78..8f0f4db6ba 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" @@ -1125,4 +1125,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_ |