diff --git content/browser/web_contents/web_contents_impl.cc content/browser/web_contents/web_contents_impl.cc index aea2d122faef0..df8c1858b6387 100644 --- content/browser/web_contents/web_contents_impl.cc +++ content/browser/web_contents/web_contents_impl.cc @@ -3174,6 +3174,12 @@ void WebContentsImpl::Init(const WebContents::CreateParams& params, params.main_frame_name, GetOpener(), primary_main_frame_policy, base::UnguessableToken::Create()); + if (params.view && params.delegate_view) { + view_.reset(params.view); + render_view_host_delegate_view_ = params.delegate_view; + } + + if (!view_) { std::unique_ptr delegate = GetContentClient()->browser()->GetWebContentsViewDelegate(this); @@ -3184,6 +3190,7 @@ void WebContentsImpl::Init(const WebContents::CreateParams& params, view_ = CreateWebContentsView(this, std::move(delegate), &render_view_host_delegate_view_); } + } CHECK(render_view_host_delegate_view_); CHECK(view_.get()); @@ -3364,6 +3371,9 @@ void WebContentsImpl::RenderWidgetCreated( OPTIONAL_TRACE_EVENT1("content", "WebContentsImpl::RenderWidgetCreated", "render_widget_host", render_widget_host); created_widgets_.insert(render_widget_host); + + observers_.NotifyObservers( + &WebContentsObserver::RenderWidgetCreated, render_widget_host); } void WebContentsImpl::RenderWidgetDeleted( @@ -4095,6 +4105,15 @@ FrameTree* WebContentsImpl::CreateNewWindow( create_params.picture_in_picture_options = *(params.pip_options); } + if (delegate_) { + delegate_->GetCustomWebContentsView(this, + params.target_url, + render_process_id, + opener->GetRoutingID(), + &create_params.view, + &create_params.delegate_view); + } + // Check whether there is an available prerendered page for this navigation if // this is not for guest. If it exists, take WebContents pre-created for // hosting the prerendered page instead of creating new WebContents. @@ -7995,6 +8014,9 @@ void WebContentsImpl::SetFocusedFrame(FrameTreeNode* node, // frames). SetFocusedFrameTree(&node->frame_tree()); } + + observers_.NotifyObservers(&WebContentsObserver::OnFrameFocused, + node->current_frame_host()); } void WebContentsImpl::DidCallFocus() { diff --git content/public/browser/web_contents.h content/public/browser/web_contents.h index 5644b0efa9a3e..da63511c87213 100644 --- content/public/browser/web_contents.h +++ content/public/browser/web_contents.h @@ -95,10 +95,12 @@ class BrowserContext; class BrowserPluginGuestDelegate; class RenderFrameHost; class RenderViewHost; +class RenderViewHostDelegateView; class RenderWidgetHostView; class ScreenOrientationDelegate; class SiteInstance; class WebContentsDelegate; +class WebContentsView; class WebUI; struct DropData; struct MHTMLGenerationParams; @@ -241,6 +243,10 @@ class WebContents : public PageNavigator, network::mojom::WebSandboxFlags starting_sandbox_flags = network::mojom::WebSandboxFlags::kNone; + // Optionally specify the view and delegate view. + content::WebContentsView* view = nullptr; + content::RenderViewHostDelegateView* delegate_view = nullptr; + // Value used to set the last time the WebContents was made active, this is // the value that'll be returned by GetLastActiveTime(). If this is left // default initialized then the value is not passed on to the WebContents diff --git content/public/browser/web_contents_delegate.h content/public/browser/web_contents_delegate.h index 2717fd39b99c6..604d3b75160a4 100644 --- content/public/browser/web_contents_delegate.h +++ content/public/browser/web_contents_delegate.h @@ -58,9 +58,11 @@ class EyeDropperListener; class FileSelectListener; class JavaScriptDialogManager; class RenderFrameHost; +class RenderViewHostDelegateView; class RenderWidgetHost; class SessionStorageNamespace; class SiteInstance; +class WebContentsView; struct ContextMenuParams; struct DropData; struct MediaPlayerWatchTime; @@ -342,6 +344,14 @@ class CONTENT_EXPORT WebContentsDelegate { const StoragePartitionConfig& partition_config, SessionStorageNamespace* session_storage_namespace); + virtual void GetCustomWebContentsView( + WebContents* web_contents, + const GURL& target_url, + int opener_render_process_id, + int opener_render_frame_id, + content::WebContentsView** view, + content::RenderViewHostDelegateView** delegate_view) {} + // Notifies the delegate about the creation of a new WebContents. This // typically happens when popups are created. virtual void WebContentsCreated(WebContents* source_contents, diff --git content/public/browser/web_contents_observer.h content/public/browser/web_contents_observer.h index d89d18e8d2509..9d7df1f8e7bbc 100644 --- content/public/browser/web_contents_observer.h +++ content/public/browser/web_contents_observer.h @@ -219,6 +219,9 @@ class CONTENT_EXPORT WebContentsObserver { virtual void OnCaptureHandleConfigUpdate( const blink::mojom::CaptureHandleConfig& config) {} + // This method is invoked when a RenderWidget is created. + virtual void RenderWidgetCreated(RenderWidgetHost* render_widget_host) {} + // This method is invoked when the `blink::WebView` of the current // RenderViewHost is ready, e.g. because we recreated it after a crash. virtual void RenderViewReady() {} @@ -800,6 +803,10 @@ class CONTENT_EXPORT WebContentsObserver { // WebContents has gained/lost focus. virtual void OnFocusChangedInPage(FocusedNodeDetails* details) {} + // Notification that |render_frame_host| for this WebContents has gained + // focus. + virtual void OnFrameFocused(RenderFrameHost* render_frame_host) {} + // Notifies that the manifest URL for the main frame changed to // |manifest_url|. This will be invoked when a document with a manifest loads // or when the manifest URL changes (possibly to nothing). It is not invoked