Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: bump chromium to 124.0.6323.0 (main) #41412

Merged
merged 23 commits into from
Feb 29, 2024
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
e8acb3a
chore: bump chromium in DEPS to 124.0.6315.0
electron-roller[bot] Feb 22, 2024
c688997
chore: update patches
jkleinsc Feb 22, 2024
2647f9e
5279678: Stream AIDA responses
jkleinsc Feb 22, 2024
70fff23
5276439: Remove non_network_url_loader_factory_remotes_
jkleinsc Feb 22, 2024
399dddb
5310165: Add DevTools API to show search results
jkleinsc Feb 22, 2024
3643da3
chore: bump chromium in DEPS to 124.0.6317.0
electron-roller[bot] Feb 23, 2024
88adc5a
chore: update patches
jkleinsc Feb 23, 2024
84abfba
Remove Setup.Install.CumulativeDiskUsage2 and supporting code
jkleinsc Feb 23, 2024
a83c652
browser: Make cmd line non-const in process singleton callback
jkleinsc Feb 23, 2024
b472d2c
chore: bump chromium in DEPS to 124.0.6319.0
electron-roller[bot] Feb 24, 2024
495d04e
chore: bump chromium in DEPS to 124.0.6321.0
electron-roller[bot] Feb 25, 2024
60ef2ab
chore: bump chromium in DEPS to 124.0.6323.0
electron-roller[bot] Feb 26, 2024
8e43cac
5318335: Roll src/third_party/boringssl/src 23824fa0f..4fe29ebc7
codebytere Feb 26, 2024
edb920e
5318051: [CBE Watermarking] Hoist `watermark_view` to a member variable.
codebytere Feb 26, 2024
e0e0970
chore: fixup patch indices
codebytere Feb 26, 2024
5a6f194
4946553: Delegate HID permission to Chrome App in webview
codebytere Feb 26, 2024
e24a368
5310001: DevTools UI binding for reporting client events to AIDA
codebytere Feb 26, 2024
8573043
[libc++] Refactor the predicate taking variant of `__cxx_atomic_wait`
codebytere Feb 26, 2024
d4e12c4
chore: fix browser_view patch harder
codebytere Feb 26, 2024
691131b
5293937: Reland "[gUM] Use preferred device if more than one is eligi…
codebytere Feb 27, 2024
02b0d01
fix: filter {video|audio} devices by eligible device id
codebytere Feb 27, 2024
2f0c163
5267921: enable speak content under the pointer on PWA and WV2
codebytere Feb 27, 2024
1bb9fe2
5310195: heap: Remove Blink's GCTaskRunner
codebytere Feb 28, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
chore: fixup patch indices
  • Loading branch information
codebytere committed Feb 28, 2024
commit e0e097063b8271c06158e6c26e9c0a8f43eb2ba7
Original file line number Diff line number Diff line change
Expand Up @@ -20,10 +20,10 @@ index 2ca14efae5ea478f43794a81883b00dfdb1a37b0..d73055fbf39334925ef4b4804bbaca57

