diff options
author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2020-01-24 16:26:45 +0100 |
---|---|---|
committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2020-03-25 13:45:50 +0100 |
commit | 7087799ae57e4861abcb115bc5c16a0ee13c18a6 (patch) | |
tree | bd2dd2e58b27a83b60b826ec8d4f9999de277695 | |
parent | 42b3867d6e6530567b22bb960fbd5c391121c36d (diff) | |
download | qtwebengine-chromium-7087799ae57e4861abcb115bc5c16a0ee13c18a6.tar.gz |
Fixes for post 79-merge
Change-Id: I2b22cb0e6aaa0c503e2ead7c1c86e50c6be3ccf3
Reviewed-by: Peter Varga <pvarga@inf.u-szeged.hu>
13 files changed, 30 insertions, 18 deletions
diff --git a/chromium/base/third_party/double_conversion/BUILD.gn b/chromium/base/third_party/double_conversion/BUILD.gn index 0083efdcd9c..f2976764775 100644 --- a/chromium/base/third_party/double_conversion/BUILD.gn +++ b/chromium/base/third_party/double_conversion/BUILD.gn @@ -5,10 +5,12 @@ config("config") { visibility = [ ":double_conversion" ] - cflags = [ - "-Wno-unused-const-variable", - "-Wno-unused-function", - ] + if (is_clang || !is_win) { + cflags = [ + "-Wno-unused-const-variable", + "-Wno-unused-function", + ] + } } static_library("double_conversion") { diff --git a/chromium/chrome/browser/ui/webui/devtools_ui.cc b/chromium/chrome/browser/ui/webui/devtools_ui.cc index b0ea72c9d44..d04e956a236 100644 --- a/chromium/chrome/browser/ui/webui/devtools_ui.cc +++ b/chromium/chrome/browser/ui/webui/devtools_ui.cc @@ -10,6 +10,7 @@ #include "chrome/browser/ui/webui/devtools_ui_data_source.h" #include "chrome/common/chrome_switches.h" #include "chrome/common/url_constants.h" +#include "content/public/browser/browser_context.h" #include "content/public/browser/storage_partition.h" #include "content/public/browser/url_data_source.h" #include "content/public/browser/web_contents.h" diff --git a/chromium/components/viz/common/quads/draw_quad.h b/chromium/components/viz/common/quads/draw_quad.h index 242a550e300..adc8370ff74 100644 --- a/chromium/components/viz/common/quads/draw_quad.h +++ b/chromium/components/viz/common/quads/draw_quad.h @@ -73,7 +73,7 @@ class VIZ_COMMON_EXPORT DrawQuad { bool IsDebugQuad() const { return material == Material::kDebugBorder; } - bool ShouldDrawWithBlending() const { + bool ShouldDrawWithBlending(bool=false) const { return needs_blending || shared_quad_state->opacity < 1.0f || shared_quad_state->blend_mode != SkBlendMode::kSrcOver || !shared_quad_state->rounded_corner_bounds.IsEmpty(); diff --git a/chromium/components/viz/service/frame_sinks/root_compositor_frame_sink_impl.cc b/chromium/components/viz/service/frame_sinks/root_compositor_frame_sink_impl.cc index 325167bf4b2..28dcd92e8b3 100644 --- a/chromium/components/viz/service/frame_sinks/root_compositor_frame_sink_impl.cc +++ b/chromium/components/viz/service/frame_sinks/root_compositor_frame_sink_impl.cc @@ -49,7 +49,7 @@ RootCompositorFrameSinkImpl::Create( output_surface->SetNeedsSwapSizeNotifications( params->send_swap_size_notifications); -#if defined(OS_LINUX) && !defined(OS_CHROMEOS) +#if defined(USE_X11) // For X11, we need notify client about swap completion after resizing, so the // client can use it for synchronize with X11 WM. output_surface->SetNeedsSwapSizeNotifications(true); diff --git a/chromium/content/browser/browser_interface_binders.cc b/chromium/content/browser/browser_interface_binders.cc index 1620d428b42..0c97e64ee61 100644 --- a/chromium/content/browser/browser_interface_binders.cc +++ b/chromium/content/browser/browser_interface_binders.cc @@ -564,7 +564,7 @@ void PopulateFrameBinders(RenderFrameHostImpl* host, map->Add<device::mojom::NFC>(base::BindRepeating( &RenderFrameHostImpl::BindNFCReceiver, base::Unretained(host))); } -#else +#elif !defined(TOOLKIT_QT) map->Add<blink::mojom::HidService>(base::BindRepeating( &RenderFrameHostImpl::GetHidService, base::Unretained(host))); diff --git a/chromium/content/browser/renderer_host/media/media_devices_manager.cc b/chromium/content/browser/renderer_host/media/media_devices_manager.cc index 1847e34d7e4..b9418ae3886 100644 --- a/chromium/content/browser/renderer_host/media/media_devices_manager.cc +++ b/chromium/content/browser/renderer_host/media/media_devices_manager.cc @@ -179,7 +179,7 @@ std::string GuessVideoGroupID(const blink::WebMediaDeviceInfoArray& audio_infos, usb_model_matches = base::BindRepeating( [](bool video_has_usb_model, const std::string& video_usb_model, const blink::WebMediaDeviceInfo& audio_info) { - return video_has_usb_model && LabelHasUSBModel(audio_info.label) + return (video_has_usb_model && LabelHasUSBModel(audio_info.label)) ? video_usb_model == GetUSBModelFromLabel(audio_info.label) : false; @@ -441,11 +441,11 @@ void MediaDevicesManager::EnumerateDevices( bool request_audio_input_capabilities, EnumerateDevicesCallback callback) { DCHECK_CURRENTLY_ON(BrowserThread::IO); - DCHECK(request_video_input_capabilities && - requested_types[blink::MEDIA_DEVICE_TYPE_VIDEO_INPUT] || + DCHECK((request_video_input_capabilities && + requested_types[blink::MEDIA_DEVICE_TYPE_VIDEO_INPUT]) || !request_video_input_capabilities); - DCHECK(request_audio_input_capabilities && - requested_types[blink::MEDIA_DEVICE_TYPE_AUDIO_INPUT] || + DCHECK((request_audio_input_capabilities && + requested_types[blink::MEDIA_DEVICE_TYPE_AUDIO_INPUT]) || !request_audio_input_capabilities); base::PostTaskAndReplyWithResult( diff --git a/chromium/content/renderer/render_frame_impl.cc b/chromium/content/renderer/render_frame_impl.cc index ee52c9f376d..2312ca1f481 100644 --- a/chromium/content/renderer/render_frame_impl.cc +++ b/chromium/content/renderer/render_frame_impl.cc @@ -993,7 +993,7 @@ void FillMiscNavigationParams( navigation_params->is_browser_initiated = commit_params.is_browser_initiated; -#if defined(OS_ANDROID) +#if defined(OS_ANDROID) || defined(TOOLKIT_QT) // Only android webview uses this. navigation_params->grant_load_local_resources = commit_params.can_load_local_resources; diff --git a/chromium/net/dns/dns_util.cc b/chromium/net/dns/dns_util.cc index dd010fbf9be..3d3de50429d 100644 --- a/chromium/net/dns/dns_util.cc +++ b/chromium/net/dns/dns_util.cc @@ -144,7 +144,7 @@ const std::vector<DohUpgradeEntry>& GetDohUpgradeList() { // DohProviderId histogram suffix list in // tools/metrics/histograms/histograms.xml. static const base::NoDestructor<std::vector<DohUpgradeEntry>> - upgradable_servers{{ + upgradable_servers(std::vector<DohUpgradeEntry>{ DohUpgradeEntry( "CleanBrowsingAdult", {"185.228.168.10", "185.228.169.11", "2a0d:2a00:1::1", @@ -221,7 +221,7 @@ const std::vector<DohUpgradeEntry>& GetDohUpgradeList() { {"9.9.9.9", "149.112.112.112", "2620:fe::fe", "2620:fe::9"}, {"dns.quad9.net", "dns9.quad9.net"} /* DoT hostname */, {"https://dns.quad9.net/dns-query", true /* use_post */}), - }}; + }); return *upgradable_servers; } diff --git a/chromium/third_party/blink/public/platform/web_theme_engine.h b/chromium/third_party/blink/public/platform/web_theme_engine.h index f040c6b18ff..f741a80bd7e 100644 --- a/chromium/third_party/blink/public/platform/web_theme_engine.h +++ b/chromium/third_party/blink/public/platform/web_theme_engine.h @@ -229,7 +229,7 @@ class WebThemeEngine { return base::nullopt; } - virtual ForcedColors GetForcedColors() const { return ForcedColors::kNone; } + virtual blink::ForcedColors GetForcedColors() const { return blink::ForcedColors::kNone; } virtual void SetForcedColors(const blink::ForcedColors forced_colors) {} virtual blink::PreferredColorScheme PreferredColorScheme() const { return blink::PreferredColorScheme::kNoPreference; diff --git a/chromium/third_party/blink/renderer/BUILD.gn b/chromium/third_party/blink/renderer/BUILD.gn index 3ad23a8b3b0..4948a4761ed 100644 --- a/chromium/third_party/blink/renderer/BUILD.gn +++ b/chromium/third_party/blink/renderer/BUILD.gn @@ -40,7 +40,11 @@ config("inside_blink") { "BLINK_IMPLEMENTATION=1", "INSIDE_BLINK", ] - if (is_win) { + if (is_clang || !is_win) { + cflags += [ + "-Wno-unused-variable", + ] + } else { cflags += [ "/wd4101", "/wd4805", diff --git a/chromium/third_party/blink/renderer/core/animation/BUILD.gn b/chromium/third_party/blink/renderer/core/animation/BUILD.gn index 927a1189430..61439509c33 100644 --- a/chromium/third_party/blink/renderer/core/animation/BUILD.gn +++ b/chromium/third_party/blink/renderer/core/animation/BUILD.gn @@ -262,6 +262,9 @@ blink_core_sources("animation") { "worklet_animation_controller.cc", "worklet_animation_controller.h", ] + jumbo_excluded_sources = [ + "css_transform_interpolation_type.cc", + ] deps = [ ":buildflags", diff --git a/chromium/third_party/blink/renderer/core/frame/local_dom_window.h b/chromium/third_party/blink/renderer/core/frame/local_dom_window.h index 91dd27d2a49..609edccc494 100644 --- a/chromium/third_party/blink/renderer/core/frame/local_dom_window.h +++ b/chromium/third_party/blink/renderer/core/frame/local_dom_window.h @@ -33,6 +33,7 @@ #include "third_party/blink/renderer/core/events/page_transition_event.h" #include "third_party/blink/renderer/core/frame/dom_window.h" #include "third_party/blink/renderer/core/frame/local_frame.h" +#include "third_party/blink/renderer/core/loader/frame_loader.h" #include "third_party/blink/renderer/core/scroll/scrollable_area.h" #include "third_party/blink/renderer/platform/heap/handle.h" #include "third_party/blink/renderer/platform/supplementable.h" diff --git a/chromium/third_party/blink/renderer/modules/peerconnection/peer_connection_dependency_factory.cc b/chromium/third_party/blink/renderer/modules/peerconnection/peer_connection_dependency_factory.cc index f4ff48a6610..75ada1a310e 100644 --- a/chromium/third_party/blink/renderer/modules/peerconnection/peer_connection_dependency_factory.cc +++ b/chromium/third_party/blink/renderer/modules/peerconnection/peer_connection_dependency_factory.cc @@ -173,7 +173,8 @@ void PeerConnectionDependencyFactory::CreatePeerConnectionFactory() { #if BUILDFLAG(RTC_USE_H264) && BUILDFLAG(ENABLE_FFMPEG_VIDEO_DECODERS) // Building /w |rtc_use_h264|, is the corresponding run-time feature enabled? - if (base::FeatureList::IsEnabled(kWebRtcH264WithOpenH264FFmpeg)) { + if (base::FeatureList::IsEnabled( + blink::features::kWebRtcH264WithOpenH264FFmpeg)) { // |H264DecoderImpl| may be used which depends on FFmpeg, therefore we need // to initialize FFmpeg before going further. media::FFmpegGlue::InitializeFFmpeg(); |