From 4fb61d2b79e7f81afc9ed023b471f75cd46f31c3 Mon Sep 17 00:00:00 2001 From: Marshall Greenblatt Date: Mon, 14 Oct 2019 15:39:40 +0200 Subject: [PATCH] Update to Chromium version 77.0.3865.120 --- CHROMIUM_BUILD_COMPATIBILITY.txt | 2 +- patch/patches/browser_plugin_guest_1565.patch | 10 +++++----- .../patches/views_widget_180_1481_1565_1677_1749.patch | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/CHROMIUM_BUILD_COMPATIBILITY.txt b/CHROMIUM_BUILD_COMPATIBILITY.txt index 31306cab8..f8a1ecec4 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/77.0.3865.90' + 'chromium_checkout': 'refs/tags/77.0.3865.120' } diff --git a/patch/patches/browser_plugin_guest_1565.patch b/patch/patches/browser_plugin_guest_1565.patch index 0f2b13ea2..1eb5b4161 100644 --- a/patch/patches/browser_plugin_guest_1565.patch +++ b/patch/patches/browser_plugin_guest_1565.patch @@ -79,10 +79,10 @@ index bfb918a2cba3..a193b5a0fed8 100644 // Creates a new View that holds a non-top-level widget and receives messages // for it. diff --git content/browser/web_contents/web_contents_view_aura.cc content/browser/web_contents/web_contents_view_aura.cc -index 68f268efe02e..55c9473895e9 100644 +index 965204410f9e..e55a5548a0f3 100644 --- content/browser/web_contents/web_contents_view_aura.cc +++ content/browser/web_contents/web_contents_view_aura.cc -@@ -947,7 +947,8 @@ void WebContentsViewAura::CreateView(const gfx::Size& initial_size, +@@ -951,7 +951,8 @@ void WebContentsViewAura::CreateView(const gfx::Size& initial_size, } RenderWidgetHostViewBase* WebContentsViewAura::CreateViewForWidget( @@ -92,7 +92,7 @@ index 68f268efe02e..55c9473895e9 100644 if (render_widget_host->GetView()) { // During testing, the view will already be set up in most cases to the // test view, so we don't want to clobber it with a real one. To verify that -@@ -959,6 +960,7 @@ RenderWidgetHostViewBase* WebContentsViewAura::CreateViewForWidget( +@@ -963,6 +964,7 @@ RenderWidgetHostViewBase* WebContentsViewAura::CreateViewForWidget( render_widget_host->GetView()); } @@ -101,10 +101,10 @@ index 68f268efe02e..55c9473895e9 100644 g_create_render_widget_host_view ? g_create_render_widget_host_view(render_widget_host, diff --git content/browser/web_contents/web_contents_view_aura.h content/browser/web_contents/web_contents_view_aura.h -index ed3c8d86cacc..70f869da762f 100644 +index 428c5afe4cd9..46e4a2b43d81 100644 --- content/browser/web_contents/web_contents_view_aura.h +++ content/browser/web_contents/web_contents_view_aura.h -@@ -122,7 +122,7 @@ class CONTENT_EXPORT WebContentsViewAura +@@ -123,7 +123,7 @@ class CONTENT_EXPORT WebContentsViewAura gfx::NativeView context) override; RenderWidgetHostViewBase* CreateViewForWidget( RenderWidgetHost* render_widget_host, 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 2255a18c1..e8bcfa4ad 100644 --- a/patch/patches/views_widget_180_1481_1565_1677_1749.patch +++ b/patch/patches/views_widget_180_1481_1565_1677_1749.patch @@ -122,7 +122,7 @@ index 07d4351d0a8a..4ad78ab76a7c 100644 // Set the view's active state (i.e., tint state of controls). virtual void SetActive(bool active) = 0; diff --git ui/base/x/x11_window.cc ui/base/x/x11_window.cc -index 7df0a3a8ed26..4078efb5ad10 100644 +index ec9484ce33d5..52c26dcfd6df 100644 --- ui/base/x/x11_window.cc +++ ui/base/x/x11_window.cc @@ -190,8 +190,12 @@ void XWindow::Init(const Configuration& config) {