mirror of
https://bitbucket.org/chromiumembedded/cef
synced 2025-02-15 19:50:44 +01:00
f7aa98fe69
- Building on Windows now requires the Windows 10.0.10586 SDK. - Remove CefParseCSSColor which was implemented using Blink code in the browser process. This is longer advisable now that the Oilpan GC is enabled. - Avoid potential renderer process crashes by disabling script actions on the CefV8Context passed to CefRenderProcessHandler::OnContextReleased.
85 lines
2.8 KiB
Diff
85 lines
2.8 KiB
Diff
diff --git web_contents.cc web_contents.cc
|
|
index 1b6d8a6..b606a30 100644
|
|
--- web_contents.cc
|
|
+++ web_contents.cc
|
|
@@ -26,7 +26,9 @@ WebContents::CreateParams::CreateParams(BrowserContext* context,
|
|
initially_hidden(false),
|
|
guest_delegate(nullptr),
|
|
context(nullptr),
|
|
- renderer_initiated_creation(false) {}
|
|
+ renderer_initiated_creation(false),
|
|
+ view(nullptr),
|
|
+ delegate_view(nullptr) {}
|
|
|
|
WebContents::CreateParams::~CreateParams() {
|
|
}
|
|
diff --git web_contents.h web_contents.h
|
|
index 5260b91..4495078 100644
|
|
--- web_contents.h
|
|
+++ web_contents.h
|
|
@@ -54,9 +54,11 @@ class PageState;
|
|
class RenderFrameHost;
|
|
class RenderProcessHost;
|
|
class RenderViewHost;
|
|
+class RenderViewHostDelegateView;
|
|
class RenderWidgetHostView;
|
|
class SiteInstance;
|
|
class WebContentsDelegate;
|
|
+class WebContentsView;
|
|
struct CustomContextMenuContext;
|
|
struct DropData;
|
|
struct Manifest;
|
|
@@ -146,6 +148,10 @@ class WebContents : public PageNavigator,
|
|
// RenderFrame, have already been created on the renderer side, and
|
|
// WebContents construction should take this into account.
|
|
bool renderer_initiated_creation;
|
|
+
|
|
+ // Optionally specify the view and delegate view.
|
|
+ content::WebContentsView* view;
|
|
+ content::RenderViewHostDelegateView* delegate_view;
|
|
};
|
|
|
|
// Creates a new WebContents.
|
|
diff --git web_contents_delegate.cc web_contents_delegate.cc
|
|
index 71c3075..7abcac3 100644
|
|
--- web_contents_delegate.cc
|
|
+++ web_contents_delegate.cc
|
|
@@ -144,7 +144,9 @@ bool WebContentsDelegate::ShouldCreateWebContents(
|
|
const std::string& frame_name,
|
|
const GURL& target_url,
|
|
const std::string& partition_id,
|
|
- SessionStorageNamespace* session_storage_namespace) {
|
|
+ SessionStorageNamespace* session_storage_namespace,
|
|
+ content::WebContentsView** view,
|
|
+ content::RenderViewHostDelegateView** delegate_view) {
|
|
return true;
|
|
}
|
|
|
|
diff --git web_contents_delegate.h web_contents_delegate.h
|
|
index b6015b0..75b53d4 100644
|
|
--- web_contents_delegate.h
|
|
+++ web_contents_delegate.h
|
|
@@ -41,9 +41,11 @@ class DownloadItem;
|
|
class JavaScriptDialogManager;
|
|
class PageState;
|
|
class RenderViewHost;
|
|
+class RenderViewHostDelegateView;
|
|
class SessionStorageNamespace;
|
|
class WebContents;
|
|
class WebContentsImpl;
|
|
+class WebContentsView;
|
|
struct ColorSuggestion;
|
|
struct ContextMenuParams;
|
|
struct DropData;
|
|
@@ -309,7 +311,9 @@ class CONTENT_EXPORT WebContentsDelegate {
|
|
const std::string& frame_name,
|
|
const GURL& target_url,
|
|
const std::string& partition_id,
|
|
- SessionStorageNamespace* session_storage_namespace);
|
|
+ SessionStorageNamespace* session_storage_namespace,
|
|
+ content::WebContentsView** view,
|
|
+ content::RenderViewHostDelegateView** delegate_view);
|
|
|
|
// Notifies the delegate about the creation of a new WebContents. This
|
|
// typically happens when popups are created.
|