cef/patch/patches/web_contents_1257_1565.patch

157 lines
6.6 KiB
Diff
Raw Normal View History

2017-02-10 23:44:11 +01:00
diff --git content/browser/web_contents/web_contents_impl.cc content/browser/web_contents/web_contents_impl.cc
index eab88872f0cee..de1775aa46b7d 100644
2017-02-10 23:44:11 +01:00
--- content/browser/web_contents/web_contents_impl.cc
+++ content/browser/web_contents/web_contents_impl.cc
@@ -3448,6 +3448,12 @@ void WebContentsImpl::Init(const WebContents::CreateParams& params,
params.main_frame_name, GetOpener(), primary_main_frame_policy,
base::UnguessableToken::Create());
2017-02-10 23:44:11 +01:00
+ if (params.view && params.delegate_view) {
+ view_.reset(params.view);
+ render_view_host_delegate_view_ = params.delegate_view;
+ }
+
+ if (!view_) {
std::unique_ptr<WebContentsViewDelegate> delegate =
GetContentClient()->browser()->GetWebContentsViewDelegate(this);
@@ -3458,6 +3464,7 @@ void WebContentsImpl::Init(const WebContents::CreateParams& params,
view_ = CreateWebContentsView(this, std::move(delegate),
&render_view_host_delegate_view_);
2017-02-10 23:44:11 +01:00
}
+ }
CHECK(render_view_host_delegate_view_);
CHECK(view_.get());
@@ -3653,6 +3660,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(
@@ -3984,6 +3994,10 @@ void WebContentsImpl::Restore() {
ui::WindowShowState WebContentsImpl::GetWindowShowState() {
#if defined(USE_AURA)
aura::Window* window = GetTopLevelNativeWindow();
+ if (!window) {
+ // |window| will be nullptr with CEF windowless rendering.
+ return ui::SHOW_STATE_DEFAULT;
+ }
return wm::GetWindowState(window);
#else
// TODO(laurila, crbug.com/1466855): This API function currently works only on
@@ -4451,6 +4465,15 @@ FrameTree* WebContentsImpl::CreateNewWindow(
create_params.picture_in_picture_options = *(params.pip_options);
}
2017-02-10 23:44:11 +01:00
+ if (delegate_) {
+ delegate_->GetCustomWebContentsView(this,
+ params.target_url,
+ render_process_id,
+ opener->GetRoutingID(),
2017-02-10 23:44:11 +01:00
+ &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.
@@ -8599,6 +8622,9 @@ void WebContentsImpl::SetFocusedFrame(FrameTreeNode* node,
}
CloseListenerManager::DidChangeFocusedFrame(this);
+
+ observers_.NotifyObservers(&WebContentsObserver::OnFrameFocused,
+ node->current_frame_host());
}
2017-02-10 23:44:11 +01:00
void WebContentsImpl::DidCallFocus() {
2017-02-10 23:44:11 +01:00
diff --git content/public/browser/web_contents.h content/public/browser/web_contents.h
index 3707858d0af59..58f794f35608a 100644
2017-02-10 23:44:11 +01:00
--- content/public/browser/web_contents.h
+++ content/public/browser/web_contents.h
@@ -98,10 +98,12 @@ class BrowserContext;
class BrowserPluginGuestDelegate;
2017-02-10 23:44:11 +01:00
class RenderFrameHost;
class RenderViewHost;
+class RenderViewHostDelegateView;
class RenderWidgetHostView;
class ScreenOrientationDelegate;
class SiteInstance;
2017-02-10 23:44:11 +01:00
class WebContentsDelegate;
+class WebContentsView;
class WebUI;
2017-02-10 23:44:11 +01:00
struct DropData;
struct MHTMLGenerationParams;
@@ -244,6 +246,10 @@ class WebContents : public PageNavigator,
network::mojom::WebSandboxFlags starting_sandbox_flags =
network::mojom::WebSandboxFlags::kNone;
2017-02-10 23:44:11 +01:00
+ // 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
2017-02-10 23:44:11 +01:00
diff --git content/public/browser/web_contents_delegate.h content/public/browser/web_contents_delegate.h
index a3da78805b9bc..982e63aee498b 100644
2017-02-10 23:44:11 +01:00
--- content/public/browser/web_contents_delegate.h
+++ content/public/browser/web_contents_delegate.h
@@ -59,9 +59,11 @@ class EyeDropperListener;
class FileSelectListener;
2017-02-10 23:44:11 +01:00
class JavaScriptDialogManager;
class RenderFrameHost;
+class RenderViewHostDelegateView;
class RenderWidgetHost;
class SessionStorageNamespace;
class SiteInstance;
+class WebContentsView;
struct ContextMenuParams;
struct DropData;
struct MediaPlayerWatchTime;
@@ -344,6 +346,14 @@ class CONTENT_EXPORT WebContentsDelegate {
const StoragePartitionConfig& partition_config,
2017-02-10 23:44:11 +01:00
SessionStorageNamespace* session_storage_namespace);
+ virtual void GetCustomWebContentsView(
+ WebContents* web_contents,
+ const GURL& target_url,
+ int opener_render_process_id,
+ int opener_render_frame_id,
2017-02-10 23:44:11 +01:00
+ 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 617b5a5609796..195d9026909a6 100644
--- content/public/browser/web_contents_observer.h
+++ content/public/browser/web_contents_observer.h
@@ -225,6 +225,9 @@ class CONTENT_EXPORT WebContentsObserver : public base::CheckedObserver {
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() {}
@@ -836,6 +839,10 @@ class CONTENT_EXPORT WebContentsObserver : public base::CheckedObserver {
// 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