Merge remote-tracking branch 'origin/5.15' into dev

Conflicts:
	.qmake.conf
	src/core/compositor/display_gl_output_surface_qsg.cpp
	src/core/web_engine_context.cpp
	tests/auto/quick/quick.pro

Change-Id: Iaf03434696788c89f5d3b524969513a89cb0a235

5 files changed, 13 insertions, 6 deletions

diff --git a/src/core/config/common.pri b/src/core/config/common.pri
index c1658ce82..8ffd59e99 100644
--- a/src/core/config/common.pri
+++ b/src/core/config/common.pri
@@ -27,6 +27,10 @@ qtConfig(webengine-webrtc) {
 
 qtConfig(webengine-proprietary-codecs) {
     gn_args += proprietary_codecs=true ffmpeg_branding=\"Chrome\"
+# Fix after updating 3rdparty in dev to include the right fix
+#    qtConfig(webengine-webrtc) {
+#        gn_args += rtc_use_h264=true
+#    }
 } else {
     gn_args += proprietary_codecs=false
 }
diff --git a/src/core/media_capture_devices_dispatcher.cpp b/src/core/media_capture_devices_dispatcher.cpp
index 2293c424a..693cfa2e3 100644
--- a/src/core/media_capture_devices_dispatcher.cpp
+++ b/src/core/media_capture_devices_dispatcher.cpp
@@ -173,6 +173,10 @@ WebContentsAdapterClient::MediaRequestFlags mediaRequestFlagsForRequest(const co
         request.video_type == MediaStreamType::GUM_DESKTOP_VIDEO_CAPTURE)
         return {WebContentsAdapterClient::MediaDesktopAudioCapture, WebContentsAdapterClient::MediaDesktopVideoCapture};
 
+    if (request.audio_type == MediaStreamType::DISPLAY_AUDIO_CAPTURE &&
+        request.video_type == MediaStreamType::DISPLAY_VIDEO_CAPTURE)
+        return {WebContentsAdapterClient::MediaDesktopAudioCapture, WebContentsAdapterClient::MediaDesktopVideoCapture};
+
     if (request.video_type == MediaStreamType::GUM_DESKTOP_VIDEO_CAPTURE ||
         request.video_type == MediaStreamType::DISPLAY_VIDEO_CAPTURE)
         return {WebContentsAdapterClient::MediaDesktopVideoCapture};
diff --git a/src/core/profile_io_data_qt.cpp b/src/core/profile_io_data_qt.cpp
index 02912e35e..91adbc57d 100644
--- a/src/core/profile_io_data_qt.cpp
+++ b/src/core/profile_io_data_qt.cpp
@@ -212,7 +212,7 @@ std::unique_ptr<net::ClientCertStore> ProfileIODataQt::CreateClientCertStore()
 #if QT_CONFIG(ssl)
     return std::unique_ptr<net::ClientCertStore>(new ClientCertOverrideStore(m_clientCertificateStoreData));
 #else
-    return nullptr;
+    return std::unique_ptr<net::ClientCertStore>(new ClientCertOverrideStore(nullptr));
 #endif
 }
 
diff --git a/src/core/renderer/content_renderer_client_qt.cpp b/src/core/renderer/content_renderer_client_qt.cpp
index 8c4d02ad7..3e9e8f299 100644
--- a/src/core/renderer/content_renderer_client_qt.cpp
+++ b/src/core/renderer/content_renderer_client_qt.cpp
@@ -622,9 +622,7 @@ void ContentRendererClientQt::WillSendRequest(blink::WebLocalFrame *frame,
 bool ContentRendererClientQt::RequiresWebComponentsV0(const GURL &url)
 {
     Q_UNUSED(url);
-    // Google services still presents pages using these features
-    // to Chromium 80 based browsers (YouTube in particular).
-    return true;
+    return false;
 }
 
 } // namespace QtWebEngineCore
diff --git a/src/core/web_engine_context.cpp b/src/core/web_engine_context.cpp
index da0c70af5..2a5666776 100644
--- a/src/core/web_engine_context.cpp
+++ b/src/core/web_engine_context.cpp
@@ -660,6 +660,9 @@ WebEngineContext::WebEngineContext()
 
     parsedCommandLine->AppendSwitch(switches::kEnableThreadedCompositing);
 
+    // Do not advertise a feature we have removed at compile time
+    parsedCommandLine->AppendSwitch(switches::kDisableSpeechAPI);
+
     std::string disableFeatures;
     std::string enableFeatures;
     // Needed to allow navigations within pages that were set using setHtml(). One example is
@@ -689,8 +692,6 @@ WebEngineContext::WebEngineContext()
     // Explicitly tell Chromium about default-on features we do not support
     appendToFeatureList(disableFeatures, features::kBackgroundFetch.name);
     appendToFeatureList(disableFeatures, features::kSmsReceiver.name);
-    appendToFeatureList(disableFeatures, features::kWebAuth.name);
-    appendToFeatureList(disableFeatures, features::kWebAuthCable.name);
     appendToFeatureList(disableFeatures, features::kWebPayments.name);
     appendToFeatureList(disableFeatures, features::kWebUsb.name);
     appendToFeatureList(disableFeatures, media::kPictureInPicture.name);