mirror of
https://bitbucket.org/chromiumembedded/cef
synced 2025-03-29 10:20:11 +01:00
243a9c26d7
- Delete include/cef_runnable.h (issue #1336). - Build the cef_unittests target using all Chromium headers. Add a USING_CHROMIUM_INCLUDES define and libcef_dll_wrapper_unittests target to support this. This change avoids compile errors due to the divergence of CEF and Chromium base/ header implementations. The libcef_dll_wrapper sources must now compile successfully with both CEF and Chromium base/ headers (issue #1632). - The onbeforeunload message specified via JavaScript is no longer passed to the client (see http://crbug.com/587940).
85 lines
2.8 KiB
Diff
85 lines
2.8 KiB
Diff
diff --git web_contents.cc web_contents.cc
|
|
index d4b5fd0..b804902 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(const CreateParams& other) = default;
|
|
|
|
diff --git web_contents.h web_contents.h
|
|
index 9dd14bf..7c7b7c9 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;
|
|
@@ -147,6 +149,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 c937d66..4ce571f 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 2c2ac76..8f87caf 100644
|
|
--- web_contents_delegate.h
|
|
+++ web_contents_delegate.h
|
|
@@ -42,9 +42,11 @@ class JavaScriptDialogManager;
|
|
class PageState;
|
|
class RenderFrameHost;
|
|
class RenderViewHost;
|
|
+class RenderViewHostDelegateView;
|
|
class SessionStorageNamespace;
|
|
class WebContents;
|
|
class WebContentsImpl;
|
|
+class WebContentsView;
|
|
struct ColorSuggestion;
|
|
struct ContextMenuParams;
|
|
struct DropData;
|
|
@@ -311,7 +313,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.
|