From d3e47f59e9d3ba780cba5a77f90adf4f7ab5dc03 Mon Sep 17 00:00:00 2001 From: Marshall Greenblatt Date: Thu, 9 Mar 2017 17:50:07 -0500 Subject: [PATCH] Update to Chromium version 57.0.2987.88 --- CHROMIUM_BUILD_COMPATIBILITY.txt | 2 +- .../patches/views_widget_180_1481_1565_1677_1749.patch | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/CHROMIUM_BUILD_COMPATIBILITY.txt b/CHROMIUM_BUILD_COMPATIBILITY.txt index fcedce5d1..e69c28e5f 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/57.0.2987.74', + 'chromium_checkout': 'refs/tags/57.0.2987.88', } diff --git a/patch/patches/views_widget_180_1481_1565_1677_1749.patch b/patch/patches/views_widget_180_1481_1565_1677_1749.patch index b5ea572ef..4a01eded0 100644 --- a/patch/patches/views_widget_180_1481_1565_1677_1749.patch +++ b/patch/patches/views_widget_180_1481_1565_1677_1749.patch @@ -325,10 +325,10 @@ index f592e1e..6bf0f4d 100644 base::WeakPtrFactory weak_factory_; diff --git ui/views/widget/widget.cc ui/views/widget/widget.cc -index 8b06275..45b100d 100644 +index 61469a8..e50efd3 100644 --- ui/views/widget/widget.cc +++ ui/views/widget/widget.cc -@@ -129,6 +129,7 @@ Widget::InitParams::InitParams(Type type) +@@ -130,6 +130,7 @@ Widget::InitParams::InitParams(Type type) use_system_default_icon(false), show_state(ui::SHOW_STATE_DEFAULT), parent(nullptr), @@ -336,7 +336,7 @@ index 8b06275..45b100d 100644 native_widget(nullptr), desktop_window_tree_host(nullptr), layer_type(ui::LAYER_TEXTURED), -@@ -296,7 +297,7 @@ void Widget::Init(const InitParams& in_params) { +@@ -298,7 +299,7 @@ void Widget::Init(const InitParams& in_params) { params.name = params.delegate->GetContentsView()->GetClassName(); params.child |= (params.type == InitParams::TYPE_CONTROL); @@ -345,7 +345,7 @@ index 8b06275..45b100d 100644 if (params.opacity == views::Widget::InitParams::INFER_OPACITY && params.type != views::Widget::InitParams::TYPE_WINDOW && -@@ -360,7 +361,12 @@ void Widget::Init(const InitParams& in_params) { +@@ -362,7 +363,12 @@ void Widget::Init(const InitParams& in_params) { } } else if (params.delegate) { SetContentsView(params.delegate->GetContentsView()); @@ -360,7 +360,7 @@ index 8b06275..45b100d 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 2c5ba16..87046a0 100644 +index 5931af7..6d3c87d 100644 --- ui/views/widget/widget.h +++ ui/views/widget/widget.h @@ -250,6 +250,7 @@ class VIEWS_EXPORT Widget : public internal::NativeWidgetDelegate,