Update to Chromium version 55.0.2883.44

This commit is contained in:
Marshall Greenblatt
2016-11-10 16:13:41 -05:00
parent aeeb51361b
commit b099f8cb79
10 changed files with 21 additions and 20 deletions

View File

@ -74,10 +74,10 @@ index 5410f5a..a6aaef1 100644
int opener_render_process_id,
int opener_render_frame_id,
diff --git content/browser/web_contents/web_contents_impl.cc content/browser/web_contents/web_contents_impl.cc
index 00421e7..18a9066 100644
index e199004..4630d34 100644
--- content/browser/web_contents/web_contents_impl.cc
+++ content/browser/web_contents/web_contents_impl.cc
@@ -1570,6 +1570,12 @@ void WebContentsImpl::Init(const WebContents::CreateParams& params) {
@@ -1572,6 +1572,12 @@ void WebContentsImpl::Init(const WebContents::CreateParams& params) {
std::string unique_name;
frame_tree_.root()->SetFrameName(params.main_frame_name, unique_name);
@ -90,7 +90,7 @@ index 00421e7..18a9066 100644
WebContentsViewDelegate* delegate =
GetContentClient()->browser()->GetWebContentsViewDelegate(this);
@@ -1600,6 +1606,7 @@ void WebContentsImpl::Init(const WebContents::CreateParams& params) {
@@ -1602,6 +1608,7 @@ void WebContentsImpl::Init(const WebContents::CreateParams& params) {
std::move(view_),
&render_view_host_delegate_view_));
}
@ -98,7 +98,7 @@ index 00421e7..18a9066 100644
CHECK(render_view_host_delegate_view_);
CHECK(view_.get());
@@ -2053,11 +2060,14 @@ void WebContentsImpl::CreateNewWindow(
@@ -2055,11 +2062,14 @@ void WebContentsImpl::CreateNewWindow(
static_cast<SessionStorageNamespaceImpl*>(session_storage_namespace);
CHECK(session_storage_namespace_impl->IsFromContext(dom_storage_context));
@ -114,7 +114,7 @@ index 00421e7..18a9066 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
@@ -2081,6 +2091,8 @@ void WebContentsImpl::CreateNewWindow(
@@ -2083,6 +2093,8 @@ void WebContentsImpl::CreateNewWindow(
create_params.opener_render_process_id = render_process_id;
create_params.opener_render_frame_id = params.opener_render_frame_id;
create_params.opener_suppressed = params.opener_suppressed;