diff options
Diffstat (limited to 'src/core/web_contents_delegate_qt.cpp')
-rw-r--r-- | src/core/web_contents_delegate_qt.cpp | 150 |
1 files changed, 118 insertions, 32 deletions
diff --git a/src/core/web_contents_delegate_qt.cpp b/src/core/web_contents_delegate_qt.cpp index f7c1ea164..4df73fb69 100644 --- a/src/core/web_contents_delegate_qt.cpp +++ b/src/core/web_contents_delegate_qt.cpp @@ -12,10 +12,13 @@ #include "color_chooser_qt.h" #include "custom_handlers/protocol_handler_registry_factory.h" #include "custom_handlers/register_protocol_handler_request_controller_impl.h" +#include "desktop_media_controller.h" +#include "desktop_media_controller_p.h" #include "file_picker_controller.h" #include "find_text_helper.h" #include "javascript_dialog_manager_qt.h" #include "media_capture_devices_dispatcher.h" +#include "native_web_keyboard_event_qt.h" #include "profile_adapter.h" #include "profile_qt.h" #include "qwebengineloadinginfo.h" @@ -48,6 +51,7 @@ #include "content/public/common/url_constants.h" #include "net/base/data_url.h" #include "net/base/url_util.h" +#include "third_party/blink/public/mojom/mediastream/media_stream.mojom.h" #include <QDesktopServices> #include <QTimer> @@ -204,11 +208,11 @@ QUrl WebContentsDelegateQt::url(content::WebContents *source) const m_pendingUrlUpdate = false; return newUrl; } -void WebContentsDelegateQt::AddNewContents(content::WebContents* source, std::unique_ptr<content::WebContents> new_contents, const GURL &target_url, - WindowOpenDisposition disposition, const gfx::Rect& initial_pos, bool user_gesture, bool* was_blocked) +void WebContentsDelegateQt::AddNewContents(content::WebContents *source, std::unique_ptr<content::WebContents> new_contents, const GURL &target_url, + WindowOpenDisposition disposition, const blink::mojom::WindowFeatures &window_features, bool user_gesture, bool *was_blocked) { Q_UNUSED(source) - QSharedPointer<WebContentsAdapter> newAdapter = createWindow(std::move(new_contents), disposition, initial_pos, toQt(target_url), user_gesture); + QSharedPointer<WebContentsAdapter> newAdapter = createWindow(std::move(new_contents), disposition, window_features.bounds, toQt(target_url), user_gesture); // Chromium can forget to pass user-agent override settings to new windows (see QTBUG-61774 and QTBUG-76249), // so set it here. Note the actual value doesn't really matter here. Only the second value does, but we try // to give the correct user-agent anyway. @@ -243,9 +247,9 @@ void WebContentsDelegateQt::LoadProgressChanged(double progress) bool WebContentsDelegateQt::HandleKeyboardEvent(content::WebContents *, const content::NativeWebKeyboardEvent &event) { - Q_ASSERT(!event.skip_in_browser); + Q_ASSERT(!event.skip_if_unhandled); if (event.os_event) - m_viewClient->unhandledKeyEvent(reinterpret_cast<QKeyEvent *>(event.os_event)); + m_viewClient->unhandledKeyEvent(ToKeyEvent(event.os_event)); // FIXME: ? return true; } @@ -254,6 +258,10 @@ void WebContentsDelegateQt::RenderFrameCreated(content::RenderFrameHost *render_ { content::FrameTreeNode *node = static_cast<content::RenderFrameHostImpl *>(render_frame_host)->frame_tree_node(); m_frameFocusedObserver.addNode(node); + + // If it's a child frame (render_widget_host_view_child_frame) install an InputEventObserver on + // it. Note that it is only needed for WheelEventAck. + RenderWidgetHostViewQt::registerInputEventObserver(web_contents(), render_frame_host); } void WebContentsDelegateQt::PrimaryMainFrameRenderProcessGone(base::TerminationStatus status) @@ -271,6 +279,7 @@ void WebContentsDelegateQt::PrimaryMainFrameRenderProcessGone(base::TerminationS || status == base::TERMINATION_STATUS_STILL_RUNNING) { return; } + LOG(INFO) << "ProcessGone: " << int(status) << " (" << web_contents()->GetCrashedErrorCode() << ")"; setLoadingState(LoadingState::Unloaded); } @@ -305,6 +314,20 @@ void WebContentsDelegateQt::RenderViewHostChanged(content::RenderViewHost *, con Q_ASSERT(rwhv->delegate()); rwhv->delegate()->adapterClientChanged(m_viewClient); m_viewClient->zoomUpdateIsNeeded(); + auto backgroundColor = m_viewClient->backgroundColor(); + if (backgroundColor != Qt::white) + m_viewClient->webContentsAdapter()->setBackgroundColor(backgroundColor); + } +} + +void WebContentsDelegateQt::RenderViewReady() +{ + // The render view might have returned after a crash without us getting a RenderViewHostChanged call + content::RenderWidgetHostView *newHostView = web_contents()->GetRenderWidgetHostView(); + if (newHostView) { + auto *rwhv = static_cast<RenderWidgetHostViewQt *>(newHostView); + Q_ASSERT(rwhv->delegate()); + rwhv->delegate()->updateAdapterClientIfNeeded(m_viewClient); } } @@ -366,7 +389,8 @@ void WebContentsDelegateQt::emitLoadFinished(bool isErrorPage) ? QWebEngineLoadingInfo::LoadStoppedStatus : QWebEngineLoadingInfo::LoadFailedStatus); QWebEngineLoadingInfo info(m_loadingInfo.url, loadStatus, m_loadingInfo.isErrorPage, m_loadingInfo.errorDescription, m_loadingInfo.errorCode, - QWebEngineLoadingInfo::ErrorDomain(m_loadingInfo.errorDomain)); + QWebEngineLoadingInfo::ErrorDomain(m_loadingInfo.errorDomain), + m_loadingInfo.responseHeaders); m_viewClient->loadFinished(std::move(info)); m_viewClient->updateNavigationActions(); } @@ -394,6 +418,20 @@ void WebContentsDelegateQt::DidFinishNavigation(content::NavigationHandle *navig emitLoadCommitted(); } + const net::HttpResponseHeaders * const responseHeaders = navigation_handle->GetResponseHeaders(); + if (responseHeaders != nullptr) { + m_loadingInfo.responseHeaders.clear(); + std::size_t iter = 0; + std::string headerName; + std::string headerValue; + while (responseHeaders->EnumerateHeaderLines(&iter, &headerName, &headerValue)) { + m_loadingInfo.responseHeaders.insert( + QByteArray::fromStdString(headerName), + QByteArray::fromStdString(headerValue) + ); + } + } + // Success is reported by DidFinishLoad, but DidFailLoad is now dead code and needs to be handled below if (navigation_handle->GetNetErrorCode() == net::OK) return; @@ -460,7 +498,7 @@ void WebContentsDelegateQt::DidFailLoad(content::RenderFrameHost* render_frame_h { setLoadingState(LoadingState::Loaded); - if (render_frame_host != web_contents()->GetMainFrame()) + if (render_frame_host != web_contents()->GetPrimaryMainFrame()) return; if (validated_url.spec() == content::kUnreachableWebDataURL) { @@ -583,9 +621,45 @@ void WebContentsDelegateQt::FindReply(content::WebContents *source, int request_ m_findTextHelper->handleFindReply(source, request_id, number_of_matches, selection_rect, active_match_ordinal, final_update); } +static void processMediaAccessRequest(content::WebContents *webContents, + const content::MediaStreamRequest &request, + content::MediaResponseCallback callback, + content::DesktopMediaID id) +{ + MediaCaptureDevicesDispatcher::GetInstance()->processMediaAccessRequest( + webContents, request, std::move(callback), id); +} + +static inline bool needsPickerDialog(const content::MediaStreamRequest &request) +{ + return (request.requested_video_device_id.empty() && // device already selected in chooseDesktopMedia + (request.video_type == blink::mojom::MediaStreamType::GUM_DESKTOP_VIDEO_CAPTURE + || request.video_type == blink::mojom::MediaStreamType::DISPLAY_VIDEO_CAPTURE)); +} + void WebContentsDelegateQt::RequestMediaAccessPermission(content::WebContents *web_contents, const content::MediaStreamRequest &request, content::MediaResponseCallback callback) { - MediaCaptureDevicesDispatcher::GetInstance()->processMediaAccessRequest(web_contents, request, std::move(callback)); + if (needsPickerDialog(request)) { +#if QT_CONFIG(webengine_webrtc) + base::OnceCallback<void(content::DesktopMediaID)> cb = base::BindOnce( + &processMediaAccessRequest, web_contents, std::move(request), std::move(callback)); + // ownership is taken by the request + auto *controller = new DesktopMediaController( + new DesktopMediaControllerPrivate(std::move(cb))); + QObject::connect(controller, &DesktopMediaController::mediaListsInitialized, [controller, delegate = AsWeakPtr()]() { + if (delegate) + delegate->adapterClient()->desktopMediaRequested(controller); + else + controller->deleteLater(); + }); +#else + // To keep the old behavior return the default screen even if webrtc is disabled + processMediaAccessRequest(web_contents, std::move(request), std::move(callback), + content::DesktopMediaID(content::DesktopMediaID::TYPE_SCREEN, 0)); +#endif // QT_CONFIG(webengine_webrtc) + } else { + processMediaAccessRequest(web_contents, std::move(request), std::move(callback), {}); + } } void WebContentsDelegateQt::SetContentsBounds(content::WebContents *source, const gfx::Rect &bounds) @@ -608,12 +682,6 @@ void WebContentsDelegateQt::UpdateTargetURL(content::WebContents* source, const m_viewClient->didUpdateTargetURL(toQt(url)); } -void WebContentsDelegateQt::OnVisibilityChanged(content::Visibility visibility) -{ - if (visibility != content::Visibility::HIDDEN) - web_cache::WebCacheManager::GetInstance()->ObserveActivity(web_contents()->GetMainFrame()->GetProcess()->GetID()); -} - void WebContentsDelegateQt::ActivateContents(content::WebContents* contents) { QWebEngineSettings *settings = m_viewClient->webEngineSettings(); @@ -692,7 +760,7 @@ void WebContentsDelegateQt::launchExternalURL(const QUrl &url, ui::PageTransitio } if (navigationAllowedByPolicy) { - m_viewClient->navigationRequested(pageTransitionToNavigationType(page_transition), url, navigationRequestAccepted, is_main_frame); + m_viewClient->navigationRequested(pageTransitionToNavigationType(page_transition), url, navigationRequestAccepted, is_main_frame, false); #if QT_CONFIG(desktopservices) if (navigationRequestAccepted) QDesktopServices::openUrl(url); @@ -718,12 +786,6 @@ void WebContentsDelegateQt::BeforeUnloadFired(content::WebContents *tab, bool pr m_viewClient->windowCloseRejected(); } -void WebContentsDelegateQt::BeforeUnloadFired(bool proceed, const base::TimeTicks &proceed_time) -{ - Q_UNUSED(proceed); - Q_UNUSED(proceed_time); -} - bool WebContentsDelegateQt::CheckMediaAccessPermission(content::RenderFrameHost *, const GURL& security_origin, blink::mojom::MediaStreamType type) { switch (type) { @@ -733,7 +795,7 @@ bool WebContentsDelegateQt::CheckMediaAccessPermission(content::RenderFrameHost return m_viewClient->profileAdapter()->checkPermission(toQt(security_origin), ProfileAdapter::VideoCapturePermission); default: LOG(INFO) << "WebContentsDelegateQt::CheckMediaAccessPermission: " - << "Unsupported media stream type checked" << type; + << "Unsupported media stream type checked " << type; return false; } } @@ -742,8 +804,8 @@ void WebContentsDelegateQt::RegisterProtocolHandler(content::RenderFrameHost *fr { content::BrowserContext *context = frameHost->GetBrowserContext(); - content::ProtocolHandler handler = - content::ProtocolHandler::CreateProtocolHandler(protocol, url); + custom_handlers::ProtocolHandler handler = + custom_handlers::ProtocolHandler::CreateProtocolHandler(protocol, url); custom_handlers::ProtocolHandlerRegistry *registry = ProtocolHandlerRegistryFactory::GetForBrowserContext(context); @@ -759,8 +821,8 @@ void WebContentsDelegateQt::UnregisterProtocolHandler(content::RenderFrameHost * { content::BrowserContext* context = frameHost->GetBrowserContext(); - content::ProtocolHandler handler = - content::ProtocolHandler::CreateProtocolHandler(protocol, url); + custom_handlers::ProtocolHandler handler = + custom_handlers::ProtocolHandler::CreateProtocolHandler(protocol, url); custom_handlers::ProtocolHandlerRegistry* registry = ProtocolHandlerRegistryFactory::GetForBrowserContext(context); @@ -794,6 +856,15 @@ void WebContentsDelegateQt::ResourceLoadComplete(content::RenderFrameHost* rende } } +void WebContentsDelegateQt::InnerWebContentsAttached(content::WebContents *inner_web_contents, + content::RenderFrameHost *render_frame_host, + bool is_full_page) +{ + blink::web_pref::WebPreferences guestPrefs = inner_web_contents->GetOrCreateWebPreferences(); + webEngineSettings()->overrideWebPreferences(inner_web_contents, &guestPrefs); + inner_web_contents->SetWebPreferences(guestPrefs); +} + FindTextHelper *WebContentsDelegateQt::findTextHelper() { return m_findTextHelper.data(); @@ -857,6 +928,7 @@ int &WebContentsDelegateQt::streamCount(blink::mojom::MediaStreamType type) case blink::mojom::MediaStreamType::DISPLAY_VIDEO_CAPTURE: case blink::mojom::MediaStreamType::DISPLAY_AUDIO_CAPTURE: case blink::mojom::MediaStreamType::DISPLAY_VIDEO_CAPTURE_THIS_TAB: + case blink::mojom::MediaStreamType::DISPLAY_VIDEO_CAPTURE_SET: return m_desktopStreamCount; case blink::mojom::MediaStreamType::NO_SERVICE: @@ -868,22 +940,36 @@ int &WebContentsDelegateQt::streamCount(blink::mojom::MediaStreamType type) return m_videoStreamCount; } -void WebContentsDelegateQt::addDevices(const blink::MediaStreamDevices &devices) +void WebContentsDelegateQt::addDevices(const blink::mojom::StreamDevices &devices) { - for (const auto &device : devices) - ++streamCount(device.type); + if (devices.audio_device.has_value()) + addDevice(devices.audio_device.value()); + if (devices.video_device.has_value()) + addDevice(devices.video_device.value()); webContentsAdapter()->updateRecommendedState(); } -void WebContentsDelegateQt::removeDevices(const blink::MediaStreamDevices &devices) +void WebContentsDelegateQt::removeDevices(const blink::mojom::StreamDevices &devices) { - for (const auto &device : devices) - ++streamCount(device.type); + if (devices.audio_device.has_value()) + removeDevice(devices.audio_device.value()); + if (devices.video_device.has_value()) + removeDevice(devices.video_device.value()); webContentsAdapter()->updateRecommendedState(); } +void WebContentsDelegateQt::addDevice(const blink::MediaStreamDevice &device) +{ + ++streamCount(device.type); +} + +void WebContentsDelegateQt::removeDevice(const blink::MediaStreamDevice &device) +{ + --streamCount(device.type); +} + FrameFocusedObserver::FrameFocusedObserver(WebContentsAdapterClient *adapterClient) : m_viewClient(adapterClient) {} |