From f264ab96203b1eb2fc9ba9e2f8746e84694169f9 Mon Sep 17 00:00:00 2001 From: Marshall Greenblatt Date: Tue, 10 Jan 2017 22:06:33 -0500 Subject: [PATCH] Update to Chromium version 55.0.2883.87 --- CHROMIUM_BUILD_COMPATIBILITY.txt | 2 +- patch/patches/views_widget_180_1481_1677_1749.patch | 4 ++-- patch/patches/webview_plugin_2020.patch | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/CHROMIUM_BUILD_COMPATIBILITY.txt b/CHROMIUM_BUILD_COMPATIBILITY.txt index d4a9e3aea..fc98e1d53 100644 --- a/CHROMIUM_BUILD_COMPATIBILITY.txt +++ b/CHROMIUM_BUILD_COMPATIBILITY.txt @@ -7,5 +7,5 @@ # https://bitbucket.org/chromiumembedded/cef/wiki/BranchesAndBuilding { - 'chromium_checkout': 'refs/tags/55.0.2883.59', + 'chromium_checkout': 'refs/tags/55.0.2883.87', } diff --git a/patch/patches/views_widget_180_1481_1677_1749.patch b/patch/patches/views_widget_180_1481_1677_1749.patch index c1045f752..bb0368a50 100644 --- a/patch/patches/views_widget_180_1481_1677_1749.patch +++ b/patch/patches/views_widget_180_1481_1677_1749.patch @@ -318,10 +318,10 @@ index 68e6acd..d545c54 100644 // This must come after SetContentsView() or it might not be able to find // the correct NativeTheme (on Linux). See http://crbug.com/384492 diff --git ui/views/widget/widget.h ui/views/widget/widget.h -index 1e62c09..7fa0520 100644 +index 06c8f12..023f75c 100644 --- ui/views/widget/widget.h +++ ui/views/widget/widget.h -@@ -240,6 +240,7 @@ class VIEWS_EXPORT Widget : public internal::NativeWidgetDelegate, +@@ -243,6 +243,7 @@ class VIEWS_EXPORT Widget : public internal::NativeWidgetDelegate, // Whether the widget should be maximized or minimized. ui::WindowShowState show_state; gfx::NativeView parent; diff --git a/patch/patches/webview_plugin_2020.patch b/patch/patches/webview_plugin_2020.patch index 2114f47fb..4b43cd3ac 100644 --- a/patch/patches/webview_plugin_2020.patch +++ b/patch/patches/webview_plugin_2020.patch @@ -1,8 +1,8 @@ diff --git chrome/app/generated_resources.grd chrome/app/generated_resources.grd -index d5d02cb..8c62781 100644 +index 8ac8614..4fe92d4 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 +@@ -7080,7 +7080,7 @@ Keep your key file in a safe place. You will need it to create new versions of y