diff options
| author | Michal Klocek <michal.klocek@qt.io> | 2020-01-10 16:36:49 +0100 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2022-06-24 16:28:31 +0200 |
| commit | 323c6ceec0a1ab50bb37419ee17a5c6c954884eb (patch) | |
| tree | c1184f8ed3fc23a9708658ee4d42532d6e2d4d3a /chromium/third_party/pdfium | |
| parent | a54eb1bbe9ba3866679aa205a3fa37ecdd798650 (diff) | |
| download | qtwebengine-chromium-323c6ceec0a1ab50bb37419ee17a5c6c954884eb.tar.gz | |
Fix ios build issues for 83 adaptations
Change-Id: I1d73d4726f955e3a555b3a389d1422638a2b1c5e
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
Reviewed-by: Michal Klocek <michal.klocek@qt.io>
Diffstat (limited to 'chromium/third_party/pdfium')
5 files changed, 20 insertions, 2 deletions
diff --git a/chromium/third_party/pdfium/core/fpdfapi/font/cpdf_type1font.cpp b/chromium/third_party/pdfium/core/fpdfapi/font/cpdf_type1font.cpp index dbd6a3d4ba9..e40aeebc758 100644 --- a/chromium/third_party/pdfium/core/fpdfapi/font/cpdf_type1font.cpp +++ b/chromium/third_party/pdfium/core/fpdfapi/font/cpdf_type1font.cpp @@ -22,6 +22,11 @@ #include <Carbon/Carbon.h> #endif // BUILDFLAG(IS_APPLE) +#if defined(OS_IOS) +#include <CoreFoundation/CFString.h> +#include <CoreGraphics/CoreGraphics.h> +#endif + namespace { #if BUILDFLAG(IS_APPLE) diff --git a/chromium/third_party/pdfium/core/fxge/BUILD.gn b/chromium/third_party/pdfium/core/fxge/BUILD.gn index 18b15b70aa1..f345d2e398a 100644 --- a/chromium/third_party/pdfium/core/fxge/BUILD.gn +++ b/chromium/third_party/pdfium/core/fxge/BUILD.gn @@ -167,7 +167,7 @@ source_set("fxge") { sources += [ "linux/fx_linux_impl.cpp" ] } - if (is_mac) { + if (is_mac || is_ios) { sources += [ "apple/fx_apple_impl.cpp", "apple/fx_apple_platform.cpp", diff --git a/chromium/third_party/pdfium/core/fxge/apple/fx_apple_platform.cpp b/chromium/third_party/pdfium/core/fxge/apple/fx_apple_platform.cpp index bddc3acec28..4989f6bed37 100644 --- a/chromium/third_party/pdfium/core/fxge/apple/fx_apple_platform.cpp +++ b/chromium/third_party/pdfium/core/fxge/apple/fx_apple_platform.cpp @@ -15,6 +15,10 @@ #include "core/fxge/fx_font.h" #include "core/fxge/systemfontinfo_iface.h" +#if defined(OS_IOS) +#include <CoreGraphics/CoreGraphics.h> +#endif + namespace { struct Substs { diff --git a/chromium/third_party/pdfium/core/fxge/apple/fx_quartz_device.cpp b/chromium/third_party/pdfium/core/fxge/apple/fx_quartz_device.cpp index e48bb59b1f6..8e182079d99 100644 --- a/chromium/third_party/pdfium/core/fxge/apple/fx_quartz_device.cpp +++ b/chromium/third_party/pdfium/core/fxge/apple/fx_quartz_device.cpp @@ -17,6 +17,10 @@ #include "core/fxge/agg/fx_agg_driver.h" #endif +#if defined(OS_IOS) +#include <CoreGraphics/CoreGraphics.h> +#endif + #ifndef CGFLOAT_IS_DOUBLE #error Expected CGFLOAT_IS_DOUBLE to be defined by CoreGraphics headers #endif diff --git a/chromium/third_party/pdfium/core/fxge/apple/fx_quartz_device.h b/chromium/third_party/pdfium/core/fxge/apple/fx_quartz_device.h index 9388f058453..9a3e032fa7b 100644 --- a/chromium/third_party/pdfium/core/fxge/apple/fx_quartz_device.h +++ b/chromium/third_party/pdfium/core/fxge/apple/fx_quartz_device.h @@ -7,13 +7,18 @@ #ifndef CORE_FXGE_APPLE_FX_QUARTZ_DEVICE_H_ #define CORE_FXGE_APPLE_FX_QUARTZ_DEVICE_H_ -#include <Carbon/Carbon.h> #include <stdint.h> #include "core/fxcrt/retain_ptr.h" #include "core/fxge/dib/fx_dib.h" #include "third_party/base/span.h" +#if !defined(OS_IOS) +#include <Carbon/Carbon.h> +#else +class CGPoint; +#endif + class CFX_DIBitmap; class CFX_Matrix; |