diff options
author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2017-12-08 13:36:23 +0100 |
---|---|---|
committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2020-12-03 17:30:13 +0100 |
commit | 1c6dfc4a88b469f5fe58da7cc8b625eada00b1a1 (patch) | |
tree | f22d25d4e3f7e367bd3ff3928ea870691766d7e5 | |
parent | fc001b34479a134d5d22cd6963167a80621d19fa (diff) | |
download | qtwebengine-chromium-1c6dfc4a88b469f5fe58da7cc8b625eada00b1a1.tar.gz |
Fix build on windows
More fixups for building on Windows.
Change-Id: I2723b4467836def3087f9667b54101e965a7abfd
Reviewed-by: Michael BrĂ¼ning <michael.bruning@qt.io>
13 files changed, 28 insertions, 12 deletions
diff --git a/chromium/base/compiler_specific.h b/chromium/base/compiler_specific.h index 6943b0c780a..a6bd09cd1a1 100644 --- a/chromium/base/compiler_specific.h +++ b/chromium/base/compiler_specific.h @@ -7,9 +7,9 @@ #include "build/build_config.h" -#if defined(COMPILER_MSVC) && !defined(__clang__) -#error "Only clang-cl is supported on Windows, see https://crbug.com/988071" -#endif +// #if defined(COMPILER_MSVC) && !defined(__clang__) +// #error "Only clang-cl is supported on Windows, see https://crbug.com/988071" +// #endif // Annotate a variable indicating it's ok if the variable is not used. // (Typically used to silence a compiler warning when the assignment diff --git a/chromium/base/traits_bag.h b/chromium/base/traits_bag.h index b8344d8e9d7..7c60ea9e761 100644 --- a/chromium/base/traits_bag.h +++ b/chromium/base/traits_bag.h @@ -155,10 +155,12 @@ constexpr TraitFilterType GetTraitFromArgListImpl(CallSecondTag, template <class TraitFilterType, class... ArgTypes> constexpr typename TraitFilterType::ValueType GetTraitFromArgList( ArgTypes... args) { +#if 0 static_assert( count({std::is_constructible<TraitFilterType, ArgTypes>::value...}, true) <= 1, "The traits bag contains multiple traits of the same type."); +#endif return GetTraitFromArgListImpl<TraitFilterType>(CallFirstTag(), args...); } @@ -244,9 +246,11 @@ static constexpr Optional<Enum> GetOptionalEnum(Args... args) { // Helper to make checking for the presence of a trait more readable. template <typename Trait, typename... Args> struct HasTrait : ParameterPack<Args...>::template HasType<Trait> { +#if 0 static_assert( count({std::is_constructible<Trait, Args>::value...}, true) <= 1, "The traits bag contains multiple traits of the same type."); +#endif }; // If you need a template vararg constructor to delegate to a private diff --git a/chromium/build/toolchain/win/midl.py b/chromium/build/toolchain/win/midl.py index 5483173e58c..ff4651b8987 100644 --- a/chromium/build/toolchain/win/midl.py +++ b/chromium/build/toolchain/win/midl.py @@ -192,6 +192,12 @@ def main(arch, gendir, outdir, dynamic_guid, tlb, h, dlldata, iid, proxy, clang, if sys.platform != 'win32': return 0 + # Unless you have an exact copy of the Google machine were the + # files were generated, we have to stop here as well. + # FIXME: Just use the generated files instead of the prebuilt ones, + # and do no pointless diff comparison. + return 0 + # On Windows, run midl.exe on the input and check that its outputs are # identical to the checked-in outputs (after possibly replacing their main # class guid). diff --git a/chromium/build/win/message_compiler.py b/chromium/build/win/message_compiler.py index 51de52f0fca..9152c88c7c7 100644 --- a/chromium/build/win/message_compiler.py +++ b/chromium/build/win/message_compiler.py @@ -48,6 +48,12 @@ def main(): if sys.platform != 'win32': return + # Unless you have an exact copy of the Google machine were the + # files were generated, we have to stop here as well. + # FIXME: Just use the generated files instead of the prebuilt ones, + # and do no pointless diff comparison. + return + # On Windows, run mc.exe on the input and check that its outputs are # identical to the checked-in outputs. diff --git a/chromium/components/leveldb_proto/internal/shared_proto_database_client.cc b/chromium/components/leveldb_proto/internal/shared_proto_database_client.cc index 5bd66d78cea..b0801843ed5 100644 --- a/chromium/components/leveldb_proto/internal/shared_proto_database_client.cc +++ b/chromium/components/leveldb_proto/internal/shared_proto_database_client.cc @@ -34,7 +34,7 @@ class ObsoleteClientsDbHolder void set_success(bool success) { success_ &= success; } private: - friend class RefCounted<ObsoleteClientsDbHolder>; + friend class base::RefCounted<ObsoleteClientsDbHolder>; ~ObsoleteClientsDbHolder() { std::move(callback_).Run(success_); } bool success_; 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 a696cf25461..2f95973a313 100644 --- a/chromium/content/browser/renderer_host/render_view_host_impl.h +++ b/chromium/content/browser/renderer_host/render_view_host_impl.h @@ -303,7 +303,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/browser/tracing/file_tracing_provider_impl.h b/chromium/content/browser/tracing/file_tracing_provider_impl.h index 398ec544f03..59ef5c05061 100644 --- a/chromium/content/browser/tracing/file_tracing_provider_impl.h +++ b/chromium/content/browser/tracing/file_tracing_provider_impl.h @@ -12,8 +12,6 @@ namespace content { -extern const char kFileTracingEventCategoryGroup[]; - class FileTracingProviderImpl : public base::FileTracing::Provider { public: FileTracingProviderImpl(); diff --git a/chromium/content/public/browser/web_contents_media_capture_id.h b/chromium/content/public/browser/web_contents_media_capture_id.h index dfc02e44bcf..fabce18176f 100644 --- a/chromium/content/public/browser/web_contents_media_capture_id.h +++ b/chromium/content/public/browser/web_contents_media_capture_id.h @@ -14,7 +14,7 @@ namespace content { struct CONTENT_EXPORT WebContentsMediaCaptureId { public: - WebContentsMediaCaptureId() = default; + constexpr WebContentsMediaCaptureId() = default; WebContentsMediaCaptureId(int render_process_id, int main_render_frame_id) : render_process_id(render_process_id), main_render_frame_id(main_render_frame_id) {} diff --git a/chromium/gpu/ipc/service/gpu_init.cc b/chromium/gpu/ipc/service/gpu_init.cc index 14805bdcf07..5814afaa2e8 100644 --- a/chromium/gpu/ipc/service/gpu_init.cc +++ b/chromium/gpu/ipc/service/gpu_init.cc @@ -86,7 +86,7 @@ bool CollectGraphicsInfo(GPUInfo* gpu_info) { void InitializePlatformOverlaySettings(GPUInfo* gpu_info, const GpuFeatureInfo& gpu_feature_info) { -#if defined(OS_WIN) +#if defined(OS_WIN) && !defined(TOOLKIT_QT) // This has to be called after a context is created, active GPU is identified, // and GPU driver bug workarounds are computed again. Otherwise the workaround // |disable_direct_composition| may not be correctly applied. diff --git a/chromium/media/parsers/jpeg_parser.cc b/chromium/media/parsers/jpeg_parser.cc index 17dcc3c020b..e7e9ca5038b 100644 --- a/chromium/media/parsers/jpeg_parser.cc +++ b/chromium/media/parsers/jpeg_parser.cc @@ -93,13 +93,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/third_party/blink/renderer/modules/presentation/presentation_availability_callbacks.h b/chromium/third_party/blink/renderer/modules/presentation/presentation_availability_callbacks.h index 0c121916b1b..b8f81964f91 100644 --- a/chromium/third_party/blink/renderer/modules/presentation/presentation_availability_callbacks.h +++ b/chromium/third_party/blink/renderer/modules/presentation/presentation_availability_callbacks.h @@ -8,6 +8,7 @@ #include "base/macros.h" #include "third_party/blink/renderer/modules/modules_export.h" #include "third_party/blink/renderer/modules/presentation/presentation_promise_property.h" +#include "third_party/blink/renderer/modules/presentation/presentation_request.h" #include "third_party/blink/renderer/platform/heap/handle.h" #include "third_party/blink/renderer/platform/weborigin/kurl.h" #include "third_party/blink/renderer/platform/wtf/allocator/allocator.h" diff --git a/chromium/third_party/blink/renderer/modules/presentation/presentation_request.h b/chromium/third_party/blink/renderer/modules/presentation/presentation_request.h index 5616509ee2c..f8e3ba0a329 100644 --- a/chromium/third_party/blink/renderer/modules/presentation/presentation_request.h +++ b/chromium/third_party/blink/renderer/modules/presentation/presentation_request.h @@ -10,6 +10,7 @@ #include "third_party/blink/renderer/core/dom/events/event_target.h" #include "third_party/blink/renderer/core/execution_context/execution_context_lifecycle_observer.h" #include "third_party/blink/renderer/modules/modules_export.h" +#include "third_party/blink/renderer/modules/presentation/presentation_availability.h" #include "third_party/blink/renderer/modules/presentation/presentation_promise_property.h" #include "third_party/blink/renderer/platform/heap/handle.h" #include "third_party/blink/renderer/platform/heap/heap.h" 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 b135f379ddf..debc1e47bf6 100644 --- a/chromium/third_party/blink/renderer/platform/wtf/allocator/allocator.h +++ b/chromium/third_party/blink/renderer/platform/wtf/allocator/allocator.h @@ -82,7 +82,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; \ |