Fix QtWebEngine build on macOS

Change-Id: Iaf429a2e88fd361a4da750b228c4e681bfc0cb39
Reviewed-by: Peter Varga <pvarga@inf.u-szeged.hu>

11 files changed, 16 insertions, 13 deletions

diff --git a/chromium/BUILD.gn b/chromium/BUILD.gn
index 5ffd9c66a62..edc91168c77 100644
--- a/chromium/BUILD.gn
+++ b/chromium/BUILD.gn
@@ -651,7 +651,7 @@ group("gn_all") {
     }
   }
 
-  if (is_mac) {
+  if (is_mac && !use_qt) {
     deps += [
       "//third_party/breakpad:crash_inspector",
       "//third_party/breakpad:dump_syms",
diff --git a/chromium/base/allocator/partition_allocator/starscan/state_bitmap.h b/chromium/base/allocator/partition_allocator/starscan/state_bitmap.h
index b4329b829f4..2a8987bc280 100644
--- a/chromium/base/allocator/partition_allocator/starscan/state_bitmap.h
+++ b/chromium/base/allocator/partition_allocator/starscan/state_bitmap.h
@@ -393,7 +393,7 @@ template <size_t PageSize, size_t PageAlignment, size_t AllocationAlignment>
 template <typename Filter,
           typename CallbackForwarder,
           typename Callback,
-          bool Clear>
+          bool DoClear>
 inline void
 StateBitmap<PageSize, PageAlignment, AllocationAlignment>::IterateImpl(
     size_t epoch,
@@ -423,7 +423,7 @@ StateBitmap<PageSize, PageAlignment, AllocationAlignment>::IterateImpl(
 
       callback_forwarder(callback, object_address, bits);
 
-      if (Clear) {
+      if (DoClear) {
         // Clear the current bits.
         AsAtomicCell(cell_index)
             .fetch_and(clear_value_mask, std::memory_order_relaxed);
diff --git a/chromium/chrome/services/file_util/BUILD.gn b/chromium/chrome/services/file_util/BUILD.gn
index 8a50b0932e0..0e8dff67d5b 100644
--- a/chromium/chrome/services/file_util/BUILD.gn
+++ b/chromium/chrome/services/file_util/BUILD.gn
@@ -38,7 +38,7 @@ source_set("file_util") {
     deps += ["//components/services/filesystem/public/mojom"]
   }
 
-  if (is_mac) {
+  if (is_mac && !use_qt) {
     deps += ["//chrome/utility/safe_browsing/mac"]
   }
 
diff --git a/chromium/chrome/test/BUILD.gn b/chromium/chrome/test/BUILD.gn
index ebab285a12d..69bbbe4c93d 100644
--- a/chromium/chrome/test/BUILD.gn
+++ b/chromium/chrome/test/BUILD.gn
@@ -5616,7 +5616,7 @@ test("unit_tests") {
     }
   }
 
-  if (is_mac) {
+  if (is_mac && !use_qt) {
     sources += [
       "../../testing/gtest_mac_unittest.mm",
       "../browser/app_controller_mac_unittest.mm",
diff --git a/chromium/content/public/browser/BUILD.gn b/chromium/content/public/browser/BUILD.gn
index 1ff7ba3f6fa..c0dd73d7f3f 100644
--- a/chromium/content/public/browser/BUILD.gn
+++ b/chromium/content/public/browser/BUILD.gn
@@ -541,7 +541,7 @@ jumbo_source_set("browser_sources") {
     sources += [ "context_factory.h" ]
   }
 
-  if (is_mac) {
+  if (is_mac && !use_qt) {
     sources += [
       "ax_inspect_factory_mac.mm",
       "native_event_processor_mac.h",
@@ -555,11 +555,11 @@ jumbo_source_set("browser_sources") {
     sources += [ "ax_inspect_factory_fuchsia.cc" ]
   }
 
-  if (is_win) {
+  if (is_win && !use_qt) {
     sources += [ "ax_inspect_factory_win.cc" ]
   }
 
-  if (use_atk) {
+  if (use_atk && !use_qt) {
     sources += [ "ax_inspect_factory_auralinux.cc" ]
     configs += [ "//build/config/linux/atspi2" ]
   }
diff --git a/chromium/third_party/angle/src/compiler/translator/tree_ops/vulkan/EarlyFragmentTestsOptimization.cpp b/chromium/third_party/angle/src/compiler/translator/tree_ops/vulkan/EarlyFragmentTestsOptimization.cpp
index 485f182d791..a50fc541c65 100644
--- a/chromium/third_party/angle/src/compiler/translator/tree_ops/vulkan/EarlyFragmentTestsOptimization.cpp
+++ b/chromium/third_party/angle/src/compiler/translator/tree_ops/vulkan/EarlyFragmentTestsOptimization.cpp
@@ -9,6 +9,7 @@
 
 #include "compiler/translator/tree_ops/vulkan/EarlyFragmentTestsOptimization.h"
 
+#ifdef ANGLE_ENABLE_VULKAN
 #include "compiler/translator/InfoSink.h"
 #include "compiler/translator/Symbol.h"
 #include "compiler/translator/tree_util/IntermNode_util.h"
@@ -77,3 +78,4 @@ bool CheckEarlyFragmentTestsFeasible(TCompiler *compiler, TIntermNode *root)
 }
 
 }  // namespace sh
+#endif // ANGLE_ENABLE_VULKAN
diff --git a/chromium/third_party/angle/src/compiler/translator/tree_ops/vulkan/EarlyFragmentTestsOptimization.h b/chromium/third_party/angle/src/compiler/translator/tree_ops/vulkan/EarlyFragmentTestsOptimization.h
index 1d6a0b4b460..a588d6a0cbb 100644
--- a/chromium/third_party/angle/src/compiler/translator/tree_ops/vulkan/EarlyFragmentTestsOptimization.h
+++ b/chromium/third_party/angle/src/compiler/translator/tree_ops/vulkan/EarlyFragmentTestsOptimization.h
@@ -11,6 +11,7 @@
 #define COMPILER_TRANSLATOR_TREEOPS_VULKAN_EARLYFRAGMENTTESTSOPTIMIZATION_H_
 
 #include "common/angleutils.h"
+#include "common/debug.h"
 
 namespace sh
 {
diff --git a/chromium/third_party/pdfium/core/fxge/text_char_pos.h b/chromium/third_party/pdfium/core/fxge/text_char_pos.h
index b28d2499359..ee4e670eda7 100644
--- a/chromium/third_party/pdfium/core/fxge/text_char_pos.h
+++ b/chromium/third_party/pdfium/core/fxge/text_char_pos.h
@@ -7,7 +7,6 @@
 #ifndef CORE_FXGE_TEXT_CHAR_POS_H_
 #define CORE_FXGE_TEXT_CHAR_POS_H_
 
-#include "build/build_config.h"
 #include "core/fxcrt/fx_coordinates.h"
 
 class TextCharPos {
diff --git a/chromium/ui/base/clipboard/BUILD.gn b/chromium/ui/base/clipboard/BUILD.gn
index 1b8c931e088..ec9a7f585e7 100644
--- a/chromium/ui/base/clipboard/BUILD.gn
+++ b/chromium/ui/base/clipboard/BUILD.gn
@@ -35,7 +35,7 @@ jumbo_component("clipboard_types") {
     sources += [ "clipboard_format_type_win.cc" ]
   }
 
-  if (use_aura) {
+  if (use_aura || use_qt) {
     if ((!is_chromecast && is_linux) || is_chromeos_lacros || !is_win || use_qt) {
       sources += [ "clipboard_format_type_aura.cc" ]
     }
diff --git a/chromium/ui/base/clipboard/clipboard_constants.cc b/chromium/ui/base/clipboard/clipboard_constants.cc
index 690a8b555e5..981737e73ea 100644
--- a/chromium/ui/base/clipboard/clipboard_constants.cc
+++ b/chromium/ui/base/clipboard/clipboard_constants.cc
@@ -26,7 +26,7 @@ const char kMimeTypeLinuxString[] = "STRING";
 const char kMimeTypeLinuxText[] = "TEXT";
 #endif  // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_FUCHSIA)
 
-#if !defined(OS_APPLE)
+#if !defined(OS_APPLE) || defined(TOOLKIT_QT)
 const char kMimeTypeWebCustomData[] = "chromium/x-web-custom-data";
 const char kMimeTypeWebkitSmartPaste[] = "chromium/x-webkit-paste";
 #endif  // defined(OS_APPLE)
diff --git a/chromium/ui/base/clipboard/clipboard_constants.h b/chromium/ui/base/clipboard/clipboard_constants.h
index 5bfe4e6f4e5..9584a0a94ab 100644
--- a/chromium/ui/base/clipboard/clipboard_constants.h
+++ b/chromium/ui/base/clipboard/clipboard_constants.h
@@ -47,13 +47,14 @@ COMPONENT_EXPORT(UI_BASE_CLIPBOARD_TYPES)
 extern const char kMimeTypeLinuxText[];
 #endif  // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_FUCHSIA)
 
-#if !defined(OS_APPLE)
+#if !defined(OS_APPLE) || defined(TOOLKIT_QT)
 // TODO(dcheng): This name is temporary. See crbug.com/106449.
 COMPONENT_EXPORT(UI_BASE_CLIPBOARD_TYPES)
 extern const char kMimeTypeWebCustomData[];
 COMPONENT_EXPORT(UI_BASE_CLIPBOARD_TYPES)
 extern const char kMimeTypeWebkitSmartPaste[];
-#else
+#endif
+#if defined(OS_APPLE)
 // MacOS-specific Uniform Type Identifiers.
 
 // SVG images.