mirror of
https://bitbucket.org/chromiumembedded/cef
synced 2025-06-05 21:39:12 +02:00
Update to Chromium revision 47fb4821 (#318735).
- Remove the in-process PDF plugin implementation. A new implementation is now required (issue #1565). git-svn-id: https://chromiumembedded.googlecode.com/svn/trunk@2043 5089003a-bbd8-11dd-ad1f-f1f9622dbc98
This commit is contained in:
@@ -1,8 +1,8 @@
|
||||
diff --git web_contents_impl.cc web_contents_impl.cc
|
||||
index 507ebbe..1ef87a2 100644
|
||||
index ede1642..9a7d93b 100644
|
||||
--- web_contents_impl.cc
|
||||
+++ web_contents_impl.cc
|
||||
@@ -1191,22 +1191,29 @@ void WebContentsImpl::Init(const WebContents::CreateParams& params) {
|
||||
@@ -1212,22 +1212,29 @@ void WebContentsImpl::Init(const WebContents::CreateParams& params) {
|
||||
params.browser_context, params.site_instance, params.routing_id,
|
||||
params.main_frame_routing_id);
|
||||
|
||||
@@ -48,7 +48,7 @@ index 507ebbe..1ef87a2 100644
|
||||
}
|
||||
CHECK(render_view_host_delegate_view_);
|
||||
CHECK(view_.get());
|
||||
@@ -1571,6 +1578,9 @@ void WebContentsImpl::CreateNewWindow(
|
||||
@@ -1576,6 +1583,9 @@ void WebContentsImpl::CreateNewWindow(
|
||||
static_cast<SessionStorageNamespaceImpl*>(session_storage_namespace);
|
||||
CHECK(session_storage_namespace_impl->IsFromContext(dom_storage_context));
|
||||
|
||||
@@ -58,7 +58,7 @@ index 507ebbe..1ef87a2 100644
|
||||
if (delegate_ &&
|
||||
!delegate_->ShouldCreateWebContents(this,
|
||||
route_id,
|
||||
@@ -1579,7 +1589,9 @@ void WebContentsImpl::CreateNewWindow(
|
||||
@@ -1584,7 +1594,9 @@ void WebContentsImpl::CreateNewWindow(
|
||||
params.frame_name,
|
||||
params.target_url,
|
||||
partition_id,
|
||||
@@ -69,7 +69,7 @@ index 507ebbe..1ef87a2 100644
|
||||
if (route_id != MSG_ROUTING_NONE &&
|
||||
!RenderViewHost::FromID(render_process_id, route_id)) {
|
||||
// If the embedder didn't create a WebContents for this route, we need to
|
||||
@@ -1599,6 +1611,8 @@ void WebContentsImpl::CreateNewWindow(
|
||||
@@ -1604,6 +1616,8 @@ void WebContentsImpl::CreateNewWindow(
|
||||
create_params.main_frame_routing_id = main_frame_route_id;
|
||||
create_params.opener = this;
|
||||
create_params.opener_suppressed = params.opener_suppressed;
|
||||
@@ -77,4 +77,4 @@ index 507ebbe..1ef87a2 100644
|
||||
+ create_params.delegate_view = delegate_view;
|
||||
if (params.disposition == NEW_BACKGROUND_TAB)
|
||||
create_params.initially_hidden = true;
|
||||
|
||||
create_params.renderer_initiated_creation = true;
|
||||
|
Reference in New Issue
Block a user