Update to Chromium revision c03558c9 (#326273)

This commit is contained in:
Marshall Greenblatt
2015-04-23 13:03:42 +03:00
parent aeb35d2f36
commit faafdd2cd7
28 changed files with 154 additions and 103 deletions

View File

@@ -1,5 +1,5 @@
diff --git web_contents_impl.cc web_contents_impl.cc
index 24122cd..52cd0c6 100644
index 3ce4b68..465b5e1 100644
--- web_contents_impl.cc
+++ web_contents_impl.cc
@@ -1205,22 +1205,29 @@ void WebContentsImpl::Init(const WebContents::CreateParams& params) {
@@ -48,7 +48,7 @@ index 24122cd..52cd0c6 100644
}
CHECK(render_view_host_delegate_view_);
CHECK(view_.get());
@@ -1551,6 +1558,9 @@ void WebContentsImpl::CreateNewWindow(
@@ -1556,6 +1563,9 @@ void WebContentsImpl::CreateNewWindow(
static_cast<SessionStorageNamespaceImpl*>(session_storage_namespace);
CHECK(session_storage_namespace_impl->IsFromContext(dom_storage_context));
@@ -58,7 +58,7 @@ index 24122cd..52cd0c6 100644
if (delegate_ &&
!delegate_->ShouldCreateWebContents(this,
route_id,
@@ -1559,7 +1569,9 @@ void WebContentsImpl::CreateNewWindow(
@@ -1564,7 +1574,9 @@ void WebContentsImpl::CreateNewWindow(
params.frame_name,
params.target_url,
partition_id,
@@ -69,7 +69,7 @@ index 24122cd..52cd0c6 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
@@ -1579,6 +1591,8 @@ void WebContentsImpl::CreateNewWindow(
@@ -1584,6 +1596,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;