bcarrella/cef
1
0
Fork 0
mirror of https://bitbucket.org/chromiumembedded/cef synced 2025-06-05 21:39:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

Update to Chromium version 55.0.2883.28

Browse Source
This commit is contained in:
Marshall Greenblatt
2016-11-01 12:45:33 -04:00
parent afbd288efa
commit 666341d24e
6 changed files with 34 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
patch/patches/content_nav_1129.patch
View File

@@ -39,10 +39,10 @@ index 14d8550..92e5b21 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 8880b8d..cab954b 100644
index a6b0993..7a926da 100644
--- renderer/render_frame_impl.cc
+++ renderer/render_frame_impl.cc
@@ -5008,7 +5008,6 @@ WebNavigationPolicy RenderFrameImpl::decidePolicyForNavigation(
@@ -5009,7 +5009,6 @@ WebNavigationPolicy RenderFrameImpl::decidePolicyForNavigation(
(pending_navigation_params_ &&
!pending_navigation_params_->request_params.redirects.empty());
@@ -50,7 +50,7 @@ index 8880b8d..cab954b 100644
// The handlenavigation API is deprecated and will be removed once
// crbug.com/325351 is resolved.
if (GetContentClient()->renderer()->HandleNavigation(
@@ -5017,7 +5016,6 @@ WebNavigationPolicy RenderFrameImpl::decidePolicyForNavigation(
@@ -5018,7 +5017,6 @@ WebNavigationPolicy RenderFrameImpl::decidePolicyForNavigation(
is_redirect)) {
return blink::WebNavigationPolicyIgnore;
}

6
patch/patches/gn_config.patch
View File

@@ -11,10 +11,10 @@ index 585f0d8..9f60467 100644
# TODO(dgn): Layer violation but breaks the build otherwise, see
diff --git BUILD.gn BUILD.gn
index 93699f0..3346d3e 100644
index a7bcf41..f676b26 100644
--- BUILD.gn
+++ BUILD.gn
@@ -280,6 +280,7 @@ group("both_gn_and_gyp") {
@@ -279,6 +279,7 @@ group("both_gn_and_gyp") {
# and whether there should be other targets that are iOS-only and missing.
deps += [
"//cc:cc_unittests",
@@ -116,7 +116,7 @@ index 3e93269..9821a4b 100644
if (is_mac) {
output_locales = locales_as_mac_outputs
diff --git chrome/installer/mini_installer/BUILD.gn chrome/installer/mini_installer/BUILD.gn
index 6994618..4ed3f85 100644
index 3f379fe..3fd205f 100644
--- chrome/installer/mini_installer/BUILD.gn
+++ chrome/installer/mini_installer/BUILD.gn
@@ -125,7 +125,7 @@ template("generate_mini_installer") {

4
patch/patches/prefs_content_1161.patch
View File

@@ -35,10 +35,10 @@ index 5509a57..d32b4cc 100644
bool inert_visual_viewport;
bool record_whole_document;
diff --git renderer/render_view_impl.cc renderer/render_view_impl.cc
index 9aefa5e..fb4d3a7 100644
index bfb5ccf..a7ed90c 100644
--- renderer/render_view_impl.cc
+++ renderer/render_view_impl.cc
@@ -1487,6 +1487,8 @@ void RenderViewImpl::ApplyWebPreferencesInternal(
@@ -1488,6 +1488,8 @@ void RenderViewImpl::ApplyWebPreferencesInternal(
blink::WebView* web_view,
CompositorDependencies* compositor_deps) {
ApplyWebPreferences(prefs, web_view);

2
patch/patches/webview_plugin_2020.patch
View File

@@ -1,5 +1,5 @@
diff --git chrome/app/generated_resources.grd chrome/app/generated_resources.grd
index 055cd9d..3a63433 100644
index c594edc..2c35305 100644
--- chrome/app/generated_resources.grd
+++ chrome/app/generated_resources.grd
@@ -7073,7 +7073,7 @@ Keep your key file in a safe place. You will need it to create new versions of y