diff options
| author | Peter Varga <pvarga@inf.u-szeged.hu> | 2020-10-29 10:01:00 +0100 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2021-03-16 15:21:53 +0100 |
| commit | a0cbfced7f87d3845c4283fcb2a1a91c7d6e36f4 (patch) | |
| tree | 80c0b642ee3602bb77ea94cb95a2ea45a76e4a23 /chromium/extensions/browser/api/messaging/message_service.cc | |
| parent | 922cf977666f21c3a2b3b6ffb6fb8f40e63cb651 (diff) | |
| download | qtwebengine-chromium-a0cbfced7f87d3845c4283fcb2a1a91c7d6e36f4.tar.gz | |
Add minimal webrtcdesktopcapture api for hangout services extension
The hangout services extension is required for meet.google.com.
The extension is only able to capture the primary screen without audio
with this fix.
Change-Id: Ic5563ebe4e0b8f1e8bfa83ca0830f180281a1f8c
Fixes: QTBUG-85731
Task-number: QTBUG-51185
Task-number: QTBUG-61676
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
Diffstat (limited to 'chromium/extensions/browser/api/messaging/message_service.cc')
| -rw-r--r-- | chromium/extensions/browser/api/messaging/message_service.cc | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/chromium/extensions/browser/api/messaging/message_service.cc b/chromium/extensions/browser/api/messaging/message_service.cc index 0a54cc7fcd9..94d6b327099 100644 --- a/chromium/extensions/browser/api/messaging/message_service.cc +++ b/chromium/extensions/browser/api/messaging/message_service.cc @@ -309,12 +309,16 @@ void MessageService::OpenChannelToExtension( source_frame_id = ExtensionApiFrameIdMap::GetFrameId(source_render_frame_host); } else { +#if !defined(TOOLKIT_QT) // Check to see if it was a WebView making the request. // Sending messages from WebViews to extensions breaks webview isolation, // so only allow component extensions to receive messages from WebViews. bool is_web_view = !!WebViewGuest::FromWebContents(source_contents); if (is_web_view && Manifest::IsComponentLocation(target_extension->location())) { +#else + if (Manifest::IsComponentLocation(target_extension->location())) { +#endif include_guest_process_info = true; } } @@ -571,8 +575,10 @@ void MessageService::OpenChannelImpl(BrowserContext* browser_context, DCHECK(port_context.frame); guest_render_frame_routing_id = port_context.frame->routing_id; +#if !defined(TOOLKIT_QT) DCHECK(WebViewGuest::FromWebContents( WebContents::FromRenderFrameHost(source.GetRenderFrameHost()))); +#endif } // Send the connect event to the receiver. Give it the opener's port ID (the |