Update to Chromium version 54.0.2840.90

This commit is contained in:
Marshall Greenblatt
2016-11-04 13:45:52 -04:00
parent f7effc7aab
commit 49678210ec
4 changed files with 3 additions and 4 deletions

View File

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

View File

@@ -39,7 +39,7 @@ index b7b042f..69a62f2 100644
// built in media player for the given |url|. Defaults to false. // built in media player for the given |url|. Defaults to false.
virtual bool ShouldUseMediaPlayerForURL(const GURL& url); virtual bool ShouldUseMediaPlayerForURL(const GURL& url);
diff --git renderer/render_frame_impl.cc renderer/render_frame_impl.cc diff --git renderer/render_frame_impl.cc renderer/render_frame_impl.cc
index d1f9dcf..667abb6 100644 index eba0afa..c84b20b 100644
--- renderer/render_frame_impl.cc --- renderer/render_frame_impl.cc
+++ renderer/render_frame_impl.cc +++ renderer/render_frame_impl.cc
@@ -4947,7 +4947,6 @@ WebNavigationPolicy RenderFrameImpl::decidePolicyForNavigation( @@ -4947,7 +4947,6 @@ WebNavigationPolicy RenderFrameImpl::decidePolicyForNavigation(

View File

@@ -145,7 +145,6 @@ index 1e269aa..b562c3e 100644
"$root_out_dir/setup.exe", "$root_out_dir/setup.exe",
release_file, release_file,
] ]
diff --git content/renderer/mus/BUILD.gn content/renderer/mus/BUILD.gn diff --git content/renderer/mus/BUILD.gn content/renderer/mus/BUILD.gn
index efadacc..47fa5ff 100644 index efadacc..47fa5ff 100644
--- content/renderer/mus/BUILD.gn --- content/renderer/mus/BUILD.gn

View File

@@ -1,5 +1,5 @@
diff --git components/plugins/renderer/webview_plugin.cc components/plugins/renderer/webview_plugin.cc diff --git components/plugins/renderer/webview_plugin.cc components/plugins/renderer/webview_plugin.cc
index 60d955b..ab11e7b 100644 index 60d955b..81a26f4 100644
--- components/plugins/renderer/webview_plugin.cc --- components/plugins/renderer/webview_plugin.cc
+++ components/plugins/renderer/webview_plugin.cc +++ components/plugins/renderer/webview_plugin.cc
@@ -95,6 +95,23 @@ WebViewPlugin::~WebViewPlugin() { @@ -95,6 +95,23 @@ WebViewPlugin::~WebViewPlugin() {