Update to Chromium version 52.0.2743.41

This commit is contained in:
Marshall Greenblatt
2016-06-17 14:03:35 -04:00
parent 1fbc5c4393
commit 51ba965d4e
8 changed files with 47 additions and 19 deletions

View File

@@ -1,8 +1,8 @@
diff --git render_widget_host_view_guest.cc render_widget_host_view_guest.cc
index 5ddb600..b1860b0 100644
index 2f7ff29..49389ce 100644
--- render_widget_host_view_guest.cc
+++ render_widget_host_view_guest.cc
@@ -212,6 +212,9 @@ void RenderWidgetHostViewGuest::Destroy() {
@@ -215,6 +215,9 @@ void RenderWidgetHostViewGuest::Destroy() {
}
gfx::Size RenderWidgetHostViewGuest::GetPhysicalBackingSize() const {

View File

@@ -1,5 +1,5 @@
diff --git common.gypi common.gypi
index 296b90b..e258f15 100644
index 2850490..a00882f 100644
--- common.gypi
+++ common.gypi
@@ -9,6 +9,9 @@

View File

@@ -39,10 +39,10 @@ index d96adc9..348ae16 100644
// built in media player for the given |url|. Defaults to false.
virtual bool ShouldUseMediaPlayerForURL(const GURL& url);
diff --git renderer/render_frame_impl.cc renderer/render_frame_impl.cc
index 289ca31..a1ee333 100644
index ad69005..af19ad5 100644
--- renderer/render_frame_impl.cc
+++ renderer/render_frame_impl.cc
@@ -4751,7 +4751,6 @@ WebNavigationPolicy RenderFrameImpl::decidePolicyForNavigation(
@@ -4753,7 +4753,6 @@ WebNavigationPolicy RenderFrameImpl::decidePolicyForNavigation(
(pending_navigation_params_ &&
!pending_navigation_params_->request_params.redirects.empty());
@@ -50,7 +50,7 @@ index 289ca31..a1ee333 100644
// The handlenavigation API is deprecated and will be removed once
// crbug.com/325351 is resolved.
if (GetContentClient()->renderer()->HandleNavigation(
@@ -4760,7 +4759,6 @@ WebNavigationPolicy RenderFrameImpl::decidePolicyForNavigation(
@@ -4762,7 +4761,6 @@ WebNavigationPolicy RenderFrameImpl::decidePolicyForNavigation(
is_redirect)) {
return blink::WebNavigationPolicyIgnore;
}

View File

@@ -1,5 +1,5 @@
diff --git content/browser/renderer_host/render_widget_host_view_aura.cc content/browser/renderer_host/render_widget_host_view_aura.cc
index 9d63bbd..31520f1 100644
index 4bb17af87..3143357 100644
--- content/browser/renderer_host/render_widget_host_view_aura.cc
+++ content/browser/renderer_host/render_widget_host_view_aura.cc
@@ -685,6 +685,13 @@ void RenderWidgetHostViewAura::SetKeyboardFocus() {