diff options
author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2019-06-14 11:24:14 +0200 |
---|---|---|
committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2019-06-24 09:09:22 +0000 |
commit | 9573a72b03ebc97443271319e44da3a35288ef98 (patch) | |
tree | 5800c60c496a75db0b6e9f2bd67540906ba8a135 | |
parent | 7bec67c6df2ad6880cba7536d66e27ea8a9af599 (diff) | |
download | qtwebengine-chromium-9573a72b03ebc97443271319e44da3a35288ef98.tar.gz |
Fixup of Windows build post 75-merge
Change-Id: I81b6d3dba53e9e58632107bdeda33c0c996506de
Reviewed-by: Michal Klocek <michal.klocek@qt.io>
10 files changed, 37 insertions, 5 deletions
diff --git a/chromium/base/task/thread_pool/scheduler_worker_pool.h b/chromium/base/task/thread_pool/scheduler_worker_pool.h index eb82100c3c0..d09f39a9f39 100644 --- a/chromium/base/task/thread_pool/scheduler_worker_pool.h +++ b/chromium/base/task/thread_pool/scheduler_worker_pool.h @@ -120,7 +120,9 @@ class BASE_EXPORT SchedulerWorkerPool { protected: BaseScopedWorkersExecutor() = default; ~BaseScopedWorkersExecutor() = default; +#if !defined(COMPILER_MSVC) DISALLOW_COPY_AND_ASSIGN(BaseScopedWorkersExecutor); +#endif }; // Allows a sequence to be pushed to a pool's PriorityQueue at the end of a diff --git a/chromium/base/trace_event/trace_arguments.h b/chromium/base/trace_event/trace_arguments.h index 0abc1279ffb..9c9f88e645d 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 03acb86bbc0..f81691b6a14 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 d189d2234a5..2ea7308d5e8 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" @@ -228,7 +229,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) { @@ -260,7 +261,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 24cb43a04b0..950b635e8ba 100644 --- a/chromium/third_party/blink/renderer/core/frame/local_frame.h +++ b/chromium/third_party/blink/renderer/core/frame/local_frame.h @@ -46,6 +46,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" @@ -88,7 +89,6 @@ class InspectorTaskRunner; class InterfaceRegistry; class IntSize; class LayoutView; -class LocalDOMWindow; class LocalWindowProxy; class LocalFrameClient; class NavigationScheduler; 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 1ba227fbda7..980d4a34075 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 @@ -7,6 +7,7 @@ #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_; diff --git a/chromium/third_party/dav1d/BUILD.gn b/chromium/third_party/dav1d/BUILD.gn index 56d709edfe7..6f3f3fb56ac 100644 --- a/chromium/third_party/dav1d/BUILD.gn +++ b/chromium/third_party/dav1d/BUILD.gn @@ -91,6 +91,17 @@ config("dav1d_config") { "libdav1d/include/dav1d", platform_config_root, ] + if (!is_clang) { + if (is_win) { + include_dirs += [ + "libdav1d/include/compat/msvc" + ] + } else { + include_dirs += [ + "libdav1d/include/compat/gcc" + ] + } + } } dav1d_copts = [ diff --git a/chromium/v8/src/heap/heap-write-barrier-inl.h b/chromium/v8/src/heap/heap-write-barrier-inl.h index b33fd5d4c11..ba7d4decc4f 100644 --- a/chromium/v8/src/heap/heap-write-barrier-inl.h +++ b/chromium/v8/src/heap/heap-write-barrier-inl.h @@ -53,7 +53,11 @@ V8_EXPORT_PRIVATE void Heap_MarkingBarrierForDescriptorArraySlow( namespace heap_internals { struct Space { +#if V8_CC_MSVC + static constexpr uintptr_t kIdOffset = 10 * kSystemPointerSize; +#else static constexpr uintptr_t kIdOffset = 9 * kSystemPointerSize; +#endif V8_INLINE AllocationSpace identity() { return *reinterpret_cast<AllocationSpace*>(reinterpret_cast<Address>(this) + kIdOffset); diff --git a/chromium/v8/src/heap/spaces.h b/chromium/v8/src/heap/spaces.h index ce286ef3909..5ab3eebc20d 100644 --- a/chromium/v8/src/heap/spaces.h +++ b/chromium/v8/src/heap/spaces.h @@ -1099,8 +1099,11 @@ class V8_EXPORT_PRIVATE Space : public Malloced { std::atomic<size_t>* external_backing_store_bytes_; private: +#if V8_CC_MSVC + static const intptr_t kIdOffset = 10 * kSystemPointerSize; +#else static const intptr_t kIdOffset = 9 * kSystemPointerSize; - +#endif bool allocation_observers_paused_; Heap* heap_; AllocationSpace id_; |