Update to Chromium version 53.0.2785.70

This commit is contained in:
Marshall Greenblatt
2016-08-18 13:17:06 +02:00
parent 39b9b98b5c
commit a99ebd38a0
5 changed files with 23 additions and 8 deletions

View File

@ -1,8 +1,8 @@
diff --git web_contents_impl.cc web_contents_impl.cc
index ed42816..4513f67 100644
index b9ee451..0a0e8e4 100644
--- web_contents_impl.cc
+++ web_contents_impl.cc
@@ -1502,6 +1502,12 @@ void WebContentsImpl::Init(const WebContents::CreateParams& params) {
@@ -1503,6 +1503,12 @@ void WebContentsImpl::Init(const WebContents::CreateParams& params) {
std::string unique_name = params.main_frame_name;
frame_tree_.root()->SetFrameName(params.main_frame_name, unique_name);
@ -15,7 +15,7 @@ index ed42816..4513f67 100644
WebContentsViewDelegate* delegate =
GetContentClient()->browser()->GetWebContentsViewDelegate(this);
@@ -1534,6 +1540,7 @@ void WebContentsImpl::Init(const WebContents::CreateParams& params) {
@@ -1535,6 +1541,7 @@ void WebContentsImpl::Init(const WebContents::CreateParams& params) {
std::move(view_),
&render_view_host_delegate_view_));
}
@ -23,7 +23,7 @@ index ed42816..4513f67 100644
CHECK(render_view_host_delegate_view_);
CHECK(view_.get());
@@ -1991,11 +1998,14 @@ void WebContentsImpl::CreateNewWindow(
@@ -1992,11 +1999,14 @@ void WebContentsImpl::CreateNewWindow(
static_cast<SessionStorageNamespaceImpl*>(session_storage_namespace);
CHECK(session_storage_namespace_impl->IsFromContext(dom_storage_context));
@ -39,7 +39,7 @@ index ed42816..4513f67 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
@@ -2019,6 +2029,8 @@ void WebContentsImpl::CreateNewWindow(
@@ -2020,6 +2030,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;

View File

@ -146,7 +146,7 @@ index de96b63..ed0ba73 100644
bool DesktopWindowTreeHostWin::HandleMouseEvent(const ui::MouseEvent& event) {
diff --git ui/views/widget/desktop_aura/desktop_window_tree_host_win.h ui/views/widget/desktop_aura/desktop_window_tree_host_win.h
index e71604d..937bf91 100644
index e71604d..937bf913 100644
--- ui/views/widget/desktop_aura/desktop_window_tree_host_win.h
+++ ui/views/widget/desktop_aura/desktop_window_tree_host_win.h
@@ -137,6 +137,7 @@ class VIEWS_EXPORT DesktopWindowTreeHostWin