diff options
| author | Lei Zhang <thestig@chromium.org> | 2015-11-10 09:45:32 -0800 |
|---|---|---|
| committer | Lei Zhang <thestig@chromium.org> | 2015-11-10 09:45:32 -0800 |
| commit | a9fa50f723654c4e8b26909bb686eaa3721df155 (patch) | |
| tree | dc6b8bc03ed574872a84120d482ab7196ec1cc54 /core/src/fxge/apple | |
| parent | d88a364c1c79b294b980c20ebc9356ea42635bff (diff) | |
| download | pdfium-a9fa50f723654c4e8b26909bb686eaa3721df155.tar.xz | |
Merge to XFA: Fix relative includes within core/
TBR=tsepez@chromium.org
Review URL: https://codereview.chromium.org/1427633010 .
(cherry picked from commit 9fb27cb9797937499c9678bc74cf7846cbf5d2b8)
Review URL: https://codereview.chromium.org/1438573002 .
Diffstat (limited to 'core/src/fxge/apple')
| -rw-r--r-- | core/src/fxge/apple/apple_int.h | 2 | ||||
| -rw-r--r-- | core/src/fxge/apple/fx_apple_platform.cpp | 10 | ||||
| -rw-r--r-- | core/src/fxge/apple/fx_mac_imp.cpp | 3 | ||||
| -rw-r--r-- | core/src/fxge/apple/fx_quartz_device.cpp | 11 |
4 files changed, 14 insertions, 12 deletions
diff --git a/core/src/fxge/apple/apple_int.h b/core/src/fxge/apple/apple_int.h index 9bff4ebcbc..504e144327 100644 --- a/core/src/fxge/apple/apple_int.h +++ b/core/src/fxge/apple/apple_int.h @@ -9,7 +9,7 @@ #if _FXM_PLATFORM_ == _FXM_PLATFORM_APPLE_ -#include "../../../include/fxge/fx_ge.h" +#include "core/include/fxge/fx_ge.h" #if _FX_OS_ == _FX_MACOSX_ #include <Carbon/Carbon.h> diff --git a/core/src/fxge/apple/fx_apple_platform.cpp b/core/src/fxge/apple/fx_apple_platform.cpp index 03b5629d4b..c289b93041 100644 --- a/core/src/fxge/apple/fx_apple_platform.cpp +++ b/core/src/fxge/apple/fx_apple_platform.cpp @@ -4,17 +4,17 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "../../../include/fxcrt/fx_system.h" -#include "../../../include/fxge/fx_ge.h" +#include "core/include/fxcrt/fx_system.h" +#include "core/include/fxge/fx_ge.h" #if _FXM_PLATFORM_ == _FXM_PLATFORM_APPLE_ -#include "../../../include/fxge/fx_freetype.h" -#include "../../../include/fxge/fx_ge_apple.h" -#include "../agg/include/fx_agg_driver.h" #include "../dib/dib_int.h" #include "../ge/text_int.h" #include "apple_int.h" +#include "core/include/fxge/fx_freetype.h" +#include "core/include/fxge/fx_ge_apple.h" +#include "core/src/fxge/agg/include/fx_agg_driver.h" void CFX_AggDeviceDriver::InitPlatform() { CQuartz2D& quartz2d = diff --git a/core/src/fxge/apple/fx_mac_imp.cpp b/core/src/fxge/apple/fx_mac_imp.cpp index 41333f8bf4..166d3b46f9 100644 --- a/core/src/fxge/apple/fx_mac_imp.cpp +++ b/core/src/fxge/apple/fx_mac_imp.cpp @@ -4,8 +4,9 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "../../../include/fxge/fx_ge.h" +#include "core/include/fxge/fx_ge.h" #include "apple_int.h" + #if _FX_OS_ == _FX_MACOSX_ static const struct { const FX_CHAR* m_pName; diff --git a/core/src/fxge/apple/fx_quartz_device.cpp b/core/src/fxge/apple/fx_quartz_device.cpp index eba27c0049..67b438fc28 100644 --- a/core/src/fxge/apple/fx_quartz_device.cpp +++ b/core/src/fxge/apple/fx_quartz_device.cpp @@ -4,19 +4,20 @@ // 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/fx_agg_driver.h" #include "../dib/dib_int.h" #include "../ge/text_int.h" +#include "core/include/fxcrt/fx_ext.h" +#include "core/include/fxge/fx_freetype.h" +#include "core/include/fxge/fx_ge.h" +#include "core/src/fxge/agg/include/fx_agg_driver.h" #if _FXM_PLATFORM_ == _FXM_PLATFORM_APPLE_ #include "apple_int.h" -#include "../../../include/fxge/fx_ge_apple.h" +#include "core/include/fxge/fx_ge_apple.h" #ifndef CGFLOAT_IS_DOUBLE #error Expected CGFLOAT_IS_DOUBLE to be defined by CoreGraphics headers #endif + void* CQuartz2D::createGraphics(CFX_DIBitmap* pBitmap) { if (!pBitmap) { return NULL; |