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>

7 files changed, 25 insertions, 4 deletions

diff --git a/chromium/third_party/BUILD.gn b/chromium/third_party/BUILD.gn
index 2dd9241e9fa..eb95917e622 100644
--- a/chromium/third_party/BUILD.gn
+++ b/chromium/third_party/BUILD.gn
@@ -5,8 +5,9 @@
 import("//build/config/freetype/freetype.gni")
 import("//third_party/harfbuzz-ng/harfbuzz.gni")
 import("//third_party/libjpeg.gni")
+import("//build/config/features.gni")
 
-assert(!is_ios, "This is not used on iOS, don't drag it in unintentionally")
+assert(!is_ios || is_qtwebengine, "This is not used on iOS, don't drag it in unintentionally")
 
 if (use_system_libjpeg) {
   import("//build/config/linux/pkg_config.gni")
diff --git a/chromium/third_party/libjpeg_turbo/BUILD.gn b/chromium/third_party/libjpeg_turbo/BUILD.gn
index 5acf5238f6a..2d05af56a01 100644
--- a/chromium/third_party/libjpeg_turbo/BUILD.gn
+++ b/chromium/third_party/libjpeg_turbo/BUILD.gn
@@ -6,11 +6,13 @@
 # implementation. Use the meta target //third_party:jpeg instead.
 
 import("//build/config/sanitizers/sanitizers.gni")
+import("//build/config/features.gni")
+
 if (current_cpu == "arm" || current_cpu == "arm64") {
   import("//build/config/arm.gni")
 }
 
-assert(!is_ios, "This is not used on iOS, don't drag it in unintentionally")
+assert(!is_ios || is_qtwebengine, "This is not used on iOS, don't drag it in unintentionally")
 
 source_set("libjpeg_headers") {
   sources = [
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 2bdbf486d0b..40102305163 100644
--- a/chromium/third_party/pdfium/core/fpdfapi/font/cpdf_type1font.cpp
+++ b/chromium/third_party/pdfium/core/fpdfapi/font/cpdf_type1font.cpp
@@ -23,6 +23,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 a4deadb1caa..12994a22ab7 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 cb613844116..a47e30281d4 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
@@ -13,6 +13,10 @@
 #include "core/fxge/dib/cfx_dibitmap.h"
 #include "core/fxge/freetype/fx_freetype.h"
 
+#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;