Fixup of Windows build post 75-merge

Change-Id: I81b6d3dba53e9e58632107bdeda33c0c996506de
Reviewed-by: Michal Klocek <michal.klocek@qt.io>

6 files changed, 16 insertions, 4 deletions

diff --git a/chromium/base/trace_event/trace_arguments.h b/chromium/base/trace_event/trace_arguments.h
index 541dcd68488..909354a9a70 100644
--- a/chromium/base/trace_event/trace_arguments.h
+++ b/chromium/base/trace_event/trace_arguments.h
@@ -564,7 +564,11 @@ class BASE_EXPORT TraceArguments {
   TraceArguments() : size_(0) {}
 
   // Constructor for a single argument.
+#if defined(COMPILER_MSVC)
+  template <typename T>
+#else
   template <typename T, class = decltype(TraceValue::TypeCheck<T>::value)>
+#endif
   TraceArguments(const char* arg1_name, T&& arg1_value) : size_(1) {
     types_[0] = TraceValue::TypeFor<T>::value;
     names_[0] = arg1_name;
@@ -573,9 +577,13 @@ class BASE_EXPORT TraceArguments {
 
   // Constructor for two arguments.
   template <typename T1,
+#if defined(COMPILER_MSVC)
+            typename T2>
+#else
             typename T2,
             class = decltype(TraceValue::TypeCheck<T1>::value &&
                              TraceValue::TypeCheck<T2>::value)>
+#endif
   TraceArguments(const char* arg1_name,
                  T1&& arg1_value,
                  const char* arg2_name,
diff --git a/chromium/base/values.cc b/chromium/base/values.cc
index 7d042cdcd45..32a70d67b85 100644
--- a/chromium/base/values.cc
+++ b/chromium/base/values.cc
@@ -33,10 +33,11 @@ namespace base {
 //   it is permitted to inspect the common initial sequence of any of
 //   standard-layout struct members;
 //
+#if !defined(COMPILER_MSVC)
 static_assert(std::is_standard_layout<Value>::value,
               "base::Value should be a standard-layout C++ class in order "
               "to avoid undefined behaviour in its implementation!");
-
+#endif
 static_assert(sizeof(Value::DoubleStorage) == sizeof(double),
               "The double and DoubleStorage types should have the same size");
 
diff --git a/chromium/media/gpu/windows/d3d11_h264_accelerator.cc b/chromium/media/gpu/windows/d3d11_h264_accelerator.cc
index 0159614e933..d51bf4c78fb 100644
--- a/chromium/media/gpu/windows/d3d11_h264_accelerator.cc
+++ b/chromium/media/gpu/windows/d3d11_h264_accelerator.cc
@@ -6,6 +6,7 @@
 
 #include <windows.h>
 
+#include "base/macros.h"
 #include "base/memory/ptr_util.h"
 #include "base/trace_event/trace_event.h"
 #include "media/base/media_log.h"
@@ -225,7 +226,7 @@ void D3D11H264Accelerator::FillPicParamsWithConstants(
 
 #define SPS_TO_PP1(a) pic_param->a = sps->a;
 #define SPS_TO_PP2(a, b) pic_param->a = sps->b;
-#define SPS_TO_PP(...) ARG_SEL(__VA_ARGS__, SPS_TO_PP2, SPS_TO_PP1)(__VA_ARGS__)
+#define SPS_TO_PP(...) CR_EXPAND_ARG(ARG_SEL(__VA_ARGS__, SPS_TO_PP2, SPS_TO_PP1)(__VA_ARGS__))
 void D3D11H264Accelerator::PicParamsFromSPS(DXVA_PicParams_H264* pic_param,
                                             const H264SPS* sps,
                                             bool field_pic) {
@@ -257,7 +258,7 @@ void D3D11H264Accelerator::PicParamsFromSPS(DXVA_PicParams_H264* pic_param,
 
 #define PPS_TO_PP1(a) pic_param->a = pps->a;
 #define PPS_TO_PP2(a, b) pic_param->a = pps->b;
-#define PPS_TO_PP(...) ARG_SEL(__VA_ARGS__, PPS_TO_PP2, PPS_TO_PP1)(__VA_ARGS__)
+#define PPS_TO_PP(...) CR_EXPAND_ARG(ARG_SEL(__VA_ARGS__, PPS_TO_PP2, PPS_TO_PP1)(__VA_ARGS__))
 bool D3D11H264Accelerator::PicParamsFromPPS(DXVA_PicParams_H264* pic_param,
                                             const H264PPS* pps) {
   PPS_TO_PP(constrained_intra_pred_flag);
diff --git a/chromium/third_party/blink/renderer/core/frame/local_frame.h b/chromium/third_party/blink/renderer/core/frame/local_frame.h
index 46c9ab9a6f2..a487a7183e5 100644
--- a/chromium/third_party/blink/renderer/core/frame/local_frame.h
+++ b/chromium/third_party/blink/renderer/core/frame/local_frame.h
@@ -48,6 +48,7 @@
 #include "third_party/blink/renderer/core/editing/forward.h"
 #include "third_party/blink/renderer/core/frame/frame.h"
 #include "third_party/blink/renderer/core/frame/frame_types.h"
+#include "third_party/blink/renderer/core/frame/local_dom_window.h"
 #include "third_party/blink/renderer/core/frame/local_frame_view.h"
 #include "third_party/blink/renderer/core/loader/frame_loader.h"
 #include "third_party/blink/renderer/platform/graphics/touch_action.h"
@@ -89,7 +90,6 @@ class InspectorTaskRunner;
 class InterfaceRegistry;
 class IntSize;
 class LayoutView;
-class LocalDOMWindow;
 class LocalWindowProxy;
 class LocalFrameClient;
 class Node;
diff --git a/chromium/third_party/blink/renderer/core/html/portal/portal_host.h b/chromium/third_party/blink/renderer/core/html/portal/portal_host.h
index 9fa6c67e828..24b90921f0f 100644
--- a/chromium/third_party/blink/renderer/core/html/portal/portal_host.h
+++ b/chromium/third_party/blink/renderer/core/html/portal/portal_host.h
@@ -8,6 +8,7 @@
 #include "third_party/blink/public/mojom/portal/portal.mojom-blink.h"
 #include "third_party/blink/renderer/core/core_export.h"
 #include "third_party/blink/renderer/core/dom/events/event_target.h"
+#include "third_party/blink/renderer/core/frame/local_dom_window.h"
 #include "third_party/blink/renderer/core/messaging/blink_transferable_message.h"
 #include "third_party/blink/renderer/platform/supplementable.h"
 
diff --git a/chromium/third_party/blink/renderer/core/streams/transform_stream_wrapper.cc b/chromium/third_party/blink/renderer/core/streams/transform_stream_wrapper.cc
index 5069438a9ac..335c49366b4 100644
--- a/chromium/third_party/blink/renderer/core/streams/transform_stream_wrapper.cc
+++ b/chromium/third_party/blink/renderer/core/streams/transform_stream_wrapper.cc
@@ -83,6 +83,7 @@ class TransformStreamWrapper::Algorithm : public ScriptFunction {
     ExceptionState exception_state_;
     ExceptionToRejectPromiseScope reject_promise_scope_;
   };
+  friend class AlgorithmScope;
 
   Member<TransformStreamTransformer> transformer_;
   const char* const interface_name_;