Fix QtWebEngine build with clang-cl

Change-Id: Ia212712f07627f919c30de4d06bbe2d7f8e3ddea
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>

13 files changed, 17 insertions, 10 deletions

diff --git a/chromium/base/containers/fixed_flat_map.h b/chromium/base/containers/fixed_flat_map.h
index 802e10272f8..60e0a789b64 100644
--- a/chromium/base/containers/fixed_flat_map.h
+++ b/chromium/base/containers/fixed_flat_map.h
@@ -101,7 +101,7 @@ constexpr fixed_flat_map<Key, Mapped, N, Compare> MakeFixedFlatMap(
   using FixedFlatMap = fixed_flat_map<Key, Mapped, N, Compare>;
   typename FixedFlatMap::value_compare value_comp{comp};
   internal::InsertionSort(data, data + N, value_comp);
-  CHECK(internal::is_sorted_and_unique(data, value_comp));
+//  CHECK(internal::is_sorted_and_unique(data, value_comp));
   // Specify the value_type explicitly to ensure that the returned array has
   // immutable keys.
   return FixedFlatMap(
diff --git a/chromium/base/containers/fixed_flat_set.h b/chromium/base/containers/fixed_flat_set.h
index 4ebd8e178e4..208b346fbcd 100644
--- a/chromium/base/containers/fixed_flat_set.h
+++ b/chromium/base/containers/fixed_flat_set.h
@@ -91,7 +91,7 @@ constexpr fixed_flat_set<Key, N, Compare> MakeFixedFlatSet(
     std::common_type_t<Key>(&&data)[N],
     const Compare& comp = Compare()) {
   internal::InsertionSort(data, data + N, comp);
-  CHECK(internal::is_sorted_and_unique(data, comp));
+//  CHECK(internal::is_sorted_and_unique(data, comp));
   // Specify the value_type explicitly to ensure that the returned array has
   // immutable keys.
   return fixed_flat_set<Key, N, Compare>(
diff --git a/chromium/base/containers/flat_tree.h b/chromium/base/containers/flat_tree.h
index 55f89691de8..60257a737d9 100644
--- a/chromium/base/containers/flat_tree.h
+++ b/chromium/base/containers/flat_tree.h
@@ -631,7 +631,7 @@ constexpr flat_tree<Key, GetKeyFromValue, KeyCompare, Container>::flat_tree(
     container_type&& items,
     const KeyCompare& comp)
     : comp_(comp), body_(std::move(items)) {
-  DCHECK(is_sorted_and_unique(*this, value_comp()));
+//  DCHECK(is_sorted_and_unique(*this, value_comp()));
 }
 
 template <class Key, class GetKeyFromValue, class KeyCompare, class Container>
diff --git a/chromium/media/capture/video/video_capture_metrics.cc b/chromium/media/capture/video/video_capture_metrics.cc
index 23e222bca44..8bb657c7694 100644
--- a/chromium/media/capture/video/video_capture_metrics.cc
+++ b/chromium/media/capture/video/video_capture_metrics.cc
@@ -140,7 +140,7 @@ VideoResolutionDesignation ResolutionNameFromSize(gfx::Size frame_size) {
     frame_size.set_width(frame_size.height());
     frame_size.set_width(tmp);
   }
-  auto* it = kResolutions.find(frame_size);
+  auto it = kResolutions.find(frame_size);
   return it != kResolutions.end() ? it->second
                                   : VideoResolutionDesignation::kUnknown;
 }
diff --git a/chromium/net/cookies/same_party_context.cc b/chromium/net/cookies/same_party_context.cc
index 1e97738b649..46660f2bc35 100644
--- a/chromium/net/cookies/same_party_context.cc
+++ b/chromium/net/cookies/same_party_context.cc
@@ -6,6 +6,8 @@
 
 #include <ostream>
 
+#include <tuple>
+
 namespace net {
 
 SamePartyContext::SamePartyContext(Type context_type)
diff --git a/chromium/services/network/public/cpp/corb/corb_impl.cc b/chromium/services/network/public/cpp/corb/corb_impl.cc
index 90c9dba748a..ca6afc44cf3 100644
--- a/chromium/services/network/public/cpp/corb/corb_impl.cc
+++ b/chromium/services/network/public/cpp/corb/corb_impl.cc
@@ -211,7 +211,7 @@ SniffingResult MaybeSkipHtmlComment(StringPiece* data) {
 // support for this resource type.  And CORB also wants to protect
 // "application/pdf" even though Chrome happens to support this resource type.
 const auto& GetNeverSniffedMimeTypes() {
-  static constexpr auto kNeverSniffedMimeTypes = base::MakeFixedFlatSet<
+  static const auto kNeverSniffedMimeTypes = base::MakeFixedFlatSet<
       base::StringPiece>({
       // clang-format off
       // The types below (zip, protobuf, etc.) are based on most commonly used
diff --git a/chromium/services/network/public/cpp/spki_hash_set.h b/chromium/services/network/public/cpp/spki_hash_set.h
index b8c304bcc72..a098e8bccbf 100644
--- a/chromium/services/network/public/cpp/spki_hash_set.h
+++ b/chromium/services/network/public/cpp/spki_hash_set.h
@@ -8,6 +8,8 @@
 #include "base/component_export.h"
 #include "base/containers/flat_set.h"
 
+#include <string>
+
 namespace net {
 struct SHA256HashValue;
 }  // namespace net
diff --git a/chromium/sql/recover_module/btree.cc b/chromium/sql/recover_module/btree.cc
index cc9420e5c05..df10460c3b5 100644
--- a/chromium/sql/recover_module/btree.cc
+++ b/chromium/sql/recover_module/btree.cc
@@ -7,6 +7,7 @@
 #include <algorithm>
 #include <limits>
 #include <ostream>
+#include <tuple>
 #include <type_traits>
 
 #include "base/check_op.h"
diff --git a/chromium/sql/recover_module/record.cc b/chromium/sql/recover_module/record.cc
index ff1ddf4c15e..094f209de7e 100644
--- a/chromium/sql/recover_module/record.cc
+++ b/chromium/sql/recover_module/record.cc
@@ -7,6 +7,7 @@
 #include <cstddef>
 #include <limits>
 #include <ostream>
+#include <tuple>
 #include <type_traits>
 
 #include "base/check_op.h"
diff --git a/chromium/third_party/blink/renderer/platform/audio/audio_delay_dsp_kernel.cc b/chromium/third_party/blink/renderer/platform/audio/audio_delay_dsp_kernel.cc
index c1da61832b4..b6613ff3df7 100644
--- a/chromium/third_party/blink/renderer/platform/audio/audio_delay_dsp_kernel.cc
+++ b/chromium/third_party/blink/renderer/platform/audio/audio_delay_dsp_kernel.cc
@@ -26,6 +26,7 @@
 #include "third_party/blink/renderer/platform/audio/audio_delay_dsp_kernel.h"
 
 #include <cmath>
+#include <tuple>
 
 #include "base/notreached.h"
 #include "build/build_config.h"
diff --git a/chromium/third_party/skia/include/core/SkM44.h b/chromium/third_party/skia/include/core/SkM44.h
index 7fdbcb8e820..a0bbc135b98 100644
--- a/chromium/third_party/skia/include/core/SkM44.h
+++ b/chromium/third_party/skia/include/core/SkM44.h
@@ -156,7 +156,7 @@ public:
     enum NaN_Constructor {
         kNaN_Constructor
     };
-    constexpr SkM44(NaN_Constructor)
+    SkM44(NaN_Constructor)
         : fMat{SK_ScalarNaN, SK_ScalarNaN, SK_ScalarNaN, SK_ScalarNaN,
                SK_ScalarNaN, SK_ScalarNaN, SK_ScalarNaN, SK_ScalarNaN,
                SK_ScalarNaN, SK_ScalarNaN, SK_ScalarNaN, SK_ScalarNaN,
diff --git a/chromium/ui/base/metadata/base_type_conversion.h b/chromium/ui/base/metadata/base_type_conversion.h
index 6fc68e11e23..bc36377042b 100644
--- a/chromium/ui/base/metadata/base_type_conversion.h
+++ b/chromium/ui/base/metadata/base_type_conversion.h
@@ -159,7 +159,7 @@ struct EnumStringsMap;
   std::u16string ui::metadata::TypeConverter<T>::ToString(                   \
       ui::metadata::ArgType<T> source_value) {                               \
     const auto& map = EnumStringsMap<T>::Get();                              \
-    auto* it = map.find(source_value);                                       \
+    auto it = map.find(source_value);                                       \
     return it != map.end() ? std::u16string(it->second) : std::u16string();  \
   }                                                                          \
                                                                              \
diff --git a/chromium/ui/color/color_provider_utils.cc b/chromium/ui/color/color_provider_utils.cc
index c7c07425e31..544c67c22f2 100644
--- a/chromium/ui/color/color_provider_utils.cc
+++ b/chromium/ui/color/color_provider_utils.cc
@@ -101,9 +101,9 @@ base::StringPiece SystemThemeName(
 #include "ui/color/color_id_map_macros.inc"
 
 std::string ColorIdName(ColorId color_id) {
-  static constexpr const auto color_id_map =
+  static const auto color_id_map =
       base::MakeFixedFlatMap<ColorId, const char*>({COLOR_IDS});
-  auto* i = color_id_map.find(color_id);
+  auto i = color_id_map.find(color_id);
   if (i != color_id_map.cend())
     return {i->second};
   base::StringPiece color_name;
@@ -223,7 +223,7 @@ std::string SkColorName(SkColor color) {
       });
   auto color_with_alpha = color;
   color = SkColorSetA(color, SK_AlphaOPAQUE);
-  auto* i = color_name_map.find(color);
+  auto i = color_name_map.find(color);
   if (i != color_name_map.cend()) {
     if (SkColorGetA(color_with_alpha) == SkColorGetA(color))
       return i->second;