Update to Chromium version 52.0.2743.60

This commit is contained in:
Marshall Greenblatt 2016-07-05 12:56:32 -04:00
parent da5b00c3dd
commit 8a351d1d42
4 changed files with 7 additions and 7 deletions

View File

@ -7,5 +7,5 @@
# https://bitbucket.org/chromiumembedded/cef/wiki/BranchesAndBuilding
{
'chromium_checkout': 'refs/tags/52.0.2743.41',
'chromium_checkout': 'refs/tags/52.0.2743.60',
}

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 ad69005..af19ad5 100644
index 8bd405a..6031656 100644
--- renderer/render_frame_impl.cc
+++ renderer/render_frame_impl.cc
@@ -4753,7 +4753,6 @@ WebNavigationPolicy RenderFrameImpl::decidePolicyForNavigation(
@@ -4770,7 +4770,6 @@ WebNavigationPolicy RenderFrameImpl::decidePolicyForNavigation(
(pending_navigation_params_ &&
!pending_navigation_params_->request_params.redirects.empty());
@ -50,7 +50,7 @@ index ad69005..af19ad5 100644
// The handlenavigation API is deprecated and will be removed once
// crbug.com/325351 is resolved.
if (GetContentClient()->renderer()->HandleNavigation(
@@ -4762,7 +4761,6 @@ WebNavigationPolicy RenderFrameImpl::decidePolicyForNavigation(
@@ -4779,7 +4778,6 @@ WebNavigationPolicy RenderFrameImpl::decidePolicyForNavigation(
is_redirect)) {
return blink::WebNavigationPolicyIgnore;
}

View File

@ -35,10 +35,10 @@ index 54b8ed4..160991f 100644
bool inert_visual_viewport;
bool record_whole_document;
diff --git renderer/render_view_impl.cc renderer/render_view_impl.cc
index 6e9efe7..3cd22fc 100644
index c6c6a49..3b57491 100644
--- renderer/render_view_impl.cc
+++ renderer/render_view_impl.cc
@@ -1477,6 +1477,8 @@ void RenderViewImpl::ApplyWebPreferencesInternal(
@@ -1478,6 +1478,8 @@ void RenderViewImpl::ApplyWebPreferencesInternal(
blink::WebView* web_view,
CompositorDependencies* compositor_deps) {
ApplyWebPreferences(prefs, web_view);

View File

@ -473,7 +473,7 @@ index b843416..8b81a51 100644
}
case Widget::InitParams::TYPE_CONTROL:
diff --git ui/views/win/hwnd_message_handler.cc ui/views/win/hwnd_message_handler.cc
index 921b838..954d426 100644
index 3d77ea4..aaefc0a 100644
--- ui/views/win/hwnd_message_handler.cc
+++ ui/views/win/hwnd_message_handler.cc
@@ -852,6 +852,8 @@ void HWNDMessageHandler::SizeConstraintsChanged() {