Fixes for building with MSVC post 77-merge

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

51 files changed, 162 insertions, 127 deletions

diff --git a/chromium/base/immediate_crash.h b/chromium/base/immediate_crash.h
index 94ee14f1289..78fad52278d 100644
--- a/chromium/base/immediate_crash.h
+++ b/chromium/base/immediate_crash.h
@@ -138,7 +138,11 @@
 // calling function, but to this anonymous lambda. This is still useful as the
 // full name of the lambda will typically include the name of the function that
 // calls CHECK() and the debugger will still break at the right line of code.
-#if !defined(COMPILER_GCC)
+#if defined(COMPILER_MSVC) && !defined(__clang__)
+
+#define WRAPPED_TRAP_SEQUENCE_() TRAP_SEQUENCE1_()
+
+#elif !defined(COMPILER_GCC)
 
 #define WRAPPED_TRAP_SEQUENCE_() TRAP_SEQUENCE_()
 
diff --git a/chromium/base/task/promise/helpers.h b/chromium/base/task/promise/helpers.h
index 9a14be91114..979a5d248a7 100644
--- a/chromium/base/task/promise/helpers.h
+++ b/chromium/base/task/promise/helpers.h
@@ -166,9 +166,9 @@ struct UseMoveSemantics : public std::integral_constant<bool, UseMove<T>()> {
 // to be moved according to UseMove<>.
 template <typename... Ts>
 struct UseMoveSemantics<std::tuple<Ts...>>
-    : public std::integral_constant<bool, any_of({UseMove<Ts>()...})> {
+    : public std::integral_constant<bool, true /*any_of({UseMove<Ts>()...})*/> {
   static constexpr PromiseExecutor::ArgumentPassingType argument_passing_type =
-      any_of({UseMove<Ts>()...})
+      true /*any_of({UseMove<Ts>()...})*/
           ? PromiseExecutor::ArgumentPassingType::kMove
           : PromiseExecutor::ArgumentPassingType::kNormal;
 };
diff --git a/chromium/base/task/sequence_manager/task_queue_selector.h b/chromium/base/task/sequence_manager/task_queue_selector.h
index ad17ad8f364..567fb499456 100644
--- a/chromium/base/task/sequence_manager/task_queue_selector.h
+++ b/chromium/base/task/sequence_manager/task_queue_selector.h
@@ -282,7 +282,7 @@ class BASE_EXPORT TaskQueueSelector : public WorkQueueSets::Observer {
           0,
 
           // kVeryHighPriority
-          kMaxVeryHighPriorityStarvationScore,
+          int64_t(kMaxVeryHighPriorityStarvationScore),
 
           // kHighPriority
           int64_t(kMaxHighPriorityStarvationScore),
diff --git a/chromium/base/threading/scoped_thread_priority.cc b/chromium/base/threading/scoped_thread_priority.cc
index 63b38875110..afd360e9b9a 100644
--- a/chromium/base/threading/scoped_thread_priority.cc
+++ b/chromium/base/threading/scoped_thread_priority.cc
@@ -14,7 +14,7 @@ namespace base {
 // Enable the boost of thread priority when the code may load a library. The
 // thread priority boost is required to avoid priority inversion on the loader
 // lock.
-constexpr base::Feature kBoostThreadPriorityOnLibraryLoading{
+const base::Feature kBoostThreadPriorityOnLibraryLoading{
     "BoostThreadPriorityOnLibraryLoading", base::FEATURE_DISABLED_BY_DEFAULT};
 #endif  // OS_WIN
 
diff --git a/chromium/base/win/enum_variant.cc b/chromium/base/win/enum_variant.cc
index 38861bfe70f..7414303ccc3 100644
--- a/chromium/base/win/enum_variant.cc
+++ b/chromium/base/win/enum_variant.cc
@@ -51,7 +51,7 @@ STDMETHODIMP EnumVariant::Next(ULONG requested_count,
     return E_INVALIDARG;
 
   DCHECK_LE(current_index_, items_.size());
-  ULONG available_count = ULONG{items_.size()} - current_index_;
+  ULONG available_count = ULONG(items_.size()) - current_index_;
   ULONG count = std::min(requested_count, available_count);
   for (ULONG i = 0; i < count; ++i)
     out_elements[i] = items_[current_index_ + i].Copy();
@@ -67,8 +67,8 @@ STDMETHODIMP EnumVariant::Next(ULONG requested_count,
 
 STDMETHODIMP EnumVariant::Skip(ULONG skip_count) {
   ULONG count = skip_count;
-  if (current_index_ + count > ULONG{items_.size()})
-    count = ULONG{items_.size()} - current_index_;
+  if (current_index_ + count > ULONG(items_.size()))
+    count = ULONG(items_.size()) - current_index_;
 
   current_index_ += count;
   return (count == skip_count ? S_OK : S_FALSE);
@@ -84,7 +84,7 @@ STDMETHODIMP EnumVariant::Clone(IEnumVARIANT** out_cloned_object) {
     return E_INVALIDARG;
 
   size_t count = items_.size();
-  EnumVariant* other = new EnumVariant(ULONG{count});
+  EnumVariant* other = new EnumVariant(ULONG(count));
   for (size_t i = 0; i < count; ++i)
     other->items_[i] = static_cast<const VARIANT&>(items_[i]);
 
diff --git a/chromium/cc/trees/frame_sequence_tracker.cc b/chromium/cc/trees/frame_sequence_tracker.cc
index a4020409e7a..1e2cc528f57 100644
--- a/chromium/cc/trees/frame_sequence_tracker.cc
+++ b/chromium/cc/trees/frame_sequence_tracker.cc
@@ -23,12 +23,12 @@ enum class ThreadType {
 };
 
 constexpr const char* const kBuiltinSequences[] = {
-    [FrameSequenceTrackerType::kCompositorAnimation] = "CompositorAnimation",
-    [FrameSequenceTrackerType::kMainThreadAnimation] = "MainThreadAnimation",
-    [FrameSequenceTrackerType::kPinchZoom] = "PinchZoom",
-    [FrameSequenceTrackerType::kRAF] = "RAF",
-    [FrameSequenceTrackerType::kTouchScroll] = "TouchScroll",
-    [FrameSequenceTrackerType::kWheelScroll] = "WheelScroll",
+    /*[FrameSequenceTrackerType::kCompositorAnimation] = */ "CompositorAnimation",
+    /*[FrameSequenceTrackerType::kMainThreadAnimation] = */ "MainThreadAnimation",
+    /*[FrameSequenceTrackerType::kPinchZoom] = */ "PinchZoom",
+    /*[FrameSequenceTrackerType::kRAF] = */ "RAF",
+    /*[FrameSequenceTrackerType::kTouchScroll] = */ "TouchScroll",
+    /*[FrameSequenceTrackerType::kWheelScroll] = */ "WheelScroll",
 };
 
 constexpr int kBuiltinSequenceNum = base::size(kBuiltinSequences);
diff --git a/chromium/chrome/browser/win/conflicts/BUILD.gn b/chromium/chrome/browser/win/conflicts/BUILD.gn
index 36ea28cbf12..642ca6a5a23 100644
--- a/chromium/chrome/browser/win/conflicts/BUILD.gn
+++ b/chromium/chrome/browser/win/conflicts/BUILD.gn
@@ -3,6 +3,7 @@
 # found in the LICENSE file.
 
 import("//build/config/chrome_build.gni")
+import("//chrome/common/features.gni")
 import("//third_party/protobuf/proto_library.gni")
 
 assert(is_win)
@@ -31,8 +32,12 @@ source_set("module_info") {
 
   deps = [
     "//base:i18n",
-    "//chrome/common/safe_browsing:binary_feature_extractor",
   ]
+  if (safe_browsing_mode == 1) {
+    deps += [
+      "//chrome/common/safe_browsing:binary_feature_extractor",
+    ]
+  }
 }
 
 loadable_module("conflicts_dll") {
diff --git a/chromium/components/viz/service/display_embedder/gl_output_surface_offscreen.cc b/chromium/components/viz/service/display_embedder/gl_output_surface_offscreen.cc
index 33dcee3d2ab..519d3c56932 100644
--- a/chromium/components/viz/service/display_embedder/gl_output_surface_offscreen.cc
+++ b/chromium/components/viz/service/display_embedder/gl_output_surface_offscreen.cc
@@ -120,7 +120,7 @@ void GLOutputSurfaceOffscreen::OnSwapBuffersComplete(
   // Swap timings are not available since for offscreen there is no Swap, just a
   // SignalSyncToken. We use base::TimeTicks::Now() as an overestimate.
   auto now = base::TimeTicks::Now();
-  client()->DidReceiveSwapBuffersAck({.swap_start = now});
+  client()->DidReceiveSwapBuffersAck({now});
   client()->DidReceivePresentationFeedback(gfx::PresentationFeedback(
       now, base::TimeDelta::FromMilliseconds(16), /*flags=*/0));
 
diff --git a/chromium/components/viz/service/display_embedder/skia_output_device_buffer_queue.cc b/chromium/components/viz/service/display_embedder/skia_output_device_buffer_queue.cc
index 367b8c39fc5..38f5dd9e2bb 100644
--- a/chromium/components/viz/service/display_embedder/skia_output_device_buffer_queue.cc
+++ b/chromium/components/viz/service/display_embedder/skia_output_device_buffer_queue.cc
@@ -231,9 +231,9 @@ sk_sp<SkSurface> SkiaOutputDeviceBufferQueue::Image::BeginWriteSkia() {
 
 void SkiaOutputDeviceBufferQueue::Image::EndWriteSkia() {
   GrFlushInfo flush_info = {
-      .fFlags = kNone_GrFlushFlags,
-      .fNumSemaphores = end_semaphores_.size(),
-      .fSignalSemaphores = end_semaphores_.data(),
+      /*.fFlags = */kNone_GrFlushFlags,
+      /*.fNumSemaphores =*/ end_semaphores_.size(),
+      /*.fSignalSemaphores = */end_semaphores_.data(),
   };
   sk_surface_->flush(SkSurface::BackendSurfaceAccess::kPresent, flush_info);
 
diff --git a/chromium/components/viz/service/display_embedder/skia_output_surface_impl_on_gpu.cc b/chromium/components/viz/service/display_embedder/skia_output_surface_impl_on_gpu.cc
index 17cc49d9645..59c53691abe 100644
--- a/chromium/components/viz/service/display_embedder/skia_output_surface_impl_on_gpu.cc
+++ b/chromium/components/viz/service/display_embedder/skia_output_surface_impl_on_gpu.cc
@@ -713,10 +713,9 @@ void SkiaOutputSurfaceImplOnGpu::FinishPaintCurrentFrame(
       scoped_promise_image_access.end_semaphores().emplace_back();
 
     GrFlushInfo flush_info = {
-        .fFlags = kNone_GrFlushFlags,
-        .fNumSemaphores = scoped_promise_image_access.end_semaphores().size(),
-        .fSignalSemaphores =
-            scoped_promise_image_access.end_semaphores().data(),
+        kNone_GrFlushFlags,
+        scoped_promise_image_access.end_semaphores().size(),
+        scoped_promise_image_access.end_semaphores().data(),
     };
 
     gpu::AddVulkanCleanupTaskForSkiaFlush(vulkan_context_provider_,
@@ -843,10 +842,9 @@ void SkiaOutputSurfaceImplOnGpu::FinishPaintRenderPass(
     }
     offscreen.surface()->draw(ddl.get());
     GrFlushInfo flush_info = {
-        .fFlags = kNone_GrFlushFlags,
-        .fNumSemaphores = scoped_promise_image_access.end_semaphores().size(),
-        .fSignalSemaphores =
-            scoped_promise_image_access.end_semaphores().data(),
+        kNone_GrFlushFlags,
+        scoped_promise_image_access.end_semaphores().size(),
+        scoped_promise_image_access.end_semaphores().data(),
     };
 
     gpu::AddVulkanCleanupTaskForSkiaFlush(vulkan_context_provider_,
diff --git a/chromium/content/browser/accessibility/browser_accessibility.cc b/chromium/content/browser/accessibility/browser_accessibility.cc
index cfbe3537b3d..b5764ddf176 100644
--- a/chromium/content/browser/accessibility/browser_accessibility.cc
+++ b/chromium/content/browser/accessibility/browser_accessibility.cc
@@ -1438,7 +1438,7 @@ const ui::AXTree::Selection BrowserAccessibility::GetUnignoredSelection()
     const {
   if (manager())
     return manager()->ax_tree()->GetUnignoredSelection();
-  return ui::AXTree::Selection{-1, -1, -1,
+  return ui::AXTree::Selection{true, -1, -1,
                                ax::mojom::TextAffinity::kDownstream};
 }
 
diff --git a/chromium/content/browser/renderer_host/render_view_host_impl.h b/chromium/content/browser/renderer_host/render_view_host_impl.h
index 78ad7b06ae6..00211c0dba3 100644
--- a/chromium/content/browser/renderer_host/render_view_host_impl.h
+++ b/chromium/content/browser/renderer_host/render_view_host_impl.h
@@ -212,7 +212,7 @@ class CONTENT_EXPORT RenderViewHostImpl
   // to keep them consistent).
 
  protected:
-  friend class RefCounted<RenderViewHostImpl>;
+  friend class base::RefCounted<RenderViewHostImpl>;
   ~RenderViewHostImpl() override;
 
   // RenderWidgetHostOwnerDelegate overrides.
diff --git a/chromium/content/common/font_list_win.cc b/chromium/content/common/font_list_win.cc
index c0d9b00d833..72452016b6a 100644
--- a/chromium/content/common/font_list_win.cc
+++ b/chromium/content/common/font_list_win.cc
@@ -17,7 +17,7 @@
 
 namespace content {
 
-#if defined(TOOLKIT_QT)
+#if !defined(TOOLKIT_QT)
 std::unique_ptr<base::ListValue> GetFontList_SlowBlocking() {
   TRACE_EVENT0("fonts", "GetFontList_SlowBlocking");
 
diff --git a/chromium/device/fido/win/type_conversions.cc b/chromium/device/fido/win/type_conversions.cc
index a0a1e9cd263..ab0c6dcf985 100644
--- a/chromium/device/fido/win/type_conversions.cc
+++ b/chromium/device/fido/win/type_conversions.cc
@@ -166,7 +166,7 @@ std::vector<WEBAUTHN_CREDENTIAL> ToWinCredentialVector(
     }
     result.push_back(WEBAUTHN_CREDENTIAL{
         WEBAUTHN_CREDENTIAL_CURRENT_VERSION,
-        credential.id().size(),
+        DWORD(credential.id().size()),
         const_cast<unsigned char*>(credential.id().data()),
         WEBAUTHN_CREDENTIAL_TYPE_PUBLIC_KEY,
     });
@@ -182,7 +182,7 @@ std::vector<WEBAUTHN_CREDENTIAL_EX> ToWinCredentialExVector(
       continue;
     }
     result.push_back(WEBAUTHN_CREDENTIAL_EX{
-        WEBAUTHN_CREDENTIAL_EX_CURRENT_VERSION, credential.id().size(),
+        WEBAUTHN_CREDENTIAL_EX_CURRENT_VERSION, DWORD(credential.id().size()),
         const_cast<unsigned char*>(credential.id().data()),
         WEBAUTHN_CREDENTIAL_TYPE_PUBLIC_KEY,
         ToWinTransportsMask(credential.transports())});
diff --git a/chromium/device/fido/win/webauthn_api.cc b/chromium/device/fido/win/webauthn_api.cc
index 5df439fdc61..2d10c114655 100644
--- a/chromium/device/fido/win/webauthn_api.cc
+++ b/chromium/device/fido/win/webauthn_api.cc
@@ -296,7 +296,7 @@ AuthenticatorMakeCredentialBlocking(WinWebAuthnApi* webauthn_api,
       kWinWebAuthnTimeoutMilliseconds,
       WEBAUTHN_CREDENTIALS{
           0, nullptr},  // Ignored because pExcludeCredentialList is set.
-      WEBAUTHN_EXTENSIONS{extensions.size(), extensions.data()},
+      WEBAUTHN_EXTENSIONS{DWORD(extensions.size()), extensions.data()},
       authenticator_attachment,
       request.resident_key_required,
       ToWinUserVerificationRequirement(request.user_verification),
@@ -392,7 +392,7 @@ AuthenticatorGetAssertionBlocking(WinWebAuthnApi* webauthn_api,
       // As a workaround, MS tells us to also set the CredentialList
       // parameter with an accurate cCredentials count and some arbitrary
       // pCredentials data.
-      WEBAUTHN_CREDENTIALS{legacy_credentials.size(),
+      WEBAUTHN_CREDENTIALS{DWORD(legacy_credentials.size()),
                            legacy_credentials.data()},
       WEBAUTHN_EXTENSIONS{0, nullptr},
       authenticator_attachment,
diff --git a/chromium/extensions/renderer/api/automation/automation_internal_custom_bindings.cc b/chromium/extensions/renderer/api/automation/automation_internal_custom_bindings.cc
index 98111cb0fdb..5da7115d45c 100644
--- a/chromium/extensions/renderer/api/automation/automation_internal_custom_bindings.cc
+++ b/chromium/extensions/renderer/api/automation/automation_internal_custom_bindings.cc
@@ -722,14 +722,14 @@ void AutomationInternalCustomBindings::AddRoutes() {
         else
           child_count = node->GetUnignoredChildCount();
 
-        result.Set(v8::Integer::New(isolate, int32_t{child_count}));
+        result.Set(v8::Integer::New(isolate, int32_t(child_count)));
       });
   RouteNodeIDFunction(
       "GetIndexInParent",
       [](v8::Isolate* isolate, v8::ReturnValue<v8::Value> result,
          AutomationAXTreeWrapper* tree_wrapper, ui::AXNode* node) {
         result.Set(v8::Integer::New(
-            isolate, int32_t{node->GetUnignoredIndexInParent()}));
+            isolate, int32_t(node->GetUnignoredIndexInParent())));
       });
   RouteNodeIDFunction(
       "GetRole", [](v8::Isolate* isolate, v8::ReturnValue<v8::Value> result,
@@ -1911,10 +1911,10 @@ void AutomationInternalCustomBindings::GetChildIDAtIndex(
   // Check for a child tree, which is guaranteed to always be the only child.
   if (index == 0 && GetRootOfChildTree(&node, &tree_wrapper))
     child_id = node->id();
-  else if (index < 0 || size_t{index} >= node->GetUnignoredChildCount())
+  else if (index < 0 || size_t(index) >= node->GetUnignoredChildCount())
     return;
   else
-    child_id = node->GetUnignoredChildAtIndex(size_t{index})->id();
+    child_id = node->GetUnignoredChildAtIndex(size_t(index))->id();
 
   gin::DataObjectBuilder response(GetIsolate());
   response.Set("treeId", tree_wrapper->tree_id().ToString());
diff --git a/chromium/gpu/command_buffer/service/raster_decoder.cc b/chromium/gpu/command_buffer/service/raster_decoder.cc
index 54659e675be..03b163d45c2 100644
--- a/chromium/gpu/command_buffer/service/raster_decoder.cc
+++ b/chromium/gpu/command_buffer/service/raster_decoder.cc
@@ -797,9 +797,9 @@ void RasterDecoderImpl::Destroy(bool have_context) {
     // Make sure we flush any pending skia work on this context.
     if (sk_surface_) {
       GrFlushInfo flush_info = {
-          .fFlags = kNone_GrFlushFlags,
-          .fNumSemaphores = end_semaphores_.size(),
-          .fSignalSemaphores = end_semaphores_.data(),
+          kNone_GrFlushFlags,
+          end_semaphores_.size(),
+          end_semaphores_.data(),
       };
       AddVulkanCleanupTaskForSkiaFlush(
           shared_context_state_->vk_context_provider(), &flush_info);
@@ -2085,9 +2085,9 @@ void RasterDecoderImpl::DoCopySubTextureINTERNALSkia(
   // so the begin_semaphores can be released, and end_semaphores can be
   // signalled.
   GrFlushInfo flush_info = {
-      .fFlags = kNone_GrFlushFlags,
-      .fNumSemaphores = end_semaphores.size(),
-      .fSignalSemaphores = end_semaphores.data(),
+      /*.fFlags =*/ kNone_GrFlushFlags,
+      /*.fNumSemaphores =*/ int(end_semaphores.size()),
+      /*.fSignalSemaphores =*/ end_semaphores.data(),
   };
   gpu::AddVulkanCleanupTaskForSkiaFlush(
       shared_context_state_->vk_context_provider(), &flush_info);
@@ -2379,9 +2379,9 @@ void RasterDecoderImpl::DoEndRasterCHROMIUM() {
     gl::ScopedProgressReporter report_progress(
         shared_context_state_->progress_reporter());
     GrFlushInfo flush_info = {
-        .fFlags = kNone_GrFlushFlags,
-        .fNumSemaphores = end_semaphores_.size(),
-        .fSignalSemaphores = end_semaphores_.data(),
+        kNone_GrFlushFlags,
+        end_semaphores_.size(),
+        end_semaphores_.data(),
     };
     AddVulkanCleanupTaskForSkiaFlush(
         shared_context_state_->vk_context_provider(), &flush_info);
diff --git a/chromium/gpu/ipc/service/BUILD.gn b/chromium/gpu/ipc/service/BUILD.gn
index 711864a9f3d..d02454c2ed6 100644
--- a/chromium/gpu/ipc/service/BUILD.gn
+++ b/chromium/gpu/ipc/service/BUILD.gn
@@ -90,10 +90,6 @@ 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",
       ]
     }
diff --git a/chromium/media/base/byte_queue.cc b/chromium/media/base/byte_queue.cc
index 245fafa6685..9e560605c4d 100644
--- a/chromium/media/base/byte_queue.cc
+++ b/chromium/media/base/byte_queue.cc
@@ -7,6 +7,8 @@
 #include "base/logging.h"
 #include "base/numerics/checked_math.h"
 
+#include <algorithm>
+
 namespace media {
 
 ByteQueue::ByteQueue() : buffer_(new uint8_t[size_]) {}
diff --git a/chromium/media/parsers/jpeg_parser.cc b/chromium/media/parsers/jpeg_parser.cc
index 344f7c36995..2087ee0df12 100644
--- a/chromium/media/parsers/jpeg_parser.cc
+++ b/chromium/media/parsers/jpeg_parser.cc
@@ -91,13 +91,13 @@ const JpegHuffmanTable kDefaultAcTable[kJpegMaxHuffmanTableNumBaseline] = {
     },
 };
 
-constexpr uint8_t kZigZag8x8[64] = {
+const uint8_t kZigZag8x8[64] = {
     0,  1,  8,  16, 9,  2,  3,  10, 17, 24, 32, 25, 18, 11, 4,  5,
     12, 19, 26, 33, 40, 48, 41, 34, 27, 20, 13, 6,  7,  14, 21, 28,
     35, 42, 49, 56, 57, 50, 43, 36, 29, 22, 15, 23, 30, 37, 44, 51,
     58, 59, 52, 45, 38, 31, 39, 46, 53, 60, 61, 54, 47, 55, 62, 63};
 
-constexpr JpegQuantizationTable kDefaultQuantTable[2] = {
+const JpegQuantizationTable kDefaultQuantTable[2] = {
     // Table K.1 Luminance quantization table values.
     {
         true,
diff --git a/chromium/pdf/draw_utils/coordinates.cc b/chromium/pdf/draw_utils/coordinates.cc
index 569f79ed937..54d174cfb7f 100644
--- a/chromium/pdf/draw_utils/coordinates.cc
+++ b/chromium/pdf/draw_utils/coordinates.cc
@@ -13,7 +13,8 @@ namespace chrome_pdf {
 namespace draw_utils {
 
 void ExpandDocumentSize(const pp::Size& rect_size, pp::Size* doc_size) {
-  int width_diff = std::max(0, rect_size.width() - doc_size->width());
+  int width_diff = rect_size.width() - doc_size->width();
+  if (width_diff < 0) width_diff = 0;
   doc_size->Enlarge(width_diff, rect_size.height());
 }
 
diff --git a/chromium/services/tracing/perfetto/track_event_json_exporter.cc b/chromium/services/tracing/perfetto/track_event_json_exporter.cc
index c96bf465824..a5ee0f78315 100644
--- a/chromium/services/tracing/perfetto/track_event_json_exporter.cc
+++ b/chromium/services/tracing/perfetto/track_event_json_exporter.cc
@@ -243,7 +243,8 @@ void TrackEventJSONExporter::HandleInternedData(
     auto iter = current_state_->interned_frames_.emplace(
         frame.iid(), ProducerWriterState::Frame{
                          frame.has_rel_pc(), frame.rel_pc(),
-                         frame.function_name_id(), frame.mapping_id()});
+                         uint32_t(frame.function_name_id()),
+                         uint32_t(frame.mapping_id())});
     DCHECK(iter.second || iter.first->second.rel_pc == frame.rel_pc());
   }
   for (const auto& module_name : data.mapping_paths()) {
@@ -260,7 +261,8 @@ void TrackEventJSONExporter::HandleInternedData(
     DCHECK_EQ(mapping.path_string_ids_size(), 1);
     auto iter = current_state_->interned_mappings_.emplace(
         mapping.iid(), ProducerWriterState::Mapping{
-                           mapping.build_id(), mapping.path_string_ids(0)});
+                           uint32_t(mapping.build_id()),
+                           uint32_t(mapping.path_string_ids(0))});
     DCHECK(iter.second || iter.first->second.build_id == mapping.build_id());
   }
   for (const auto& callstack : data.callstacks()) {
diff --git a/chromium/sql/recover_module/cursor.h b/chromium/sql/recover_module/cursor.h
index 2dc026cc924..4faa9aa1627 100644
--- a/chromium/sql/recover_module/cursor.h
+++ b/chromium/sql/recover_module/cursor.h
@@ -62,8 +62,8 @@ class VirtualCursor {
   // |sqlite_cursor| must have been returned by VirtualTable::SqliteCursor().
   static inline VirtualCursor* FromSqliteCursor(
       sqlite3_vtab_cursor* sqlite_cursor) {
-    static_assert(std::is_standard_layout<VirtualCursor>::value,
-                  "needed for the reinterpret_cast below");
+//    static_assert(std::is_standard_layout<VirtualCursor>::value,
+//                  "needed for the reinterpret_cast below");
     static_assert(offsetof(VirtualCursor, sqlite_cursor_) == 0,
                   "sqlite_cursor_ must be the first member of the class");
     VirtualCursor* result = reinterpret_cast<VirtualCursor*>(sqlite_cursor);
diff --git a/chromium/sql/recover_module/table.h b/chromium/sql/recover_module/table.h
index 0238d4a8d01..920fc3bf919 100644
--- a/chromium/sql/recover_module/table.h
+++ b/chromium/sql/recover_module/table.h
@@ -84,8 +84,8 @@ class VirtualTable {
   //
   // |sqlite_table| must have been returned by VirtualTable::SqliteTable().
   static inline VirtualTable* FromSqliteTable(sqlite3_vtab* sqlite_table) {
-    static_assert(std::is_standard_layout<VirtualTable>::value,
-                  "needed for the reinterpret_cast below");
+//    static_assert(std::is_standard_layout<VirtualTable>::value,
+//                  "needed for the reinterpret_cast below");
     static_assert(offsetof(VirtualTable, sqlite_table_) == 0,
                   "sqlite_table_ must be the first member of the class");
     VirtualTable* const result = reinterpret_cast<VirtualTable*>(sqlite_table);
diff --git a/chromium/third_party/blink/public/platform/web_time_range.h b/chromium/third_party/blink/public/platform/web_time_range.h
index 2c17f7c8ce5..95a68d086e5 100644
--- a/chromium/third_party/blink/public/platform/web_time_range.h
+++ b/chromium/third_party/blink/public/platform/web_time_range.h
@@ -33,6 +33,8 @@
 
 #include "third_party/blink/public/platform/web_vector.h"
 
+#include <algorithm>
+
 namespace blink {
 
 class WebTimeRange {
diff --git a/chromium/third_party/blink/renderer/core/inspector/inspector_dom_snapshot_agent.cc b/chromium/third_party/blink/renderer/core/inspector/inspector_dom_snapshot_agent.cc
index a93cb08dd5c..65cae22c328 100644
--- a/chromium/third_party/blink/renderer/core/inspector/inspector_dom_snapshot_agent.cc
+++ b/chromium/third_party/blink/renderer/core/inspector/inspector_dom_snapshot_agent.cc
@@ -68,7 +68,7 @@ std::unique_ptr<protocol::Array<double>> BuildRectForLayout(const int x,
                                                             const int width,
                                                             const int height) {
   return std::make_unique<std::vector<double>, std::initializer_list<double>>(
-      {x, y, width, height});
+      {double(x), double(y), double(width), double(height)});
 }
 
 // Returns |layout_object|'s bounding box in document coordinates.
diff --git a/chromium/third_party/blink/renderer/core/layout/layout_block_flow_line.cc b/chromium/third_party/blink/renderer/core/layout/layout_block_flow_line.cc
index bd50e651198..c5b31b9083d 100644
--- a/chromium/third_party/blink/renderer/core/layout/layout_block_flow_line.cc
+++ b/chromium/third_party/blink/renderer/core/layout/layout_block_flow_line.cc
@@ -57,7 +57,7 @@ class ExpansionOpportunities {
     unsigned opportunities_in_run;
     if (text.Is8Bit()) {
       opportunities_in_run = Character::ExpansionOpportunityCount(
-          {text.Characters8() + run.start_, run.stop_ - run.start_},
+          {text.Characters8() + run.start_, size_t(run.stop_ - run.start_)},
           run.box_->Direction(), is_after_expansion, text_justify);
     } else if (run.line_layout_item_.IsCombineText()) {
       // Justfication applies to before and after the combined text as if
@@ -67,7 +67,7 @@ class ExpansionOpportunities {
       is_after_expansion = true;
     } else {
       opportunities_in_run = Character::ExpansionOpportunityCount(
-          {text.Characters16() + run.start_, run.stop_ - run.start_},
+          {text.Characters16() + run.start_, size_t(run.stop_ - run.start_)},
           run.box_->Direction(), is_after_expansion, text_justify);
     }
     runs_with_expansions_.push_back(opportunities_in_run);
diff --git a/chromium/third_party/blink/renderer/core/layout/layout_box.cc b/chromium/third_party/blink/renderer/core/layout/layout_box.cc
index 0dfc7f124ae..7ce640d590c 100644
--- a/chromium/third_party/blink/renderer/core/layout/layout_box.cc
+++ b/chromium/third_party/blink/renderer/core/layout/layout_box.cc
@@ -2398,8 +2398,7 @@ scoped_refptr<const NGLayoutResult> LayoutBox::CachedLayoutResult(
   if (size_cache_status == NGLayoutCacheStatus::kNeedsSimplifiedLayout)
     cache_status = NGLayoutCacheStatus::kNeedsSimplifiedLayout;
 
-  base::Optional<LayoutUnit> bfc_block_offset =
-      cached_layout_result->BfcBlockOffset();
+  base::Optional<LayoutUnit> bfc_block_offset = base::pass_optional(cached_layout_result->BfcBlockOffset());
   LayoutUnit bfc_line_offset = new_space.BfcOffset().line_offset;
 
   const NGConstraintSpace& old_space =
diff --git a/chromium/third_party/blink/renderer/core/layout/layout_grid.cc b/chromium/third_party/blink/renderer/core/layout/layout_grid.cc
index 7e833ac8f2b..af9faaebd87 100644
--- a/chromium/third_party/blink/renderer/core/layout/layout_grid.cc
+++ b/chromium/third_party/blink/renderer/core/layout/layout_grid.cc
@@ -668,7 +668,7 @@ size_t LayoutGrid::ComputeAutoRepeatTracksCount(
 
   // Add gutters as if there where only 1 auto repeat track. Gaps between auto
   // repeat tracks will be added later when computing the repetitions.
-  LayoutUnit gap_size = GridGap(direction, available_size);
+  LayoutUnit gap_size = GridGap(direction, available_size.value());
   tracks_size +=
       gap_size * (track_sizes.size() + auto_repeat_track_list_length - 1);
 
@@ -764,7 +764,7 @@ void LayoutGrid::PlaceItemsOnGrid(
       kForRows, ConvertLayoutUnitToOptional(
                     AvailableLogicalHeightForPercentageComputation()));
   size_t auto_repeat_columns =
-      ComputeAutoRepeatTracksCount(kForColumns, available_logical_width);
+      ComputeAutoRepeatTracksCount(kForColumns, base::pass_optional(available_logical_width));
 
   auto_repeat_rows = ClampAutoRepeatTracks(kForRows, auto_repeat_rows);
   auto_repeat_columns = ClampAutoRepeatTracks(kForColumns, auto_repeat_columns);
diff --git a/chromium/third_party/blink/renderer/core/layout/ng/ng_absolute_utils.cc b/chromium/third_party/blink/renderer/core/layout/ng/ng_absolute_utils.cc
index 50493e523cd..fefeb7627f4 100644
--- a/chromium/third_party/blink/renderer/core/layout/ng/ng_absolute_utils.cc
+++ b/chromium/third_party/blink/renderer/core/layout/ng/ng_absolute_utils.cc
@@ -378,7 +378,7 @@ NGLogicalOutOfFlowPosition ComputePartialAbsoluteWithChildInlineSize(
       max_inline_size, static_position.offset.inline_offset,
       static_position.inline_edge ==
           NGLogicalStaticPosition::InlineEdge::kInlineStart,
-      is_start_dominant, false /* is_block_direction */, inline_size,
+      is_start_dominant, false /* is_block_direction */, base::pass_optional(inline_size),
       &position.size.inline_size, &position.inset.inline_start,
       &position.inset.inline_end, &position.margins.inline_start,
       &position.margins.inline_end);
@@ -442,7 +442,7 @@ void ComputeFullAbsoluteWithChildBlockSize(
       min_block_size, max_block_size, static_position.offset.block_offset,
       static_position.block_edge ==
           NGLogicalStaticPosition::BlockEdge::kBlockStart,
-      is_start_dominant, true /* is_block_direction */, block_size,
+      is_start_dominant, true /* is_block_direction */, base::pass_optional(block_size),
       &position->size.block_size, &position->inset.block_start,
       &position->inset.block_end, &position->margins.block_start,
       &position->margins.block_end);
diff --git a/chromium/third_party/blink/renderer/core/layout/ng/ng_block_layout_algorithm.cc b/chromium/third_party/blink/renderer/core/layout/ng/ng_block_layout_algorithm.cc
index 12e37f57e61..fc14cb31b4b 100644
--- a/chromium/third_party/blink/renderer/core/layout/ng/ng_block_layout_algorithm.cc
+++ b/chromium/third_party/blink/renderer/core/layout/ng/ng_block_layout_algorithm.cc
@@ -1304,7 +1304,7 @@ bool NGBlockLayoutAlgorithm::HandleInflow(
                        /* is_new_fc */ false);
   NGConstraintSpace child_space = CreateConstraintSpaceForChild(
       child, child_data, child_available_size_, /* is_new_fc */ false,
-      forced_bfc_block_offset, has_clearance_past_adjoining_floats);
+      base::pass_optional(forced_bfc_block_offset), has_clearance_past_adjoining_floats);
   scoped_refptr<const NGLayoutResult> layout_result = LayoutInflow(
       child_space, child_break_token, &child, inline_child_layout_context);
 
@@ -1329,7 +1329,7 @@ bool NGBlockLayoutAlgorithm::FinishInflow(
     NGInlineChildLayoutContext* inline_child_layout_context,
     scoped_refptr<const NGInlineBreakToken>* previous_inline_break_token) {
   base::Optional<LayoutUnit> child_bfc_block_offset =
-      layout_result->BfcBlockOffset();
+      base::pass_optional(layout_result->BfcBlockOffset());
 
   bool is_self_collapsing = layout_result->IsSelfCollapsing();
 
@@ -1482,7 +1482,7 @@ bool NGBlockLayoutAlgorithm::FinishInflow(
       child_bfc_block_offset) {
     NGConstraintSpace new_child_space = CreateConstraintSpaceForChild(
         child, *child_data, child_available_size_, /* is_new_fc */ false,
-        child_bfc_block_offset);
+        base::pass_optional(child_bfc_block_offset));
     layout_result = LayoutInflow(new_child_space, child_break_token, &child,
                                  inline_child_layout_context);
 
diff --git a/chromium/third_party/blink/renderer/core/layout/ng/ng_block_node.cc b/chromium/third_party/blink/renderer/core/layout/ng/ng_block_node.cc
index b2e4a86c335..d13420d9978 100644
--- a/chromium/third_party/blink/renderer/core/layout/ng/ng_block_node.cc
+++ b/chromium/third_party/blink/renderer/core/layout/ng/ng_block_node.cc
@@ -1134,7 +1134,7 @@ scoped_refptr<const NGLayoutResult> NGBlockNode::RunLegacyLayout(
     if (needs_cached_result_update) {
       layout_result = base::AdoptRef(new NGLayoutResult(
           *layout_result, constraint_space, layout_result->BfcLineOffset(),
-          layout_result->BfcBlockOffset()));
+          base::pass_optional(layout_result->BfcBlockOffset())));
       box_->SetCachedLayoutResult(*layout_result, /* break_token */ nullptr);
     }
   }
diff --git a/chromium/third_party/blink/renderer/core/layout/ng/ng_constraint_space.h b/chromium/third_party/blink/renderer/core/layout/ng/ng_constraint_space.h
index 965a32bdb91..0044350b588 100644
--- a/chromium/third_party/blink/renderer/core/layout/ng/ng_constraint_space.h
+++ b/chromium/third_party/blink/renderer/core/layout/ng/ng_constraint_space.h
@@ -387,14 +387,14 @@ class CORE_EXPORT NGConstraintSpace final {
   // This value should be propagated to child layouts if the current layout
   // hasn't resolved its BFC offset yet.
   base::Optional<LayoutUnit> ForcedBfcBlockOffset() const {
-    return HasRareData() ? rare_data_->forced_bfc_block_offset : base::nullopt;
+    return HasRareData() ? base::pass_optional(rare_data_->forced_bfc_block_offset) : base::nullopt;
   }
 
   // If present, this is a hint as to where place any adjoining objects. This
   // isn't necessarily the final position, just where they ended up in a
   // previous layout pass.
   base::Optional<LayoutUnit> OptimisticBfcBlockOffset() const {
-    return HasRareData() ? rare_data_->optimistic_bfc_block_offset
+    return HasRareData() ? base::pass_optional(rare_data_->optimistic_bfc_block_offset)
                          : base::nullopt;
   }
 
diff --git a/chromium/third_party/blink/renderer/core/layout/ng/ng_layout_result.h b/chromium/third_party/blink/renderer/core/layout/ng/ng_layout_result.h
index 126a2ec22f5..751e0673bb9 100644
--- a/chromium/third_party/blink/renderer/core/layout/ng/ng_layout_result.h
+++ b/chromium/third_party/blink/renderer/core/layout/ng/ng_layout_result.h
@@ -93,7 +93,7 @@ class CORE_EXPORT NGLayoutResult : public RefCounted<NGLayoutResult> {
 
   const base::Optional<LayoutUnit> BfcBlockOffset() const {
     if (HasRareData())
-      return rare_data_->bfc_block_offset;
+      return base::pass_optional(rare_data_->bfc_block_offset);
 
     if (bitfields_.has_oof_positioned_offset) {
       DCHECK(physical_fragment_->IsOutOfFlowPositioned());
@@ -270,7 +270,7 @@ class CORE_EXPORT NGLayoutResult : public RefCounted<NGLayoutResult> {
     RareData(LayoutUnit bfc_line_offset,
              base::Optional<LayoutUnit> bfc_block_offset)
         : bfc_line_offset(bfc_line_offset),
-          bfc_block_offset(bfc_block_offset) {}
+          bfc_block_offset(base::pass_optional(bfc_block_offset)) {}
 
     LayoutUnit bfc_line_offset;
     base::Optional<LayoutUnit> bfc_block_offset;
diff --git a/chromium/third_party/blink/renderer/modules/indexeddb/idb_object_store.cc b/chromium/third_party/blink/renderer/modules/indexeddb/idb_object_store.cc
index 3d340074ccd..72fbca73b91 100644
--- a/chromium/third_party/blink/renderer/modules/indexeddb/idb_object_store.cc
+++ b/chromium/third_party/blink/renderer/modules/indexeddb/idb_object_store.cc
@@ -556,8 +556,8 @@ IDBRequest* IDBObjectStore::DoPut(ScriptState* script_state,
     if (clone.IsEmpty())
       value_wrapper.Clone(script_state, &clone);
     index_keys.emplace_back(
-        IDBIndexKeys{.id = it.key,
-                     .keys = GenerateIndexKeysForValue(
+        IDBIndexKeys{it.key,
+                     GenerateIndexKeysForValue(
                          script_state->GetIsolate(), *it.value, clone)});
   }
   // Records 1KB to 1GB.
@@ -747,9 +747,9 @@ class IndexPopulator final : public NativeEventListener {
       Vector<IDBIndexKeys> index_keys;
       index_keys.ReserveInitialCapacity(1);
       index_keys.emplace_back(IDBIndexKeys{
-          .id = IndexMetadata().id,
-          .keys = GenerateIndexKeysForValue(script_state_->GetIsolate(),
-                                            IndexMetadata(), value)});
+          IndexMetadata().id,
+          GenerateIndexKeysForValue(script_state_->GetIsolate(),
+                                    IndexMetadata(), value)});
 
       database_->Backend()->SetIndexKeys(transaction_id_, object_store_id_,
                                          IDBKey::Clone(primary_key),
diff --git a/chromium/third_party/blink/renderer/modules/xr/xr_ray.cc b/chromium/third_party/blink/renderer/modules/xr/xr_ray.cc
index 9e695382345..7aaefd0a947 100644
--- a/chromium/third_party/blink/renderer/modules/xr/xr_ray.cc
+++ b/chromium/third_party/blink/renderer/modules/xr/xr_ray.cc
@@ -145,7 +145,7 @@ DOMFloat32Array* XRRay::matrix() {
     TransformationMatrix matrix;
 
     const blink::FloatPoint3D desiredRayDirection = {
-        direction_->x(), direction_->y(), direction_->z()};
+        float(direction_->x()), float(direction_->y()), float(direction_->z())};
 
     // Translation from 0 to |origin_| is simply translation by |origin_|.
     // (implicit) Step 6: Let translation be the translation matrix with
diff --git a/chromium/third_party/blink/renderer/modules/xr/xr_session.cc b/chromium/third_party/blink/renderer/modules/xr/xr_session.cc
index 8b7232f3b95..75c937e85bd 100644
--- a/chromium/third_party/blink/renderer/modules/xr/xr_session.cc
+++ b/chromium/third_party/blink/renderer/modules/xr/xr_session.cc
@@ -387,8 +387,8 @@ ScriptPromise XRSession::requestHitTest(ScriptState* script_state,
   ray_mojo->origin = WebFloatPoint3D(ray->origin()->x(), ray->origin()->y(),
                                      ray->origin()->z());
 
-  ray_mojo->direction = {ray->direction()->x(), ray->direction()->y(),
-                         ray->direction()->z()};
+  ray_mojo->direction = {float(ray->direction()->x()), float(ray->direction()->y()),
+                         float(ray->direction()->z())};
 
   auto* resolver = MakeGarbageCollected<ScriptPromiseResolver>(script_state);
   ScriptPromise promise = resolver->Promise();
diff --git a/chromium/third_party/blink/renderer/platform/fonts/shaping/shape_result.cc b/chromium/third_party/blink/renderer/platform/fonts/shaping/shape_result.cc
index c436a831e51..cff584a00f0 100644
--- a/chromium/third_party/blink/renderer/platform/fonts/shaping/shape_result.cc
+++ b/chromium/third_party/blink/renderer/platform/fonts/shaping/shape_result.cc
@@ -1128,9 +1128,11 @@ void ShapeResult::InsertRun(scoped_refptr<ShapeResult::RunInfo> run) {
     return run->start_index_ > start_index;
   };
 
-  Vector<scoped_refptr<RunInfo>>::iterator iterator = std::lower_bound(
-      runs_.begin(), runs_.end(), run->start_index_,
-      HB_DIRECTION_IS_FORWARD(run->direction_) ? ltr_comparer : rtl_comparer);
+  Vector<scoped_refptr<RunInfo>>::iterator iterator;
+  if (HB_DIRECTION_IS_FORWARD(run->direction_))
+    iterator = std::lower_bound(runs_.begin(), runs_.end(), run->start_index_, ltr_comparer);
+  else
+    iterator = std::lower_bound(runs_.begin(), runs_.end(), run->start_index_, rtl_comparer);
   if (iterator != runs_.end())
     runs_.insert(iterator - runs_.begin(), std::move(run));
 
diff --git a/chromium/third_party/blink/renderer/platform/graphics/lab_color_space.h b/chromium/third_party/blink/renderer/platform/graphics/lab_color_space.h
index e002057ac5d..78c316e04a9 100644
--- a/chromium/third_party/blink/renderer/platform/graphics/lab_color_space.h
+++ b/chromium/third_party/blink/renderer/platform/graphics/lab_color_space.h
@@ -62,7 +62,7 @@ class sRGBColorSpace {
                  ? clamp(u / 12.92f, .0f, 1.0f)
                  : clamp(std::pow((u + 0.055f) / 1.055f, 2.4f), .0f, 1.0f);
     };
-    return {EOTF(v.X()), EOTF(v.Y()), EOTF(v.Z())};
+    return FloatPoint3D(EOTF(v.X()), EOTF(v.Y()), EOTF(v.Z()));
   }
 
   FloatPoint3D fromLinear(const FloatPoint3D& v) const {
@@ -71,7 +71,7 @@ class sRGBColorSpace {
                   ? clamp(12.92 * u, .0, 1.0)
                   : clamp(1.055 * std::pow(u, 1.0 / 2.4) - 0.055, .0, 1.0));
     };
-    return {OETF(v.X()), OETF(v.Y()), OETF(v.Z())};
+    return FloatPoint3D(OETF(v.X()), OETF(v.Y()), OETF(v.Z()));
   }
 
   // See https://en.wikipedia.org/wiki/SRGB#The_reverse_transformation.
diff --git a/chromium/third_party/blink/renderer/platform/text/text_boundaries.cc b/chromium/third_party/blink/renderer/platform/text/text_boundaries.cc
index 9bb388a70e5..61dc36dfa7e 100644
--- a/chromium/third_party/blink/renderer/platform/text/text_boundaries.cc
+++ b/chromium/third_party/blink/renderer/platform/text/text_boundaries.cc
@@ -55,7 +55,7 @@ int StartOfLastWordBoundaryContext(const UChar* characters, int length) {
 }
 
 int FindNextWordForward(const UChar* chars, int len, int position) {
-  TextBreakIterator* it = WordBreakIterator({chars, len});
+  TextBreakIterator* it = WordBreakIterator({chars, size_t(len)});
 
   position = it->following(position);
   while (position != kTextBreakDone) {
@@ -72,7 +72,7 @@ int FindNextWordForward(const UChar* chars, int len, int position) {
 }
 
 int FindNextWordBackward(const UChar* chars, int len, int position) {
-  TextBreakIterator* it = WordBreakIterator({chars, len});
+  TextBreakIterator* it = WordBreakIterator({chars, size_t(len)});
 
   position = it->preceding(position);
   while (position != kTextBreakDone) {
@@ -95,7 +95,7 @@ std::pair<int, int> FindWordBackward(const UChar* chars,
   DCHECK_LE(position, len);
   if (len == 0)
     return {0, 0};
-  TextBreakIterator* it = WordBreakIterator({chars, len});
+  TextBreakIterator* it = WordBreakIterator({chars, size_t(len)});
   const int start = it->preceding(position);
   const int end = it->next();
   if (start < 0) {
@@ -110,7 +110,7 @@ std::pair<int, int> FindWordForward(const UChar* chars, int len, int position) {
   DCHECK_LE(position, len);
   if (len == 0)
     return {0, 0};
-  TextBreakIterator* it = WordBreakIterator({chars, len});
+  TextBreakIterator* it = WordBreakIterator({chars, size_t(len)});
   const int end = it->following(position);
   const int start = it->previous();
   if (end < 0) {
@@ -121,13 +121,13 @@ std::pair<int, int> FindWordForward(const UChar* chars, int len, int position) {
 }
 
 int FindWordStartBoundary(const UChar* chars, int len, int position) {
-  TextBreakIterator* it = WordBreakIterator({chars, len});
+  TextBreakIterator* it = WordBreakIterator({chars, size_t(len)});
   it->following(position);
   return it->previous();
 }
 
 int FindWordEndBoundary(const UChar* chars, int len, int position) {
-  TextBreakIterator* it = WordBreakIterator({chars, len});
+  TextBreakIterator* it = WordBreakIterator({chars, size_t(len)});
   int end = it->following(position);
   return end < 0 ? it->last() : end;
 }
diff --git a/chromium/third_party/blink/renderer/platform/wtf/allocator/allocator.h b/chromium/third_party/blink/renderer/platform/wtf/allocator/allocator.h
index bb5e450b6d4..45078f5b275 100644
--- a/chromium/third_party/blink/renderer/platform/wtf/allocator/allocator.h
+++ b/chromium/third_party/blink/renderer/platform/wtf/allocator/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/perfetto/include/perfetto/base/compiler.h b/chromium/third_party/perfetto/include/perfetto/base/compiler.h
index a4cb6ec0a36..ff292e063fb 100644
--- a/chromium/third_party/perfetto/include/perfetto/base/compiler.h
+++ b/chromium/third_party/perfetto/include/perfetto/base/compiler.h
@@ -19,8 +19,13 @@
 
 #include <type_traits>
 
+#if defined(__GNUC__) || defined(__clang__)
 #define PERFETTO_LIKELY(_x) __builtin_expect(!!(_x), 1)
 #define PERFETTO_UNLIKELY(_x) __builtin_expect(!!(_x), 0)
+#else
+#define PERFETTO_LIKELY(_x) (_x)
+#define PERFETTO_UNLIKELY(_x) (_x)
+#endif
 
 #if defined(__GNUC__) || defined(__clang__)
 #define PERFETTO_WARN_UNUSED_RESULT __attribute__((warn_unused_result))
diff --git a/chromium/third_party/perfetto/src/protozero/protoc_plugin/protozero_plugin.cc b/chromium/third_party/perfetto/src/protozero/protoc_plugin/protozero_plugin.cc
index 8902b6b8450..a4788fce1c1 100644
--- a/chromium/third_party/perfetto/src/protozero/protoc_plugin/protozero_plugin.cc
+++ b/chromium/third_party/perfetto/src/protozero/protoc_plugin/protozero_plugin.cc
@@ -49,8 +49,13 @@ using google::protobuf::io::ZeroCopyOutputStream;
 constexpr int kMaxDecoderFieldId = 999;
 
 void Assert(bool condition) {
+#ifdef _MSC_VER
+  if (!condition)
+    __debugbreak();
+#else
   if (!condition)
     __builtin_trap();
+#endif
 }
 
 struct FileDescriptorComp {
diff --git a/chromium/ui/accessibility/ax_language_detection.cc b/chromium/ui/accessibility/ax_language_detection.cc
index 9b11330d392..daab409482e 100644
--- a/chromium/ui/accessibility/ax_language_detection.cc
+++ b/chromium/ui/accessibility/ax_language_detection.cc
@@ -246,7 +246,7 @@ AXLanguageDetectionManager::GetLanguageAnnotationForStringAttribute(
   if (node.HasStringAttribute(ax::mojom::StringAttribute::kLanguage)) {
     // Use author-provided language if present.
     language_annotation.push_back(AXLanguageSpan{
-        0 /* start_index */, attr_value.length() /* end_index */,
+        0 /* start_index */, int(attr_value.length()) /* end_index */,
         node.GetStringAttribute(
             ax::mojom::StringAttribute::kLanguage) /* language */,
         1 /* probability */});
diff --git a/chromium/ui/accessibility/ax_node.cc b/chromium/ui/accessibility/ax_node.cc
index 88c61870a9d..41ef550915d 100644
--- a/chromium/ui/accessibility/ax_node.cc
+++ b/chromium/ui/accessibility/ax_node.cc
@@ -336,14 +336,14 @@ base::Optional<int> AXNode::GetTableColCount() const {
   const AXTableInfo* table_info = GetAncestorTableInfo();
   if (!table_info)
     return base::nullopt;
-  return int{table_info->col_count};
+  return int(table_info->col_count);
 }
 
 base::Optional<int> AXNode::GetTableRowCount() const {
   const AXTableInfo* table_info = GetAncestorTableInfo();
   if (!table_info)
     return base::nullopt;
-  return int{table_info->row_count};
+  return int(table_info->row_count);
 }
 
 base::Optional<int> AXNode::GetTableAriaColCount() const {
@@ -374,11 +374,11 @@ AXNode* AXNode::GetTableCellFromIndex(int index) const {
     return nullptr;
 
   // There is a table but there is no cell with the given index.
-  if (index < 0 || size_t{index} >= table_info->unique_cell_ids.size()) {
+  if (index < 0 || size_t(index) >= table_info->unique_cell_ids.size()) {
     return nullptr;
   }
 
-  return tree_->GetFromId(table_info->unique_cell_ids[size_t{index}]);
+  return tree_->GetFromId(table_info->unique_cell_ids[size_t(index)]);
 }
 
 AXNode* AXNode::GetTableCaption() const {
@@ -395,13 +395,13 @@ AXNode* AXNode::GetTableCellFromCoords(int row_index, int col_index) const {
     return nullptr;
 
   // There is a table but the given coordinates are outside the table.
-  if (row_index < 0 || size_t{row_index} >= table_info->row_count ||
-      col_index < 0 || size_t{col_index} >= table_info->col_count) {
+  if (row_index < 0 || size_t(row_index) >= table_info->row_count ||
+      col_index < 0 || size_t(col_index) >= table_info->col_count) {
     return nullptr;
   }
 
   return tree_->GetFromId(
-      table_info->cell_ids[size_t{row_index}][size_t{col_index}]);
+      table_info->cell_ids[size_t(row_index)][size_t(col_index)]);
 }
 
 void AXNode::GetTableColHeaderNodeIds(
@@ -412,11 +412,11 @@ void AXNode::GetTableColHeaderNodeIds(
   if (!table_info)
     return;
 
-  if (col_index < 0 || size_t{col_index} >= table_info->col_count)
+  if (col_index < 0 || size_t(col_index) >= table_info->col_count)
     return;
 
-  for (size_t i = 0; i < table_info->col_headers[size_t{col_index}].size(); i++)
-    col_header_ids->push_back(table_info->col_headers[size_t{col_index}][i]);
+  for (size_t i = 0; i < table_info->col_headers[size_t(col_index)].size(); i++)
+    col_header_ids->push_back(table_info->col_headers[size_t(col_index)][i]);
 }
 
 void AXNode::GetTableRowHeaderNodeIds(
@@ -427,11 +427,11 @@ void AXNode::GetTableRowHeaderNodeIds(
   if (!table_info)
     return;
 
-  if (row_index < 0 || size_t{row_index} >= table_info->row_count)
+  if (row_index < 0 || size_t(row_index) >= table_info->row_count)
     return;
 
-  for (size_t i = 0; i < table_info->row_headers[size_t{row_index}].size(); i++)
-    row_header_ids->push_back(table_info->row_headers[size_t{row_index}][i]);
+  for (size_t i = 0; i < table_info->row_headers[size_t(row_index)].size(); i++)
+    row_header_ids->push_back(table_info->row_headers[size_t(row_index)][i]);
 }
 
 void AXNode::GetTableUniqueCellIds(std::vector<int32_t>* cell_ids) const {
@@ -471,7 +471,7 @@ base::Optional<int> AXNode::GetTableRowRowIndex() const {
 
   const auto& iter = table_info->row_id_to_index.find(id());
   if (iter != table_info->row_id_to_index.end())
-    return int{iter->second};
+    return int(iter->second);
   return base::nullopt;
 }
 
@@ -522,7 +522,7 @@ base::Optional<int> AXNode::GetTableCellIndex() const {
 
   const auto& iter = table_info->cell_id_to_index.find(id());
   if (iter != table_info->cell_id_to_index.end())
-    return int{iter->second};
+    return int(iter->second);
   return base::nullopt;
 }
 
@@ -535,7 +535,7 @@ base::Optional<int> AXNode::GetTableCellColIndex() const {
   if (!index)
     return base::nullopt;
 
-  return int{table_info->cell_data_vector[*index].col_index};
+  return int(table_info->cell_data_vector[*index].col_index);
 }
 
 base::Optional<int> AXNode::GetTableCellRowIndex() const {
@@ -547,7 +547,7 @@ base::Optional<int> AXNode::GetTableCellRowIndex() const {
   if (!index)
     return base::nullopt;
 
-  return int{table_info->cell_data_vector[*index].row_index};
+  return int(table_info->cell_data_vector[*index].row_index);
 }
 
 base::Optional<int> AXNode::GetTableCellColSpan() const {
@@ -585,7 +585,7 @@ base::Optional<int> AXNode::GetTableCellAriaColIndex() const {
   if (!index)
     return base::nullopt;
 
-  return int{table_info->cell_data_vector[*index].aria_col_index};
+  return int(table_info->cell_data_vector[*index].aria_col_index);
 }
 
 base::Optional<int> AXNode::GetTableCellAriaRowIndex() const {
@@ -597,7 +597,7 @@ base::Optional<int> AXNode::GetTableCellAriaRowIndex() const {
   if (!index)
     return base::nullopt;
 
-  return int{table_info->cell_data_vector[*index].aria_row_index};
+  return int(table_info->cell_data_vector[*index].aria_row_index);
 }
 
 void AXNode::GetTableCellColHeaderNodeIds(
diff --git a/chromium/ui/accessibility/ax_node_position.cc b/chromium/ui/accessibility/ax_node_position.cc
index 4666187473a..5c01e20eb11 100644
--- a/chromium/ui/accessibility/ax_node_position.cc
+++ b/chromium/ui/accessibility/ax_node_position.cc
@@ -165,7 +165,7 @@ void AXNodePosition::AnchorChild(int child_index,
     child = child_tree_manager->GetRootAsAXNode();
     *tree_id = child_tree_manager->GetTreeID();
   } else {
-    child = GetAnchor()->children()[size_t{child_index}];
+    child = GetAnchor()->children()[size_t(child_index)];
     *tree_id = this->tree_id();
   }
 
@@ -183,11 +183,11 @@ int AXNodePosition::AnchorChildCount() const {
     return 1;
   }
 
-  return int{GetAnchor()->children().size()};
+  return int(GetAnchor()->children().size());
 }
 
 int AXNodePosition::AnchorIndexInParent() const {
-  return GetAnchor() ? int{GetAnchor()->index_in_parent()} : INVALID_INDEX;
+  return GetAnchor() ? int(GetAnchor()->index_in_parent()) : INVALID_INDEX;
 }
 
 base::stack<AXNode*> AXNodePosition::GetAncestorAnchors() const {
diff --git a/chromium/ui/accessibility/ax_table_info.cc b/chromium/ui/accessibility/ax_table_info.cc
index dc8b2d33f55..d598f942677 100644
--- a/chromium/ui/accessibility/ax_table_info.cc
+++ b/chromium/ui/accessibility/ax_table_info.cc
@@ -257,12 +257,12 @@ void AXTableInfo::BuildCellDataVectorFromRowAndCellNodes(
       if (aria_row_count) {
         aria_row_count =
             std::max((*aria_row_count),
-                     int{current_aria_row_index + cell_data.row_span - 1});
+                     int(current_aria_row_index + cell_data.row_span - 1));
       }
       if (aria_col_count) {
         aria_col_count =
             std::max((*aria_col_count),
-                     int{current_aria_col_index + cell_data.col_span - 1});
+                     int(current_aria_col_index + cell_data.col_span - 1));
       }
       // Update |current_col_index| to reflect the next available index after
       // this cell including its colspan. The next column index in this row
@@ -420,7 +420,7 @@ void AXTableInfo::UpdateExtraMacColumnNodeAttributes(size_t col_index) {
   data.int_attributes.clear();
 
   // Update the column index.
-  data.AddIntAttribute(IntAttribute::kTableColumnIndex, int32_t{col_index});
+  data.AddIntAttribute(IntAttribute::kTableColumnIndex, int32_t(col_index));
 
   // Update the column header.
   if (!col_headers[col_index].empty()) {
diff --git a/chromium/ui/accessibility/ax_tree.cc b/chromium/ui/accessibility/ax_tree.cc
index 9c26f68ce8f..5ee23dd3919 100644
--- a/chromium/ui/accessibility/ax_tree.cc
+++ b/chromium/ui/accessibility/ax_tree.cc
@@ -1990,7 +1990,7 @@ AXTree::Selection AXTree::GetUnignoredSelection() const {
     unignored_selection.anchor_affinity = anchor_position->affinity();
   } else if (anchor_position->IsTreePosition()) {
     // Fix offset to be in terms of the unignored index.
-    if (data().sel_anchor_offset == int32_t{anchor_node->children().size()}) {
+    if (data().sel_anchor_offset == int32_t(anchor_node->children().size())) {
       unignored_selection.anchor_offset = anchor_node->GetUnignoredChildCount();
     } else {
       AXNode* child = anchor_node->children()[data().sel_anchor_offset];
@@ -2019,7 +2019,7 @@ AXTree::Selection AXTree::GetUnignoredSelection() const {
     unignored_selection.focus_affinity = focus_position->affinity();
   } else if (focus_position->IsTreePosition()) {
     // Fix offset to be in terms of the unignored index.
-    if (data().sel_focus_offset == int32_t{focus_node->children().size()}) {
+    if (data().sel_focus_offset == int32_t(focus_node->children().size())) {
       unignored_selection.focus_offset = focus_node->GetUnignoredChildCount();
     } else {
       AXNode* child = focus_node->children()[data().sel_focus_offset];
diff --git a/chromium/ui/accessibility/platform/ax_platform_node_delegate_base.cc b/chromium/ui/accessibility/platform/ax_platform_node_delegate_base.cc
index a2f3fdb30aa..93046d91214 100644
--- a/chromium/ui/accessibility/platform/ax_platform_node_delegate_base.cc
+++ b/chromium/ui/accessibility/platform/ax_platform_node_delegate_base.cc
@@ -32,7 +32,7 @@ const AXTreeData& AXPlatformNodeDelegateBase::GetTreeData() const {
 
 const AXTree::Selection AXPlatformNodeDelegateBase::GetUnignoredSelection()
     const {
-  return AXTree::Selection{-1, -1, -1, ax::mojom::TextAffinity::kDownstream};
+  return AXTree::Selection{true, -1, -1, ax::mojom::TextAffinity::kDownstream};
 }
 
 AXNodePosition::AXPositionInstance
diff --git a/chromium/ui/events/blink/prediction/linear_resampling.cc b/chromium/ui/events/blink/prediction/linear_resampling.cc
index 9312c686367..270fda0ae31 100644
--- a/chromium/ui/events/blink/prediction/linear_resampling.cc
+++ b/chromium/ui/events/blink/prediction/linear_resampling.cc
@@ -6,6 +6,8 @@
 
 #include "ui/events/blink/prediction/predictor_factory.h"
 
+#include <algorithm>
+
 namespace ui {
 
 namespace {
diff --git a/chromium/ui/gl/BUILD.gn b/chromium/ui/gl/BUILD.gn
index d042f82df30..5348fd57e2b 100644
--- a/chromium/ui/gl/BUILD.gn
+++ b/chromium/ui/gl/BUILD.gn
@@ -381,6 +381,18 @@ jumbo_component("gl") {
         "//third_party/angle:libGLESv2",
       ]
     }
+    if (is_win) {
+      sources -= [
+        "dc_layer_tree.cc",
+        "dc_layer_tree.h",
+        "direct_composition_child_surface_win.cc",
+        "direct_composition_child_surface_win.h",
+        "direct_composition_surface_win.cc",
+        "direct_composition_surface_win.h",
+        "swap_chain_presenter.cc",
+        "swap_chain_presenter.h",
+      ]
+    }
     if (is_linux || is_win) {
       sources -= [
         "gl_surface_egl.cc",