case ssl_open_record_error:
diff --git a/ssl/ssl_lib.cc b/ssl/ssl_lib.cc
index 58b68e6759650b9a2a3915aa343451bdd1ec1e89..a709ab4067a001ce1087f89c3b5d66e99ba0d4f7 100644
index 81a98071315214e3cf446b340fa9186f760bf370..e6a020fcab39391e7b014e324208b454e2fee95d 100644
--- a/ssl/ssl_lib.cc
+++ b/ssl/ssl_lib.cc
@@ -1334,7 +1334,7 @@ int SSL_get_error(const SSL *ssl, int ret_code) {
@@ -1331,7 +1331,7 @@ int SSL_get_error(const SSL *ssl, int ret_code) {
}

if (ret_code == 0) {
Expand All @@ -32,7 +32,7 @@ index 58b68e6759650b9a2a3915aa343451bdd1ec1e89..a709ab4067a001ce1087f89c3b5d66e9
return SSL_ERROR_ZERO_RETURN;
}
// An EOF was observed which violates the protocol, and the underlying
@@ -2705,13 +2705,7 @@ void *SSL_CTX_get_ex_data(const SSL_CTX *ctx, int idx) {
@@ -2687,13 +2687,7 @@ void *SSL_CTX_get_ex_data(const SSL_CTX *ctx, int idx) {
return CRYPTO_get_ex_data(&ctx->ex_data, idx);
}

Expand Down
2 changes: 1 addition & 1 deletion patches/chromium/add_didinstallconditionalfeatures.patch
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ index 58612b9fe73dc86d9f737a69bcadcbbf81045074..954f3b5cf264a3e2ce904f723941bda3
virtual void WillReleaseScriptContext(v8::Local<v8::Context>,
int32_t world_id) {}
diff --git a/third_party/blink/renderer/bindings/core/v8/local_window_proxy.cc b/third_party/blink/renderer/bindings/core/v8/local_window_proxy.cc
index 534de2a581b34e15ec20832fffb603c4ea82296d..770fd0a15c4a3521315b70e46a3646e361432508 100644
index f35fb0b9825aa974d1996dd9d132f400ea1f8310..074584d6368acd4665b80f42f5d7fec26f7ced90 100644
--- a/third_party/blink/renderer/bindings/core/v8/local_window_proxy.cc
+++ b/third_party/blink/renderer/bindings/core/v8/local_window_proxy.cc
@@ -212,6 +212,7 @@ void LocalWindowProxy::Initialize() {
Expand Down
2 changes: 1 addition & 1 deletion patches/chromium/blink_local_frame.patch
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ index 2432d2dba67540f8cdd8e5466a813693ff2d6683..ed9863e6a9870f45b2f688b1a9228c17
// its owning reference back to our owning LocalFrame.
client_->Detached(type);
diff --git a/third_party/blink/renderer/core/frame/local_frame.cc b/third_party/blink/renderer/core/frame/local_frame.cc
index 0d620d369a9e40d222b9824638a96257ea8608de..e54e34ee306530858f8423ea230a32b938606f54 100644
index ab9155e3177252b365ed122c389635f883190001..cd845228572c5edde420d80e177aefc29203b747 100644
--- a/third_party/blink/renderer/core/frame/local_frame.cc
+++ b/third_party/blink/renderer/core/frame/local_frame.cc
@@ -691,10 +691,6 @@ bool LocalFrame::DetachImpl(FrameDetachType type) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,10 @@ Subject: build: allow electron to use exec_script
This is similar to the //build usecase so we're OK adding ourselves here

diff --git a/.gn b/.gn
index afe0b3e90fafb9413cc49198cf3ad5d66d433b54..6b83b22994998ba98895144ec81b4cdff1b0e0db 100644
index 6abe8e52e11154d5f3cb7c80d57754b1a3819e46..22adbcc359a53405b0c1b4dbc170a5c896eb2b5c 100644
--- a/.gn
+++ b/.gn
@@ -167,4 +167,8 @@ exec_script_whitelist =
@@ -173,4 +173,8 @@ exec_script_whitelist =

"//tools/grit/grit_rule.gni",
"//tools/gritsettings/BUILD.gn",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -33,10 +33,10 @@ index 78c84e4ccefb90715d68de15d32d5245027ebb4d..99c80a0d2c23533f2858f61aca11d3b7
"//base",
"//build:branding_buildflags",
diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
index a59801a5f4332259c3b0a1d906ddd2f6da4b4c37..33b9ab959b4087421f9058f1c927813a5c237113 100644
index dfba1dd0fcfa9a6c7aabcf7de8a64f5f67781bc9..e3cc6c12540d09ef8cdc9640a9eff6299bc55237 100644
--- a/chrome/browser/BUILD.gn
+++ b/chrome/browser/BUILD.gn
@@ -4791,7 +4791,7 @@ static_library("browser") {
@@ -4785,7 +4785,7 @@ static_library("browser") {

# On Windows, the hashes are embedded in //chrome:chrome_initial rather
# than here in :chrome_dll.
Expand All @@ -46,10 +46,10 @@ index a59801a5f4332259c3b0a1d906ddd2f6da4b4c37..33b9ab959b4087421f9058f1c927813a
sources += [ "certificate_viewer_stub.cc" ]
}
diff --git a/chrome/test/BUILD.gn b/chrome/test/BUILD.gn
index bfc30df0d9cce15c5359835ca3527e2ba9ac9c1b..341ea79b4ae15739789914c67b6ce2c0e7985395 100644
index b04036f9abac30760feae720f5e76b3f49ba1361..7801d5ae0878c0f56ed23bd4f132ad0fa51abe7a 100644
--- a/chrome/test/BUILD.gn
+++ b/chrome/test/BUILD.gn
@@ -7154,9 +7154,12 @@ test("unit_tests") {
@@ -7150,9 +7150,12 @@ test("unit_tests") {
"//chrome/browser/safe_browsing/incident_reporting/verifier_test:verifier_test_dll_2",
]

Expand All @@ -63,7 +63,7 @@ index bfc30df0d9cce15c5359835ca3527e2ba9ac9c1b..341ea79b4ae15739789914c67b6ce2c0
"//chrome//services/util_win:unit_tests",
"//chrome/app:chrome_dll_resources",
"//chrome/app:win_unit_tests",
@@ -8120,6 +8123,10 @@ test("unit_tests") {
@@ -8116,6 +8119,10 @@ test("unit_tests") {
"../browser/performance_manager/policies/background_tab_loading_policy_unittest.cc",
]

Expand All @@ -74,7 +74,7 @@ index bfc30df0d9cce15c5359835ca3527e2ba9ac9c1b..341ea79b4ae15739789914c67b6ce2c0
sources += [
# The importer code is not used on Android.
"../common/importer/firefox_importer_utils_unittest.cc",
@@ -8189,7 +8196,6 @@ test("unit_tests") {
@@ -8185,7 +8192,6 @@ test("unit_tests") {
}

deps += [
Expand Down
14 changes: 7 additions & 7 deletions patches/chromium/can_create_window.patch
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ potentially prevent a window from being created.
TODO(loc): this patch is currently broken.

diff --git a/content/browser/renderer_host/render_frame_host_impl.cc b/content/browser/renderer_host/render_frame_host_impl.cc
index cd4b9997eeca651d87941be4d0f68d06135ac08e..4743a3d2ee81a2b2be3424411b4ec41e015e9c43 100644
index e57f0eb4fa3ffdb7d4fa3968a87d2041c2cbf0c7..f2d9a0882c75bd061158f53864fe745257e75c91 100644
--- a/content/browser/renderer_host/render_frame_host_impl.cc
+++ b/content/browser/renderer_host/render_frame_host_impl.cc
@@ -8334,6 +8334,7 @@ void RenderFrameHostImpl::CreateNewWindow(
Expand All @@ -21,10 +21,10 @@ index cd4b9997eeca651d87941be4d0f68d06135ac08e..4743a3d2ee81a2b2be3424411b4ec41e
&no_javascript_access);

diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser/web_contents/web_contents_impl.cc
index 661999859c597bf6322bb09242247c058b30a0fe..e7291e65757fbf1537718448c32895d5240dbf9a 100644
index 27e5ffad774403590626da37e90616c4fff20759..5293c24c2539e0cfb5c0e9adf00b76b58852c8a6 100644
--- a/content/browser/web_contents/web_contents_impl.cc
+++ b/content/browser/web_contents/web_contents_impl.cc
@@ -4520,6 +4520,12 @@ FrameTree* WebContentsImpl::CreateNewWindow(
@@ -4530,6 +4530,12 @@ FrameTree* WebContentsImpl::CreateNewWindow(

auto* new_contents_impl = new_contents.get();

Expand All @@ -37,7 +37,7 @@ index 661999859c597bf6322bb09242247c058b30a0fe..e7291e65757fbf1537718448c32895d5
// If the new frame has a name, make sure any SiteInstances that can find
// this named frame have proxies for it. Must be called after
// SetSessionStorageNamespace, since this calls CreateRenderView, which uses
@@ -4561,12 +4567,6 @@ FrameTree* WebContentsImpl::CreateNewWindow(
@@ -4571,12 +4577,6 @@ FrameTree* WebContentsImpl::CreateNewWindow(
AddWebContentsDestructionObserver(new_contents_impl);
}

Expand Down Expand Up @@ -66,7 +66,7 @@ index 9381a209cbe182c8bdde694fae763f96c28e96ef..d5268ea720b1c35e17f63cb39d31c6c1

// Operation result when the renderer asks the browser to create a new window.
diff --git a/content/public/browser/content_browser_client.cc b/content/public/browser/content_browser_client.cc
index 6b1c9a2e7db183afb3ec848e479356831ce352b4..f491864b07d03635fffe690fd5f9b15b751f422c 100644
index ecf1504bf4c2bce3ff961c8dbd7eae01957ad3b8..fe34db842d6427e08b0bfc4f7d6d00028521e5d3 100644
--- a/content/public/browser/content_browser_client.cc
+++ b/content/public/browser/content_browser_client.cc
@@ -716,6 +716,8 @@ bool ContentBrowserClient::CanCreateWindow(
Expand All @@ -79,7 +79,7 @@ index 6b1c9a2e7db183afb3ec848e479356831ce352b4..f491864b07d03635fffe690fd5f9b15b
bool opener_suppressed,
bool* no_javascript_access) {
diff --git a/content/public/browser/content_browser_client.h b/content/public/browser/content_browser_client.h
index ea8701ff6fb458caac51196cbc943e27694e6420..a567cb4a85887ef05a43d21ec1128aac3fa5e67f 100644
index 9ba8e83bcc8796090901f389f3e465b3cb2a1cb3..0ceaa3c85e96a4a1672a4e63096800f87a05ffc0 100644
--- a/content/public/browser/content_browser_client.h
+++ b/content/public/browser/content_browser_client.h
@@ -183,6 +183,7 @@ class NetworkService;
Expand All @@ -90,7 +90,7 @@ index ea8701ff6fb458caac51196cbc943e27694e6420..a567cb4a85887ef05a43d21ec1128aac
} // namespace network

namespace sandbox {
@@ -1191,6 +1192,8 @@ class CONTENT_EXPORT ContentBrowserClient {
@@ -1190,6 +1191,8 @@ class CONTENT_EXPORT ContentBrowserClient {
const std::string& frame_name,
WindowOpenDisposition disposition,
const blink::mojom::WindowFeatures& features,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -37,4 +37,3 @@ index 2a1498da8c9ce693403800d4c4b52fac6a7430e1..3121dbc0721ecfc4c0d5a586673bd139
#if BUILDFLAG(IS_CHROMEOS_ASH)
#include "ui/compositor/throughput_tracker.h"
#endif

Original file line number Diff line number Diff line change
Expand Up @@ -218,10 +218,10 @@ index c5b0d3b23b8da318ae55fcac2515a1187f261469..16ed1f46c9afde0ff25750128b4fcff6
void AddNewContents(content::WebContents* source,
std::unique_ptr<content::WebContents> new_contents,
diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser/web_contents/web_contents_impl.cc
index 76efb14eabe06b037278b2b4ada3d97183096d8b..de8030b2948fc7ade1745998a222e2dbe5dedaa3 100644
index da31981f2710d08518c7ae1ab8bdbba5ff862efd..caa5538db8999fb53d0a9035715785ecb5a8bbd0 100644
--- a/content/browser/web_contents/web_contents_impl.cc
+++ b/content/browser/web_contents/web_contents_impl.cc
@@ -4426,8 +4426,7 @@ FrameTree* WebContentsImpl::CreateNewWindow(
@@ -4436,8 +4436,7 @@ FrameTree* WebContentsImpl::CreateNewWindow(

if (delegate_ && delegate_->IsWebContentsCreationOverridden(
source_site_instance, params.window_container_type,
Expand Down
2 changes: 1 addition & 1 deletion patches/chromium/disable_hidden.patch
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ Subject: disable_hidden.patch
Electron uses this to disable background throttling for hidden windows.

diff --git a/content/browser/renderer_host/render_widget_host_impl.cc b/content/browser/renderer_host/render_widget_host_impl.cc
index be0bdbd9beae5a7e3a2aadbce5d6b8d44cad9cff..8c99253914eae43ebe9e4bb579d3c5a0f514da5d 100644
index 3922b9737f2e64e68d564b7554e734e8c8667fd8..b505c0056d276b91f0b57f42b4da6496342fc0c7 100644
--- a/content/browser/renderer_host/render_widget_host_impl.cc
+++ b/content/browser/renderer_host/render_widget_host_impl.cc
@@ -750,6 +750,9 @@ void RenderWidgetHostImpl::WasHidden() {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,10 +23,10 @@ Upstream bug https://bugs.chromium.org/p/chromium/issues/detail?id=1081397.
Upstreamed at https://chromium-review.googlesource.com/c/chromium/src/+/3856266.

diff --git a/content/browser/renderer_host/navigation_request.cc b/content/browser/renderer_host/navigation_request.cc
index 71493b99a071a9ee2674214b4f85659f059c4888..99be7b03016261cfd0bf916435ded0ed8dff6f8c 100644
index 92cac02e5a5d1dcae04bb5c5d3200c1246b6cd7e..ffbbcecb47d2ab789b721041762fb71ef76214ab 100644
--- a/content/browser/renderer_host/navigation_request.cc
+++ b/content/browser/renderer_host/navigation_request.cc
@@ -10262,6 +10262,12 @@ NavigationRequest::GetOriginForURLLoaderFactoryUncheckedWithDebugInfo() {
@@ -10264,6 +10264,12 @@ NavigationRequest::GetOriginForURLLoaderFactoryUncheckedWithDebugInfo() {
return std::make_pair(parent->GetLastCommittedOrigin(), "about_srcdoc");
}

Expand Down
10 changes: 5 additions & 5 deletions patches/chromium/fix_harden_blink_scriptstate_maybefrom.patch
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ index 8d7c5631fd8f1499c67384286f0e3c4037673b32..99b2e2f63be8a46c5546dd53bc9b05e8
kEmbedderFuchsia,
};
diff --git a/third_party/blink/renderer/platform/bindings/script_state.cc b/third_party/blink/renderer/platform/bindings/script_state.cc
index 7ff8785cd64c1264a88f91f7bd3292c6943f58ea..bc14ad8cab9fa3ec45bcb9f670b198970ecbeb92 100644
index e4a27a24c83dd1a478b2ada8b6c8220076790791..c76dc818f38a62fff63852dbecbc85e304ac731d 100644
--- a/third_party/blink/renderer/platform/bindings/script_state.cc
+++ b/third_party/blink/renderer/platform/bindings/script_state.cc
@@ -13,6 +13,10 @@ namespace blink {
Expand All @@ -76,7 +76,7 @@ index 7ff8785cd64c1264a88f91f7bd3292c6943f58ea..bc14ad8cab9fa3ec45bcb9f670b19897
RendererResourceCoordinator::Get()->OnScriptStateCreated(this,
execution_context);
}
@@ -78,6 +84,8 @@ void ScriptState::DissociateContext() {
@@ -79,6 +85,8 @@ void ScriptState::DissociateContext() {
// Cut the reference from V8 context to ScriptState.
GetContext()->SetAlignedPointerInEmbedderData(kV8ContextPerContextDataIndex,
nullptr);
Expand All @@ -86,10 +86,10 @@ index 7ff8785cd64c1264a88f91f7bd3292c6943f58ea..bc14ad8cab9fa3ec45bcb9f670b19897

// Cut the reference from ScriptState to V8 context.
diff --git a/third_party/blink/renderer/platform/bindings/script_state.h b/third_party/blink/renderer/platform/bindings/script_state.h
index a3dd5bcddde26079198810b0ffd7fc19081498f8..84dc1417f6d69f03c60826f7d12d6bd2add8dd0c 100644
index 932e49a9d2a1ffd821b7da3de55c64267bfc58b8..6091d26a9ba13a47d1b7914b4f595aa7e8d35849 100644
--- a/third_party/blink/renderer/platform/bindings/script_state.h
+++ b/third_party/blink/renderer/platform/bindings/script_state.h
@@ -182,7 +182,12 @@ class PLATFORM_EXPORT ScriptState : public GarbageCollected<ScriptState> {
@@ -180,7 +180,12 @@ class PLATFORM_EXPORT ScriptState : public GarbageCollected<ScriptState> {
static ScriptState* MaybeFrom(v8::Local<v8::Context> context) {
DCHECK(!context.IsEmpty());
if (context->GetNumberOfEmbedderDataFields() <=
Expand All @@ -103,7 +103,7 @@ index a3dd5bcddde26079198810b0ffd7fc19081498f8..84dc1417f6d69f03c60826f7d12d6bd2
return nullptr;
}
ScriptState* script_state =
@@ -251,9 +256,15 @@ class PLATFORM_EXPORT ScriptState : public GarbageCollected<ScriptState> {
@@ -247,9 +252,15 @@ class PLATFORM_EXPORT ScriptState : public GarbageCollected<ScriptState> {
static void SetCreateCallback(CreateCallback);
friend class ScriptStateImpl;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -87,10 +87,10 @@ index 01993347572548e46d8583c0bb568be4f12c7207..c679db5de0e2b60867b8f4b30c9b72b6
// The view with active text input state, i.e., a focused <input> element.
// It will be nullptr if no such view exists. Note that the active view
diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser/web_contents/web_contents_impl.cc
index 11ae65bbaa66e1d4212fa7c08d30514684dc8d16..ac96f25d6aa4212a292e4b845c24d2366e004699 100644
index 3e7cc965686f73f98a8c8bc39caca483e51eac31..943ffa1bbf2de918d2991de20a6bc46a667b5a51 100644
--- a/content/browser/web_contents/web_contents_impl.cc
+++ b/content/browser/web_contents/web_contents_impl.cc
@@ -8773,7 +8773,7 @@ void WebContentsImpl::OnFocusedElementChangedInFrame(
@@ -8783,7 +8783,7 @@ void WebContentsImpl::OnFocusedElementChangedInFrame(
"WebContentsImpl::OnFocusedElementChangedInFrame",
"render_frame_host", frame);
RenderWidgetHostViewBase* root_view =
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,10 @@ This patch should be upstreamed as a conditional revert of the logic in desktop
vs mobile runtimes. i.e. restore the old logic only on desktop platforms

diff --git a/content/browser/renderer_host/render_widget_host_impl.cc b/content/browser/renderer_host/render_widget_host_impl.cc
index adaef9206a25dee5dd0686c61798b6fb72e2cfff..9df6ca3cc006a914bb3fa1c3eae8e746e3375bd5 100644
index 892192974cfdff99b284df7466579ee52aec72a6..0166595f60c6d787d00bbbdf3ef0ee02a3933054 100644
--- a/content/browser/renderer_host/render_widget_host_impl.cc
+++ b/content/browser/renderer_host/render_widget_host_impl.cc
@@ -2133,9 +2133,8 @@ RenderWidgetHostImpl::GetWidgetInputHandler() {
@@ -2141,9 +2141,8 @@ RenderWidgetHostImpl::GetWidgetInputHandler() {
void RenderWidgetHostImpl::NotifyScreenInfoChanged() {
// The resize message (which may not happen immediately) will carry with it
// the screen info as well as the new size (if the screen has changed scale
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ index cba373664bec3a32abad6fe0396bd67b53b7e67f..7a985067b1371604644d48159f2f5aa7

#endif // THIRD_PARTY_BLINK_PUBLIC_WEB_WEB_SCRIPT_EXECUTION_CALLBACK_H_
diff --git a/third_party/blink/renderer/core/frame/local_frame.cc b/third_party/blink/renderer/core/frame/local_frame.cc
index e54e34ee306530858f8423ea230a32b938606f54..3b3b25b753fe15838a7895dcf25db3bfee3dbdc7 100644
index cd845228572c5edde420d80e177aefc29203b747..6f29a133b8bf602d6c2b8854d822dea6bafc7b2f 100644
--- a/third_party/blink/renderer/core/frame/local_frame.cc
+++ b/third_party/blink/renderer/core/frame/local_frame.cc
@@ -2974,6 +2974,7 @@ void LocalFrame::RequestExecuteScript(
Expand All @@ -85,7 +85,7 @@ index e54e34ee306530858f8423ea230a32b938606f54..3b3b25b753fe15838a7895dcf25db3bf

void LocalFrame::SetEvictCachedSessionStorageOnFreezeOrUnload() {
diff --git a/third_party/blink/renderer/core/frame/local_frame.h b/third_party/blink/renderer/core/frame/local_frame.h
index b693e61102120c0c783dea756d96883f433ac4e1..cc17510f6c5403260943ae18e73d0efe606ec58b 100644
index e29266e3ab88bf19b500a6c537b6cdf9eff3a3fe..5373a4e8b9a056eb98fabb71b13bd266a4540819 100644
--- a/third_party/blink/renderer/core/frame/local_frame.h
+++ b/third_party/blink/renderer/core/frame/local_frame.h
@@ -821,6 +821,7 @@ class CORE_EXPORT LocalFrame final
Expand Down Expand Up @@ -216,7 +216,7 @@ index 0c12a0a51b9224dd4d6eda9744d152fb7d40b97e..cdc100787cfcb263505f5a73bcbc289b
mojom::blink::WantResultOption::kWantResult, wait_for_promise);
}
diff --git a/third_party/blink/renderer/core/frame/web_local_frame_impl.cc b/third_party/blink/renderer/core/frame/web_local_frame_impl.cc
index 0727dd9aa51ed49dc7ae7bf4219dcc1642b541d7..77dbe8ec0a5750ffd670ce1ed58274879ada2ba0 100644
index 913fe1c0aa364ba79a7a66c7aba68b30120a4bb0..55fd4df3fcd1478037885c49fd504cc8a00bf1a9 100644
--- a/third_party/blink/renderer/core/frame/web_local_frame_impl.cc
+++ b/third_party/blink/renderer/core/frame/web_local_frame_impl.cc
@@ -1122,14 +1122,15 @@ void WebLocalFrameImpl::RequestExecuteScript(
Expand Down
2 changes: 1 addition & 1 deletion patches/chromium/frame_host_manager.patch
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ index c823c64a306d6c7b91c1b98c1849e7ae13fbf5f5..70fb709510fc1b21466315260fef7203
}

diff --git a/content/public/browser/content_browser_client.h b/content/public/browser/content_browser_client.h
index a567cb4a85887ef05a43d21ec1128aac3fa5e67f..761b8d564e761df5b935183a919228f03bdf618a 100644
index 0ceaa3c85e96a4a1672a4e63096800f87a05ffc0..c6f11a6b189718ac11fd0b23cc04ba3c4a5c692e 100644
--- a/content/public/browser/content_browser_client.h
+++ b/content/public/browser/content_browser_client.h
@@ -307,6 +307,11 @@ class CONTENT_EXPORT ContentBrowserClient {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ If removing this patch causes no sync failures, it's safe to delete :+1:
Ref https://chromium-review.googlesource.com/c/chromium/src/+/2953903

diff --git a/tools/clang/scripts/update.py b/tools/clang/scripts/update.py
index b9612394680501fb3a060bd82239b0f62e9a34ae..5df933f55117e999c63c0fb493602528ced4438b 100755
index 97a6ee283978db30acbc1e64dd46e4eccf36e5a6..e84fe4ccb95eb42c536d83c1db853fc8f76dee94 100755
--- a/tools/clang/scripts/update.py
+++ b/tools/clang/scripts/update.py
@@ -306,6 +306,8 @@ def GetDefaultHostOs():
Expand Down
Loading