From d692f803c88f38e21f3215f4fd3d9a3e33cb874a Mon Sep 17 00:00:00 2001 From: Marshall Greenblatt Date: Mon, 16 Sep 2024 08:59:29 +0000 Subject: [PATCH] Update to Chromium version 128.0.6613.138 --- CHROMIUM_BUILD_COMPATIBILITY.txt | 2 +- patch/patches/content_2015.patch | 12 ++++++------ patch/patches/resource_bundle_2512.patch | 2 +- patch/patches/rwh_background_color_1984.patch | 4 ++-- patch/patches/views_widget.patch | 2 +- patch/patches/webkit_plugin_info_2015.patch | 4 ++-- 6 files changed, 13 insertions(+), 13 deletions(-) diff --git a/CHROMIUM_BUILD_COMPATIBILITY.txt b/CHROMIUM_BUILD_COMPATIBILITY.txt index 3bdf53b34..4d461c91d 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/128.0.6613.120' + 'chromium_checkout': 'refs/tags/128.0.6613.138' } diff --git a/patch/patches/content_2015.patch b/patch/patches/content_2015.patch index 2dc52f209..9a6940a6e 100644 --- a/patch/patches/content_2015.patch +++ b/patch/patches/content_2015.patch @@ -114,7 +114,7 @@ index 77e3d993b3dc0..349043f3d965b 100644 // on blink::features::kUserAgentReduction. Content may cache this value. virtual std::string GetUserAgent(); diff --git content/public/renderer/content_renderer_client.h content/public/renderer/content_renderer_client.h -index 6dff7d89d2842..02fe3c1a88332 100644 +index b0bfdb4f1263c..ba47b62fce436 100644 --- content/public/renderer/content_renderer_client.h +++ content/public/renderer/content_renderer_client.h @@ -108,6 +108,9 @@ class CONTENT_EXPORT ContentRendererClient { @@ -127,7 +127,7 @@ index 6dff7d89d2842..02fe3c1a88332 100644 // Notifies that a new RenderFrame has been created. virtual void RenderFrameCreated(RenderFrame* render_frame) {} -@@ -349,6 +352,10 @@ class CONTENT_EXPORT ContentRendererClient { +@@ -354,6 +357,10 @@ class CONTENT_EXPORT ContentRendererClient { // This method may invalidate the frame. virtual void RunScriptsAtDocumentIdle(RenderFrame* render_frame) {} @@ -152,10 +152,10 @@ index f2b7b6d436431..988447abd44b9 100644 base::BindRepeating(&RenderThreadImpl::OnRendererInterfaceReceiver, base::Unretained(this))); diff --git content/renderer/renderer_blink_platform_impl.cc content/renderer/renderer_blink_platform_impl.cc -index 06000a2c90989..df8daf5b60a1e 100644 +index a59e3e52b9f98..8a110e1d57a41 100644 --- content/renderer/renderer_blink_platform_impl.cc +++ content/renderer/renderer_blink_platform_impl.cc -@@ -1030,6 +1030,15 @@ SkBitmap* RendererBlinkPlatformImpl::GetSadPageBitmap() { +@@ -1036,6 +1036,15 @@ SkBitmap* RendererBlinkPlatformImpl::GetSadPageBitmap() { //------------------------------------------------------------------------------ @@ -172,10 +172,10 @@ index 06000a2c90989..df8daf5b60a1e 100644 RendererBlinkPlatformImpl::CreateWebV8ValueConverter() { return std::make_unique(); diff --git content/renderer/renderer_blink_platform_impl.h content/renderer/renderer_blink_platform_impl.h -index 75504bfc89cbe..8a315105f4390 100644 +index 69c52cb8333fc..ac2bbc7459864 100644 --- content/renderer/renderer_blink_platform_impl.h +++ content/renderer/renderer_blink_platform_impl.h -@@ -243,6 +243,9 @@ class CONTENT_EXPORT RendererBlinkPlatformImpl : public BlinkPlatformImpl { +@@ -245,6 +245,9 @@ class CONTENT_EXPORT RendererBlinkPlatformImpl : public BlinkPlatformImpl { InertAndMinimumIntervalOfUserLevelMemoryPressureSignal() override; #endif // BUILDFLAG(IS_ANDROID) diff --git a/patch/patches/resource_bundle_2512.patch b/patch/patches/resource_bundle_2512.patch index a50422898..0f06e974d 100644 --- a/patch/patches/resource_bundle_2512.patch +++ b/patch/patches/resource_bundle_2512.patch @@ -1,5 +1,5 @@ diff --git ui/base/resource/resource_bundle.cc ui/base/resource/resource_bundle.cc -index a0aa0b111a123..09a8e2fdc2d2c 100644 +index e59ddf291c4b5..97a9e43c2eea2 100644 --- ui/base/resource/resource_bundle.cc +++ ui/base/resource/resource_bundle.cc @@ -944,6 +944,12 @@ ResourceBundle::ResourceBundle(Delegate* delegate) diff --git a/patch/patches/rwh_background_color_1984.patch b/patch/patches/rwh_background_color_1984.patch index 9b33e02c4..6e24124ce 100644 --- a/patch/patches/rwh_background_color_1984.patch +++ b/patch/patches/rwh_background_color_1984.patch @@ -1,5 +1,5 @@ diff --git content/browser/renderer_host/render_widget_host_view_aura.cc content/browser/renderer_host/render_widget_host_view_aura.cc -index 92ea6fb1bccff..3428f597dedcc 100644 +index fec211fb0f224..6daf208412582 100644 --- content/browser/renderer_host/render_widget_host_view_aura.cc +++ content/browser/renderer_host/render_widget_host_view_aura.cc @@ -6,6 +6,7 @@ @@ -35,7 +35,7 @@ index 92ea6fb1bccff..3428f597dedcc 100644 } #if BUILDFLAG(IS_WIN) -@@ -2367,6 +2371,16 @@ void RenderWidgetHostViewAura::CreateAuraWindow(aura::client::WindowType type) { +@@ -2370,6 +2374,16 @@ void RenderWidgetHostViewAura::CreateAuraWindow(aura::client::WindowType type) { window_->layer()->SetColor(GetBackgroundColor() ? *GetBackgroundColor() : SK_ColorWHITE); UpdateFrameSinkIdRegistration(); diff --git a/patch/patches/views_widget.patch b/patch/patches/views_widget.patch index 1ce35dcaa..874b868dc 100644 --- a/patch/patches/views_widget.patch +++ b/patch/patches/views_widget.patch @@ -23,7 +23,7 @@ index cef40af382b1e..a2cf4691edc37 100644 case ui::SHOW_STATE_END: return ui::SHOW_STATE_NORMAL; diff --git components/sessions/core/session_service_commands.cc components/sessions/core/session_service_commands.cc -index 618e95c4e4b10..028612a57382e 100644 +index cb28533323769..bbaf7c78bde84 100644 --- components/sessions/core/session_service_commands.cc +++ components/sessions/core/session_service_commands.cc @@ -165,9 +165,10 @@ enum PersistedWindowShowState { diff --git a/patch/patches/webkit_plugin_info_2015.patch b/patch/patches/webkit_plugin_info_2015.patch index cb82cf5be..6cc5795d3 100644 --- a/patch/patches/webkit_plugin_info_2015.patch +++ b/patch/patches/webkit_plugin_info_2015.patch @@ -1,8 +1,8 @@ diff --git third_party/blink/public/platform/platform.h third_party/blink/public/platform/platform.h -index 848edcdaf3a01..4c08bddc07337 100644 +index 700e93a9ed053..9d5d1f67adb07 100644 --- third_party/blink/public/platform/platform.h +++ third_party/blink/public/platform/platform.h -@@ -804,6 +804,11 @@ class BLINK_PLATFORM_EXPORT Platform { +@@ -810,6 +810,11 @@ class BLINK_PLATFORM_EXPORT Platform { } #endif