From eb023d18e0285cab811fa1cbeafc4dbf052b388d Mon Sep 17 00:00:00 2001 From: Marshall Greenblatt Date: Thu, 2 Mar 2023 14:36:13 +0000 Subject: [PATCH] Update to Chromium version 111.0.5563.50 --- CHROMIUM_BUILD_COMPATIBILITY.txt | 2 +- patch/patches/web_contents_1257_1565.patch | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/CHROMIUM_BUILD_COMPATIBILITY.txt b/CHROMIUM_BUILD_COMPATIBILITY.txt index 7442417b6..204a508c8 100644 --- a/CHROMIUM_BUILD_COMPATIBILITY.txt +++ b/CHROMIUM_BUILD_COMPATIBILITY.txt @@ -7,6 +7,6 @@ # https://bitbucket.org/chromiumembedded/cef/wiki/BranchesAndBuilding { - 'chromium_checkout': 'refs/tags/111.0.5563.41', + 'chromium_checkout': 'refs/tags/111.0.5563.50', 'depot_tools_checkout': '963e01c76c' } diff --git a/patch/patches/web_contents_1257_1565.patch b/patch/patches/web_contents_1257_1565.patch index 045b4761a..ed0809b15 100644 --- a/patch/patches/web_contents_1257_1565.patch +++ b/patch/patches/web_contents_1257_1565.patch @@ -1,8 +1,8 @@ diff --git content/browser/web_contents/web_contents_impl.cc content/browser/web_contents/web_contents_impl.cc -index 1c3f95a886d8f..68b496660d772 100644 +index aea2d122faef0..df8c1858b6387 100644 --- content/browser/web_contents/web_contents_impl.cc +++ content/browser/web_contents/web_contents_impl.cc -@@ -3173,6 +3173,12 @@ void WebContentsImpl::Init(const WebContents::CreateParams& params, +@@ -3174,6 +3174,12 @@ void WebContentsImpl::Init(const WebContents::CreateParams& params, params.main_frame_name, GetOpener(), primary_main_frame_policy, base::UnguessableToken::Create()); @@ -15,7 +15,7 @@ index 1c3f95a886d8f..68b496660d772 100644 std::unique_ptr delegate = GetContentClient()->browser()->GetWebContentsViewDelegate(this); -@@ -3183,6 +3189,7 @@ void WebContentsImpl::Init(const WebContents::CreateParams& params, +@@ -3184,6 +3190,7 @@ void WebContentsImpl::Init(const WebContents::CreateParams& params, view_ = CreateWebContentsView(this, std::move(delegate), &render_view_host_delegate_view_); } @@ -23,7 +23,7 @@ index 1c3f95a886d8f..68b496660d772 100644 CHECK(render_view_host_delegate_view_); CHECK(view_.get()); -@@ -3363,6 +3370,9 @@ void WebContentsImpl::RenderWidgetCreated( +@@ -3364,6 +3371,9 @@ void WebContentsImpl::RenderWidgetCreated( OPTIONAL_TRACE_EVENT1("content", "WebContentsImpl::RenderWidgetCreated", "render_widget_host", render_widget_host); created_widgets_.insert(render_widget_host); @@ -33,7 +33,7 @@ index 1c3f95a886d8f..68b496660d772 100644 } void WebContentsImpl::RenderWidgetDeleted( -@@ -4094,6 +4104,15 @@ FrameTree* WebContentsImpl::CreateNewWindow( +@@ -4095,6 +4105,15 @@ FrameTree* WebContentsImpl::CreateNewWindow( create_params.picture_in_picture_options = *(params.pip_options); } @@ -49,7 +49,7 @@ index 1c3f95a886d8f..68b496660d772 100644 // Check whether there is an available prerendered page for this navigation if // this is not for guest. If it exists, take WebContents pre-created for // hosting the prerendered page instead of creating new WebContents. -@@ -7994,6 +8013,9 @@ void WebContentsImpl::SetFocusedFrame(FrameTreeNode* node, +@@ -7995,6 +8014,9 @@ void WebContentsImpl::SetFocusedFrame(FrameTreeNode* node, // frames). SetFocusedFrameTree(&node->frame_tree()); }