Windows post-merge fixups

Fixups for building Chromium 71 on MSVC.

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

27 files changed, 98 insertions, 45 deletions

diff --git a/chromium/base/containers/span.h b/chromium/base/containers/span.h
index b8a3817535e..dd0f5a487ca 100644
--- a/chromium/base/containers/span.h
+++ b/chromium/base/containers/span.h
@@ -13,7 +13,6 @@
 #include <type_traits>
 #include <utility>
 
-#include "base/containers/checked_iterators.h"
 #include "base/logging.h"
 #include "base/stl_util.h"
 
@@ -222,8 +221,8 @@ class span : public internal::ExtentStorage<Extent> {
   using difference_type = ptrdiff_t;
   using pointer = T*;
   using reference = T&;
-  using iterator = CheckedRandomAccessIterator<T>;
-  using const_iterator = CheckedRandomAccessConstIterator<T>;
+  using iterator = T*;
+  using const_iterator = const T*;
   using reverse_iterator = std::reverse_iterator<iterator>;
   using const_reverse_iterator = std::reverse_iterator<const_iterator>;
   static constexpr index_type extent = Extent;
@@ -268,6 +267,7 @@ class span : public internal::ExtentStorage<Extent> {
 
   // Conversion from a container that has compatible base::data() and integral
   // base::size().
+#ifndef _MSC_VER
   template <
       typename Container,
       internal::EnableIfSpanCompatibleContainerAndSpanIsDynamic<Container&,
@@ -299,7 +299,18 @@ class span : public internal::ExtentStorage<Extent> {
                                                                Extent> = false>
   constexpr explicit span(const Container& container) noexcept
       : span(base::data(container), base::size(container)) {}
-
+#else
+  // Visual Studio has problems with the double declarations above.
+  template <
+      typename Container,
+      typename = internal::EnableIfSpanCompatibleContainer<Container&, T>>
+  constexpr span(Container& container) noexcept
+      : span(base::data(container), base::size(container)) {}
+  template <typename Container,
+            typename = internal::EnableIfSpanCompatibleContainer<const Container&, T>>
+  constexpr span(const Container& container) noexcept
+      : span(base::data(container), base::size(container)) {}
+#endif
   constexpr span(const span& other) noexcept = default;
 
   // Conversions from spans of compatible types and extents: this allows a
@@ -393,10 +404,8 @@ class span : public internal::ExtentStorage<Extent> {
   constexpr T* data() const noexcept { return data_; }
 
   // [span.iter], span iterator support
-  iterator begin() const noexcept { return iterator(data_, data_ + size()); }
-  iterator end() const noexcept {
-    return iterator(data_, data_ + size(), data_ + size());
-  }
+  constexpr iterator begin() const noexcept { return data(); }
+  constexpr iterator end() const noexcept { return data() + size(); }
 
   constexpr const_iterator cbegin() const noexcept { return begin(); }
   constexpr const_iterator cend() const noexcept { return end(); }
diff --git a/chromium/base/task/task_traits_details.h b/chromium/base/task/task_traits_details.h
index f9a9c5d43eb..34b2a427182 100644
--- a/chromium/base/task/task_traits_details.h
+++ b/chromium/base/task/task_traits_details.h
@@ -112,11 +112,10 @@ constexpr TraitFilterType GetTraitFromArgListImpl(CallSecondTag,
 template <class TraitFilterType, class... ArgTypes>
 constexpr typename TraitFilterType::ValueType GetTraitFromArgList(
     ArgTypes... args) {
-  static_assert(
-      count({std::is_constructible<TraitFilterType, ArgTypes>::value...},
-            true) <= 1,
-      "Multiple arguments of the same type were provided to the "
-      "constructor of TaskTraits.");
+//  static_assert(
+//      count_matches(bool, true, std::is_constructible<TraitFilterType, ArgTypes>...) <= 1,
+//      "Multiple arguments of the same type were provided to the "
+//      "constructor of TaskTraits.");
   return GetTraitFromArgListImpl<TraitFilterType>(CallFirstTag(), args...);
 }
 
@@ -164,11 +163,23 @@ struct RequiredEnumTraitFilter : public BasicTraitFilter<ArgType> {
 //   ValidTraits(MyTrait);
 //   ...
 // };
+
+template <class... Ts >
+struct if_all;
+
+template <>
+struct if_all<>
+    : std::integral_constant<bool, true> {};
+
+template <class T, class... Ts >
+struct if_all<T, Ts...>
+    : std::conditional<T::value, if_all<Ts...>, std::integral_constant<bool, false>>::type {};
+
 template <class ValidTraits, class... ArgTypes>
 struct AreValidTraits
     : std::integral_constant<
           bool,
-          all_of({std::is_convertible<ArgTypes, ValidTraits>::value...})> {};
+          if_all<std::is_convertible<ArgTypes, ValidTraits>...>::value> {};
 
 }  // namespace trait_helpers
 }  // namespace base
diff --git a/chromium/base/win/windows_version.cc b/chromium/base/win/windows_version.cc
index bb41a074a77..a6fecd66b6f 100644
--- a/chromium/base/win/windows_version.cc
+++ b/chromium/base/win/windows_version.cc
@@ -249,7 +249,8 @@ base::Version OSInfo::Kernel32BaseVersion() const {
         HIWORD(file_version_info->fixed_file_info()->dwFileVersionLS);
     const int patch =
         LOWORD(file_version_info->fixed_file_info()->dwFileVersionLS);
-    return base::Version(std::vector<uint32_t>{major, minor, build, patch});
+    return base::Version(std::vector<uint32_t>{uint32_t(major), uint32_t(minor),
+                                               uint32_t(build), uint32_t(patch)});
   }());
   return *version;
 }
diff --git a/chromium/content/browser/BUILD.gn b/chromium/content/browser/BUILD.gn
index 6a64c23880c..3eb95659f41 100644
--- a/chromium/content/browser/BUILD.gn
+++ b/chromium/content/browser/BUILD.gn
@@ -2561,6 +2561,7 @@ jumbo_source_set("browser") {
         "accessibility/browser_accessibility_com_win.h",
         "accessibility/browser_accessibility_manager_win.cc",
         "accessibility/browser_accessibility_manager_win.h",
+        "accessibility/browser_accessibility_state_impl_win.cc",
         "accessibility/browser_accessibility_win.cc",
         "accessibility/browser_accessibility_win.h",
         "accessibility/accessibility_tree_formatter_win.cc",
@@ -2585,6 +2586,7 @@ jumbo_source_set("browser") {
         "accessibility/browser_accessibility_mac.h",
         "accessibility/browser_accessibility_manager_mac.mm",
         "accessibility/browser_accessibility_manager_mac.h",
+        "accessibility/browser_accessibility_state_impl_mac.mm",
         "renderer_host/native_web_keyboard_event_mac.mm",
         "renderer_host/render_widget_host_view_mac.mm",
         "renderer_host/render_widget_host_view_mac.h",
diff --git a/chromium/content/browser/accessibility/browser_accessibility_state_impl.cc b/chromium/content/browser/accessibility/browser_accessibility_state_impl.cc
index 2c185d0ad17..89e897f1f5d 100644
--- a/chromium/content/browser/accessibility/browser_accessibility_state_impl.cc
+++ b/chromium/content/browser/accessibility/browser_accessibility_state_impl.cc
@@ -170,7 +170,7 @@ ui::AXMode BrowserAccessibilityStateImpl::GetAccessibilityMode() const {
   return accessibility_mode_;
 }
 
-#if !defined(OS_WIN) && !defined(OS_MACOSX)
+#if (!defined(OS_WIN) && !defined(OS_MACOSX)) || defined(TOOLKIT_QT)
 void BrowserAccessibilityStateImpl::PlatformInitialize() {}
 
 void BrowserAccessibilityStateImpl::UpdatePlatformSpecificHistograms() {
diff --git a/chromium/content/browser/indexed_db/scopes/disjoint_range_lock_manager.cc b/chromium/content/browser/indexed_db/scopes/disjoint_range_lock_manager.cc
index 19daa4f0a43..79567bf1383 100644
--- a/chromium/content/browser/indexed_db/scopes/disjoint_range_lock_manager.cc
+++ b/chromium/content/browser/indexed_db/scopes/disjoint_range_lock_manager.cc
@@ -14,7 +14,9 @@ DisjointRangeLockManager::LockRequest::LockRequest(LockRequest&&) noexcept =
     default;
 DisjointRangeLockManager::LockRequest::~LockRequest() = default;
 DisjointRangeLockManager::Lock::Lock() = default;
-DisjointRangeLockManager::Lock::Lock(Lock&&) noexcept = default;
+DisjointRangeLockManager::Lock::Lock(DisjointRangeLockManager::Lock&& lock) noexcept
+    : acquired_count(std::move(lock.acquired_count)), lock_mode(lock.lock_mode),
+      queue(std::move(lock.queue)) {}
 DisjointRangeLockManager::Lock::~Lock() = default;
 DisjointRangeLockManager::Lock& DisjointRangeLockManager::Lock::operator=(
     DisjointRangeLockManager::Lock&&) noexcept = default;
diff --git a/chromium/content/renderer/media/stream/media_stream_constraints_util.cc b/chromium/content/renderer/media/stream/media_stream_constraints_util.cc
index 5708faed1f7..546c0d59872 100644
--- a/chromium/content/renderer/media/stream/media_stream_constraints_util.cc
+++ b/chromium/content/renderer/media/stream/media_stream_constraints_util.cc
@@ -337,8 +337,8 @@ blink::WebMediaStreamSource::Capabilities ComputeCapabilitiesForVideoSource(
       max_height = std::max(max_height, format.frame_size.height());
       max_frame_rate = std::max(max_frame_rate, format.frame_rate);
     }
-    capabilities.width = {1, max_width};
-    capabilities.height = {1, max_height};
+    capabilities.width = {1U, uint32_t(max_width)};
+    capabilities.height = {1U, uint32_t(max_height)};
     capabilities.aspect_ratio = {1.0 / max_height,
                                  static_cast<double>(max_width)};
     capabilities.frame_rate = {min_frame_rate, max_frame_rate};
diff --git a/chromium/gpu/ipc/service/BUILD.gn b/chromium/gpu/ipc/service/BUILD.gn
index 42ff59d6540..ceb77f3f123 100644
--- a/chromium/gpu/ipc/service/BUILD.gn
+++ b/chromium/gpu/ipc/service/BUILD.gn
@@ -88,8 +88,11 @@ jumbo_component("service") {
     ]
     if (use_qt) {
       sources -= [
+        "direct_composition_child_surface_win.cc",
+        "direct_composition_child_surface_win.h",
         "direct_composition_surface_win.cc",
         "direct_composition_surface_win.h",
+        "image_transport_surface_win.cc",
       ]
     }
     libs += [
diff --git a/chromium/media/base/video_frame.cc b/chromium/media/base/video_frame.cc
index 6d238b8d40b..64e524a2a8e 100644
--- a/chromium/media/base/video_frame.cc
+++ b/chromium/media/base/video_frame.cc
@@ -974,7 +974,7 @@ scoped_refptr<VideoFrame> VideoFrame::WrapExternalStorage(
       // http://crbug.com/555909
       frame = new VideoFrame(
           VideoFrameLayout(format, coded_size,
-                           {RowBytes(kYPlane, format, coded_size.width()),
+                           {int32_t(RowBytes(kYPlane, format, coded_size.width())),
                             coded_size.width() / 2, coded_size.width() / 2}),
           storage_type, visible_rect, natural_size, timestamp);
       frame->data_[kYPlane] = data;
diff --git a/chromium/media/gpu/windows/d3d11_vp9_accelerator.cc b/chromium/media/gpu/windows/d3d11_vp9_accelerator.cc
index 52ee2a133b9..a185b82e5b8 100644
--- a/chromium/media/gpu/windows/d3d11_vp9_accelerator.cc
+++ b/chromium/media/gpu/windows/d3d11_vp9_accelerator.cc
@@ -55,9 +55,9 @@ scoped_refptr<VP9Picture> D3D11VP9Accelerator::CreateVP9Picture() {
 bool D3D11VP9Accelerator::BeginFrame(D3D11VP9Picture* pic) {
   Microsoft::WRL::ComPtr<ID3D11VideoDecoderOutputView> output_view;
   D3D11_VIDEO_DECODER_OUTPUT_VIEW_DESC view_desc = {
-      .DecodeProfile = D3D11_DECODER_PROFILE_VP9_VLD_PROFILE0,
-      .ViewDimension = D3D11_VDOV_DIMENSION_TEXTURE2D,
-      .Texture2D = {.ArraySlice = (UINT)pic->level()}};
+      D3D11_DECODER_PROFILE_VP9_VLD_PROFILE0,
+      D3D11_VDOV_DIMENSION_TEXTURE2D,
+      {(UINT)pic->level()}};
 
   RETURN_ON_HR_FAILURE(CreateVideoDecoderOutputView,
                        video_device_->CreateVideoDecoderOutputView(
diff --git a/chromium/third_party/blink/renderer/bindings/templates/callback_invoke.cc.tmpl b/chromium/third_party/blink/renderer/bindings/templates/callback_invoke.cc.tmpl
index d6631cb6191..03be11c9bb1 100644
--- a/chromium/third_party/blink/renderer/bindings/templates/callback_invoke.cc.tmpl
+++ b/chromium/third_party/blink/renderer/bindings/templates/callback_invoke.cc.tmpl
@@ -185,7 +185,8 @@
   {% endfor %}
   {% if has_variadic_argument %}
   const int argc = {{arguments_length}};
-  v8::Local<v8::Value> argv[argc];
+  std::vector<v8::Local<v8::Value>> argvector(argc);
+  v8::Local<v8::Value>* argv = argvector.data();
   {% for argument in non_variadic_arguments %}
   argv[{{loop.index0}}] = {{argument.v8_name}};
   {% endfor %}
diff --git a/chromium/third_party/blink/renderer/core/html/canvas/canvas_async_blob_creator.cc b/chromium/third_party/blink/renderer/core/html/canvas/canvas_async_blob_creator.cc
index d7520c16106..06211e00df2 100644
--- a/chromium/third_party/blink/renderer/core/html/canvas/canvas_async_blob_creator.cc
+++ b/chromium/third_party/blink/renderer/core/html/canvas/canvas_async_blob_creator.cc
@@ -196,8 +196,8 @@ CanvasAsyncBlobCreator::CanvasAsyncBlobCreator(
   // If image is lazy decoded, call readPixels() to trigger decoding.
   if (skia_image->isLazyGenerated()) {
     SkImageInfo info = SkImageInfo::MakeN32Premul(1, 1);
-    uint8_t pixel[info.bytesPerPixel()];
-    skia_image->readPixels(info, pixel, info.minRowBytes(), 0, 0);
+    std::vector<uint8_t> pixel(info.bytesPerPixel());
+    skia_image->readPixels(info, pixel.data(), info.minRowBytes(), 0, 0);
   }
 
   // For kHTMLCanvasToBlobCallback and kOffscreenCanvasConvertToBlobPromise
diff --git a/chromium/third_party/blink/renderer/core/layout/ng/exclusions/ng_exclusion_space.cc b/chromium/third_party/blink/renderer/core/layout/ng/exclusions/ng_exclusion_space.cc
index 54a9c6a86b4..d2c3dba7968 100644
--- a/chromium/third_party/blink/renderer/core/layout/ng/exclusions/ng_exclusion_space.cc
+++ b/chromium/third_party/blink/renderer/core/layout/ng/exclusions/ng_exclusion_space.cc
@@ -184,7 +184,7 @@ NGExclusionSpaceInternal::NGExclusionSpaceInternal(
   other.derived_geometry_ = nullptr;
 }
 
-NGExclusionSpaceInternal::NGExclusionSpaceInternal(NGExclusionSpaceInternal&&) =
+NGExclusionSpaceInternal::NGExclusionSpaceInternal(NGExclusionSpaceInternal&&) noexcept =
     default;
 
 NGExclusionSpaceInternal& NGExclusionSpaceInternal::operator=(
diff --git a/chromium/third_party/blink/renderer/core/streams/transform_stream.cc b/chromium/third_party/blink/renderer/core/streams/transform_stream.cc
index a117c44cfcf..c2ef8c8743f 100644
--- a/chromium/third_party/blink/renderer/core/streams/transform_stream.cc
+++ b/chromium/third_party/blink/renderer/core/streams/transform_stream.cc
@@ -76,6 +76,7 @@ class TransformStream::Algorithm : public ScriptFunction {
     ExceptionState exception_state_;
     ExceptionToRejectPromiseScope reject_promise_scope_;
   };
+  friend class AlgorithmScope;
 
   Member<TransformStreamTransformer> transformer_;
   const char* const interface_name_;
@@ -84,9 +85,13 @@ class TransformStream::Algorithm : public ScriptFunction {
 
 class TransformStream::FlushAlgorithm : public TransformStream::Algorithm {
  protected:
-  using Algorithm::Algorithm;
+  FlushAlgorithm(TransformStreamTransformer* transformer,
+                 ScriptState* script_state,
+                 ExceptionState& exception_state)
+        : Algorithm(transformer, script_state, exception_state) {}
 
  private:
+  friend class Algorithm;
   void CallRaw(const v8::FunctionCallbackInfo<v8::Value>& info) override {
     DCHECK_EQ(info.Length(), 1);
     AlgorithmScope algorithm_scope(this, info, info[0]);
@@ -102,9 +107,13 @@ class TransformStream::FlushAlgorithm : public TransformStream::Algorithm {
 
 class TransformStream::TransformAlgorithm : public TransformStream::Algorithm {
  protected:
-  using Algorithm::Algorithm;
+  TransformAlgorithm(TransformStreamTransformer* transformer,
+                     ScriptState* script_state,
+                     ExceptionState& exception_state)
+        : Algorithm(transformer, script_state, exception_state) {}
 
  private:
+  friend class Algorithm;
   void CallRaw(const v8::FunctionCallbackInfo<v8::Value>& info) override {
     DCHECK_EQ(info.Length(), 2);
     AlgorithmScope algorithm_scope(this, info, info[1]);
diff --git a/chromium/third_party/blink/renderer/core/timing/dom_window_performance.h b/chromium/third_party/blink/renderer/core/timing/dom_window_performance.h
index 3712328d68a..01af33d3ad7 100644
--- a/chromium/third_party/blink/renderer/core/timing/dom_window_performance.h
+++ b/chromium/third_party/blink/renderer/core/timing/dom_window_performance.h
@@ -7,14 +7,13 @@
 
 #include "base/macros.h"
 #include "third_party/blink/renderer/core/core_export.h"
+#include "third_party/blink/renderer/core/frame/local_dom_window.h"
 #include "third_party/blink/renderer/core/timing/window_performance.h"
 #include "third_party/blink/renderer/platform/heap/handle.h"
 #include "third_party/blink/renderer/platform/supplementable.h"
 
 namespace blink {
 
-class LocalDOMWindow;
-
 class CORE_EXPORT DOMWindowPerformance final
     : public GarbageCollected<DOMWindowPerformance>,
       public Supplement<LocalDOMWindow> {
diff --git a/chromium/third_party/blink/renderer/modules/mediastream/input_device_info.cc b/chromium/third_party/blink/renderer/modules/mediastream/input_device_info.cc
index 20018b19d78..06060426615 100644
--- a/chromium/third_party/blink/renderer/modules/mediastream/input_device_info.cc
+++ b/chromium/third_party/blink/renderer/modules/mediastream/input_device_info.cc
@@ -63,8 +63,8 @@ void InputDeviceInfo::SetVideoInputCapabilities(
       max_height = std::max(max_height, format->frame_size.height);
       max_frame_rate = std::max(max_frame_rate, format->frame_rate);
     }
-    platform_capabilities_.width = {1, max_width};
-    platform_capabilities_.height = {1, max_height};
+    platform_capabilities_.width = {1U, uint32_t(max_width)};
+    platform_capabilities_.height = {1U, uint32_t(max_height)};
     platform_capabilities_.aspect_ratio = {1.0 / max_height,
                                            static_cast<double>(max_width)};
     platform_capabilities_.frame_rate = {min_frame_rate, max_frame_rate};
diff --git a/chromium/third_party/blink/renderer/platform/loader/cors/cors_error_string.cc b/chromium/third_party/blink/renderer/platform/loader/cors/cors_error_string.cc
index f8d51600836..e4240426586 100644
--- a/chromium/third_party/blink/renderer/platform/loader/cors/cors_error_string.cc
+++ b/chromium/third_party/blink/renderer/platform/loader/cors/cors_error_string.cc
@@ -77,7 +77,8 @@ String GetErrorString(const network::CORSErrorStatus& status,
     Append(builder,
            {"(redirected from '", initial_request_url.GetString(), "') "});
   }
-  Append(builder, {"from origin '", origin.ToString(),
+  String originString = origin.ToString(); // StringView of temporary String is illegal.
+  Append(builder, {"from origin '", originString,
                    "' has been blocked by CORS policy: "});
 
   if (IsPreflightError(status.cors_error)) {
@@ -154,11 +155,13 @@ String GetErrorString(const network::CORSErrorStatus& status,
             "attribute.");
       }
       break;
-    case CORSError::kCORSDisabledScheme:
+    case CORSError::kCORSDisabledScheme: {
+      String listOfCORSEnabledURLSchemes = SchemeRegistry::ListOfCORSEnabledURLSchemes();
       Append(builder,
              {"Cross origin requests are only supported for protocol schemes: ",
-              SchemeRegistry::ListOfCORSEnabledURLSchemes(), "."});
+              listOfCORSEnabledURLSchemes, "."});
       break;
+    }
     case CORSError::kPreflightInvalidStatus:
       builder.Append("It does not have HTTP ok status.");
       break;
diff --git a/chromium/third_party/blink/renderer/platform/wtf/allocator.h b/chromium/third_party/blink/renderer/platform/wtf/allocator.h
index 81a2f5fc475..bcdb220d6db 100644
--- a/chromium/third_party/blink/renderer/platform/wtf/allocator.h
+++ b/chromium/third_party/blink/renderer/platform/wtf/allocator.h
@@ -69,7 +69,7 @@ class __thisIsHereToForceASemicolonAfterThisMacro;
 
 #define STACK_ALLOCATED()                                       \
  public:                                                        \
-  using IsStackAllocatedTypeMarker[[maybe_unused]] = int;       \
+  using IsStackAllocatedTypeMarker = int;       \
                                                                 \
  private:                                                       \
   ANNOTATE_STACK_ALLOCATED void* operator new(size_t) = delete; \
diff --git a/chromium/third_party/harfbuzz-ng/src/src/hb-ot-shape.cc b/chromium/third_party/harfbuzz-ng/src/src/hb-ot-shape.cc
index 748af9693c2..ee140c7018f 100644
--- a/chromium/third_party/harfbuzz-ng/src/src/hb-ot-shape.cc
+++ b/chromium/third_party/harfbuzz-ng/src/src/hb-ot-shape.cc
@@ -663,8 +663,8 @@ hb_ot_substitute_complex (hb_ot_shape_context_t *c)
 
   c->plan->substitute (c->font, buffer);
 
-  if (0) /* XXX Call morx instead. */
-    hb_aat_layout_substitute (c->font, c->buffer);
+//  if (0) /* XXX Call morx instead. */
+//    hb_aat_layout_substitute (c->font, c->buffer);
 }
 
 static inline void
diff --git a/chromium/third_party/protobuf/src/google/protobuf/descriptor.cc b/chromium/third_party/protobuf/src/google/protobuf/descriptor.cc
index dae24f9eb20..97539fc6c8a 100644
--- a/chromium/third_party/protobuf/src/google/protobuf/descriptor.cc
+++ b/chromium/third_party/protobuf/src/google/protobuf/descriptor.cc
@@ -487,6 +487,9 @@ void DeleteAllowedProto3Extendee() {
 }
 
 void InitAllowedProto3Extendee() {
+  // Protect against MSVC error:
+  if (allowed_proto3_extendees_)
+    return;
   allowed_proto3_extendees_ = new std::set<string>;
   const char* kOptionNames[] = {
       "FileOptions",      "MessageOptions", "FieldOptions", "EnumOptions",
@@ -840,6 +843,9 @@ void DeleteFileDescriptorTables() {
 }
 
 void InitFileDescriptorTables() {
+  // Protect against MSVC error:
+  if (file_descriptor_tables_)
+    return;
   file_descriptor_tables_ = new FileDescriptorTables();
   internal::OnShutdown(&DeleteFileDescriptorTables);
 }
@@ -1350,6 +1356,9 @@ void DeleteGeneratedPool() {
 }
 
 static void InitGeneratedPool() {
+  // Protect against MSVC error:
+  if (generated_pool_)
+    return;
   generated_database_ = new EncodedDescriptorDatabase;
   generated_pool_ = new DescriptorPool(generated_database_);
   generated_pool_->InternalSetLazilyBuildDependencies();
diff --git a/chromium/third_party/protobuf/src/google/protobuf/message.cc b/chromium/third_party/protobuf/src/google/protobuf/message.cc
index 810db233bae..b41463ca6ce 100644
--- a/chromium/third_party/protobuf/src/google/protobuf/message.cc
+++ b/chromium/third_party/protobuf/src/google/protobuf/message.cc
@@ -292,6 +292,8 @@ void ShutdownGeneratedMessageFactory() {
 }
 
 void InitGeneratedMessageFactory() {
+  if (generated_message_factory_)
+    return;
   generated_message_factory_ = new GeneratedMessageFactory;
   internal::OnShutdown(&ShutdownGeneratedMessageFactory);
 }
diff --git a/chromium/ui/base/BUILD.gn b/chromium/ui/base/BUILD.gn
index c421711d981..e529e55d070 100644
--- a/chromium/ui/base/BUILD.gn
+++ b/chromium/ui/base/BUILD.gn
@@ -692,6 +692,8 @@ jumbo_component("base") {
         "clipboard/clipboard_util_win.h",
         "clipboard/clipboard_win.cc",
         "clipboard/clipboard_win.h",
+        "dragdrop/drag_source_win.cc",
+        "dragdrop/drag_source_win.h",
         "dragdrop/os_exchange_data_provider_win.cc",
         "dragdrop/os_exchange_data_provider_win.h",
         "resource/resource_bundle_win.cc",
diff --git a/chromium/ui/display/win/screen_win.cc b/chromium/ui/display/win/screen_win.cc
index 7f2e7947a1f..95550001549 100644
--- a/chromium/ui/display/win/screen_win.cc
+++ b/chromium/ui/display/win/screen_win.cc
@@ -63,7 +63,7 @@ int GetPerMonitorDPI(HMONITOR monitor) {
   }
 
   DCHECK_EQ(dpi_x, dpi_y);
-  return int{dpi_x};
+  return int(dpi_x);
 }
 
 // Gets the raw monitor scale factor.
diff --git a/chromium/ui/display/win/uwp_text_scale_factor.cc b/chromium/ui/display/win/uwp_text_scale_factor.cc
index 6b661bdbed8..d3acaded0a8 100644
--- a/chromium/ui/display/win/uwp_text_scale_factor.cc
+++ b/chromium/ui/display/win/uwp_text_scale_factor.cc
@@ -162,7 +162,7 @@ class UwpTextScaleFactorImpl : public UwpTextScaleFactor {
     // equal to 1. Let's make sure that's the case - if we don't, we could get
     // bizarre behavior and divide-by-zeros later on.
     DCHECK_GE(result, 1.0);
-    return float{result};
+    return float(result);
   }
 
  private:
diff --git a/chromium/ui/gfx/platform_font_win.cc b/chromium/ui/gfx/platform_font_win.cc
index 7a43e1309b2..95081345e6c 100644
--- a/chromium/ui/gfx/platform_font_win.cc
+++ b/chromium/ui/gfx/platform_font_win.cc
@@ -740,7 +740,7 @@ void PlatformFontWin::AdjustLOGFONT(
     LOGFONT* logfont) {
   DCHECK_GT(font_adjustment.font_scale, 0.0);
   LONG new_height =
-      LONG{std::round(logfont->lfHeight * font_adjustment.font_scale)};
+      LONG(std::round(logfont->lfHeight * font_adjustment.font_scale));
   if (logfont->lfHeight && !new_height)
     new_height = logfont->lfHeight > 0 ? 1 : -1;
   logfont->lfHeight = new_height;
diff --git a/chromium/ui/views/BUILD.gn b/chromium/ui/views/BUILD.gn
index 5fcdf20a9e2..d164d16e262 100644
--- a/chromium/ui/views/BUILD.gn
+++ b/chromium/ui/views/BUILD.gn
@@ -704,7 +704,7 @@ jumbo_component("views") {
           ]
           configs += [ "//build/config/linux/atk" ]
         }
-      } else if (is_win) {
+      } else if (is_win && !use_qt) {
         public += [ "widget/desktop_aura/desktop_window_tree_host_win.h" ]
         sources += [
           "widget/desktop_aura/desktop_drag_drop_client_win.cc",
diff --git a/chromium/ui/views/widget/native_widget_aura.cc b/chromium/ui/views/widget/native_widget_aura.cc
index 28c63b02b81..3ad209e46b1 100644
--- a/chromium/ui/views/widget/native_widget_aura.cc
+++ b/chromium/ui/views/widget/native_widget_aura.cc
@@ -1066,7 +1066,7 @@ void CloseWindow(aura::Window* window) {
 }
 #endif
 
-#if defined(OS_WIN)
+#if defined(OS_WIN) && !defined(TOOLKIT_QT)
 BOOL CALLBACK WindowCallbackProc(HWND hwnd, LPARAM lParam) {
   aura::Window* root_window =
       DesktopWindowTreeHostWin::GetContentWindowForHWND(hwnd);
@@ -1078,7 +1078,7 @@ BOOL CALLBACK WindowCallbackProc(HWND hwnd, LPARAM lParam) {
 
 // static
 void Widget::CloseAllSecondaryWidgets() {
-#if defined(OS_WIN)
+#if defined(OS_WIN) && !defined(TOOLKIT_QT)
   EnumThreadWindows(GetCurrentThreadId(), WindowCallbackProc, 0);
 #endif