mirrors/electron
0
0 Fork 0
mirror of https://github.com/electron/electron.git synced 2026-10-28 11:44:46 +08:00
Code Activity

chore: bump chromium to 154.0.8025.0 (main) (#53206)

Browse Source 
* chore: bump chromium in DEPS to 154.0.8025.0

* chore: update patches

* chore: run script/gen-hunspell-filenames.js

Skip-Lint: updated hunspell filenames.

* 8291469: Reland "Reland "Integrate chromium-bidi into chromedriver""

Ref: https://chromium-review.googlesource.com/c/chromium/src/+/8291469

* test: avoid HTML parsing in protocol performance test

Measure protocol response throughput by consuming the payload with fetch
instead of navigating to it as HTML. This avoids including HTML tokenizer
overhead in the result.

Chromium CL 8134094 added raw_ptr instrumentation to the HTML parser's
LiteralBuffer pointers in testing builds, making the unrelated parser cost
dominate this protocol throughput test.

Ref: https://chromium-review.googlesource.com/c/chromium/src/+/8134094
Skip-Lint: deflake protocol spec

* 8271930: ui: Remove ui::Layer::HasExternalContent()

Guard the unused AutoPipSettingOverlayView integration behind
GOOGLE_CHROME_BRANDING. Electron does not build the chrome specific settings
view, and the updated control flow causes UBSan vptr instrumentation to emit
a reference to its unavailable RTTI.

Ref: https://chromium-review.googlesource.com/c/chromium/src/+/8271930

---------

Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com>
Co-authored-by: electron-claude[bot] <279139701+electron-claude[bot]@users.noreply.github.com>
Co-authored-by: deepak1556 <hop2deep@gmail.com>
This commit is contained in:
electron-roller[bot]electron-claude[bot]deepak1556
 authored and GitHub committed 2026-08-27 14:57:51 -07:00
1 parent e151d5479c
commit 7164502799
42 files changed
+436 -178
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

DEPS
+1 -1
View File
@@ -2,7 +2,7 @@ gclient_gn_args_from = 'src'
vars = {
'chromium_version':
'154.0.8023.0',
'154.0.8025.0',
'node_version':
'v24.19.0',
'nan_version':
build/zip.py
+1
View File
@@ -48,6 +48,7 @@ PATHS_TO_SKIP = [
'pyproto',
# Skip because these are outputs that we don't need.
'resources/inspector',
'gen/third_party/chromium-bidi/src',
'gen/third_party/devtools-frontend/src',
'gen/ui/webui',
# Skip because these get zipped separately in script/zip-symbols.py
filenames.hunspell.gni
+5 -5
View File
@@ -7,11 +7,11 @@ hunspell_dictionaries = [
"//third_party/hunspell_dictionaries/da-DK-3-0.bdic",
"//third_party/hunspell_dictionaries/de-DE-3-0.bdic",
"//third_party/hunspell_dictionaries/el-GR-3-0.bdic",
"//third_party/hunspell_dictionaries/en-AU-10-1.bdic",
"//third_party/hunspell_dictionaries/en-CA-10-1.bdic",
"//third_party/hunspell_dictionaries/en-GB-10-1.bdic",
"//third_party/hunspell_dictionaries/en-GB-oxendict-10-1.bdic",
"//third_party/hunspell_dictionaries/en-US-10-1.bdic",
"//third_party/hunspell_dictionaries/en-AU-10-2.bdic",
"//third_party/hunspell_dictionaries/en-CA-10-2.bdic",
"//third_party/hunspell_dictionaries/en-GB-10-2.bdic",
"//third_party/hunspell_dictionaries/en-GB-oxendict-10-2.bdic",
"//third_party/hunspell_dictionaries/en-US-10-2.bdic",
"//third_party/hunspell_dictionaries/es-ES-3-0.bdic",
"//third_party/hunspell_dictionaries/et-EE-3-0.bdic",
"//third_party/hunspell_dictionaries/fa-IR-9-0.bdic",
patches/chromium/add_didinstallconditionalfeatures.patch
+4 -4
View File
@@ -23,10 +23,10 @@ index 777084a902881df5b5107ecb596e2225aad36281..f6771b8b6c1db5f00cde78877a3c2bdf
int32_t world_id) {}
virtual void DidClearWindowObject() {}
diff --git a/content/renderer/render_frame_impl.cc b/content/renderer/render_frame_impl.cc
index 5e0d476b06a40f4cd76b72a0e8261ea71dc63296..df1ec3d96d73ea5dd6a93ea7f30a819736c12bcb 100644
index 33cf423de70edbec726d1664dbb5c3efd3065ba6..8238ff2ab588e2619fa21cabda9a4cccc4facc7a 100644
--- a/content/renderer/render_frame_impl.cc
+++ b/content/renderer/render_frame_impl.cc
@@ -4978,6 +4978,13 @@ void RenderFrameImpl::DidCreateScriptContext(v8::Local<v8::Context> context,
@@ -4981,6 +4981,13 @@ void RenderFrameImpl::DidCreateScriptContext(v8::Local<v8::Context> context,
}
}
@@ -124,10 +124,10 @@ index c0402f39baabf1fecff46ed0515dba499de54211..2381b103b6a77519eeacb0edd18465f9
int32_t world_id) override;
diff --git a/third_party/blink/renderer/core/loader/empty_clients.h b/third_party/blink/renderer/core/loader/empty_clients.h
index e5e8b35a39a82009c959e1ccc304e80bec9ce7f9..efc37656aeb434d08833f11732f0d112b5e8d464 100644
index b4d527ccb8ca88385a3a5d367b11ca8238589dde..e174b694f33c4ac9e99ac37fe545a04debc3fc99 100644
--- a/third_party/blink/renderer/core/loader/empty_clients.h
+++ b/third_party/blink/renderer/core/loader/empty_clients.h
@@ -428,6 +428,8 @@ class CORE_EXPORT EmptyLocalFrameClient : public LocalFrameClient {
@@ -429,6 +429,8 @@ class CORE_EXPORT EmptyLocalFrameClient : public LocalFrameClient {
void DidCreateScriptContext(v8::Local<v8::Context>,
int32_t world_id) override {}
patches/chromium/allow_disabling_blink_scheduler_throttling_per_renderview.patch
+2 -2
View File
@@ -51,10 +51,10 @@ index d98b5dda96208e3f923aa8a9c6e6eb988004904b..7c91ed2d7a397ad9e36cbecfc13de7bd
void SendRendererPreferencesToRenderer(
const blink::RendererPreferences& preferences);
diff --git a/content/browser/renderer_host/render_widget_host_view_aura.cc b/content/browser/renderer_host/render_widget_host_view_aura.cc
index 31df7a158a0b855dd18c8dee6c46d93f01ed7cba..2b5b16f5040de4fc6b3f78fadf2e841201ab32cd 100644
index 6f41be18825d5ccf38e43673dfef687d402224d1..4a98ad648ab5399974ac15978064bc01f962ae9d 100644
--- a/content/browser/renderer_host/render_widget_host_view_aura.cc
+++ b/content/browser/renderer_host/render_widget_host_view_aura.cc
@@ -685,8 +685,8 @@ void RenderWidgetHostViewAura::ShowImpl(PageVisibilityState page_visibility) {
@@ -686,8 +686,8 @@ void RenderWidgetHostViewAura::ShowImpl(PageVisibilityState page_visibility) {
// OnShowWithPageVisibility will not call NotifyHostAndDelegateOnWasShown,
// which updates `visibility_`, unless the host is hidden. Make sure no update
// is needed.
patches/chromium/blink_local_frame.patch
+2 -2
View File
@@ -49,7 +49,7 @@ index d69be19a1e4b2db98cfcecc6491da122117a7bc0..e18f84fcf109939f95239591af3242d4
// 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 297b374e8874e2734a2547823d001ade7c1f04b2..16f0ded5f914ef3b91481f5674a59771f3153f64 100644
index 605a2ff8ad46a3f65aadb77ea394fd8261fb9435..874bc78f43dc71143771978a9a572bff8f109f28 100644
--- a/third_party/blink/renderer/core/frame/local_frame.cc
+++ b/third_party/blink/renderer/core/frame/local_frame.cc
@@ -778,10 +778,6 @@ bool LocalFrame::DetachImpl(FrameDetachType type) {
@@ -63,7 +63,7 @@ index 297b374e8874e2734a2547823d001ade7c1f04b2..16f0ded5f914ef3b91481f5674a59771
if (!Client()) {
return false;
}
@@ -852,6 +848,11 @@ bool LocalFrame::DetachImpl(FrameDetachType type) {
@@ -859,6 +855,11 @@ bool LocalFrame::DetachImpl(FrameDetachType type) {
DCHECK(!view_->IsAttached());
Client()->WillBeDetached();
patches/chromium/build_allow_electron_to_use_exec_script.patch
+2 -2
View File
@@ -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 8d1672b11a00837338ef76581e530b4afbf4331d..9d13ada0f6753b97e8489c9a3fb9663998c3fb27 100644
index 488189e60c708880693387b6db385611c44f5fd5..7a2344087890f2d0c5ed95bfd64d222fe1a70e0c 100644
--- a/.gn
+++ b/.gn
@@ -174,6 +174,30 @@ exec_script_allowlist =
@@ -175,6 +175,30 @@ exec_script_allowlist =
# script. exec_script only happens when the checkout_mesa gclient arg is
# set. If/when a 'proper' GN build for Mesa exists, this can be removed.
"//third_party/dawn/third_party/meson/meson_target.gni",
patches/chromium/build_gn.patch
+1 -1
View File
@@ -7,7 +7,7 @@ These are variables we add to the root BUILDCONFIG so that they're available
everywhere, without having to import("//electron/.../flags.gni").
diff --git a/build/config/BUILDCONFIG.gn b/build/config/BUILDCONFIG.gn
index 2bd205bd7e85fcccf6c3ce308da2f93a622d578e..87c822479d97cc7f33c4f4c215d925ad800bfc8e 100644
index 538bb3d72967da509ae3173e74149ec7b530172f..be3e5af86e5c1018b0648dc903085d25d6899d1e 100644
--- a/build/config/BUILDCONFIG.gn
+++ b/build/config/BUILDCONFIG.gn
@@ -123,6 +123,9 @@ if (current_os == "") {
patches/chromium/can_create_window.patch
+8 -8
View File
@@ -12,7 +12,7 @@ that the new window is created in its own BrowsingInstance (and process).
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 c4778f3e1305831e3e137d24aaef6e99bd70dbe4..365ae11f87d7ff2cbdf0cb3cbf9850a9a6e55bec 100644
index 898811bca51c874d42b7efad3137faa0376aa401..21063c58e982092c6de635d46eaf728b47d2b708 100644
--- a/content/browser/renderer_host/render_frame_host_impl.cc
+++ b/content/browser/renderer_host/render_frame_host_impl.cc
@@ -10620,6 +10620,7 @@ void RenderFrameHostImpl::CreateNewWindow(
@@ -94,10 +94,10 @@ index 6cdae11c309db2b39e0bfce639cbfef4223d4ab6..4fba4300c9ac22f2937b080e518f723a
// 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 0e64d3178bb8f8bd6a30e2c08e58658f7a20d4fd..05e73c2f63cbc468eadc8c93a480cf646a092a73 100644
index 6499e2f1fedb93031d97e3142404b4c3759e237e..988d83fdf70abec970f96188d3cb755ab885193f 100644
--- a/content/public/browser/content_browser_client.cc
+++ b/content/public/browser/content_browser_client.cc
@@ -803,6 +803,8 @@ bool ContentBrowserClient::CanCreateWindow(
@@ -809,6 +809,8 @@ bool ContentBrowserClient::CanCreateWindow(
const std::string& frame_name,
WindowOpenDisposition disposition,
const blink::mojom::WindowFeatures& features,
@@ -107,7 +107,7 @@ index 0e64d3178bb8f8bd6a30e2c08e58658f7a20d4fd..05e73c2f63cbc468eadc8c93a480cf64
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 fd87c46ce292456e8ea4717a9dad15033319fbac..f92b7763dace1c0307e4a4ac96d55182188d3e77 100644
index 84a2eeadb95b6d8cae2bc7338eee13fe3d496203..8bb776827d657496abec10c2bef1b7682f9af10c 100644
--- a/content/public/browser/content_browser_client.h
+++ b/content/public/browser/content_browser_client.h
@@ -202,6 +202,7 @@ class TrustedURLLoaderHeaderClient;
@@ -118,7 +118,7 @@ index fd87c46ce292456e8ea4717a9dad15033319fbac..f92b7763dace1c0307e4a4ac96d55182
} // namespace network
namespace sandbox {
@@ -1264,6 +1265,8 @@ class CONTENT_EXPORT ContentBrowserClient {
@@ -1269,6 +1270,8 @@ class CONTENT_EXPORT ContentBrowserClient {
const std::string& frame_name,
WindowOpenDisposition disposition,
const blink::mojom::WindowFeatures& features,
@@ -188,10 +188,10 @@ index c3d8d88a3e436515e6f44e0725123ecd56bb76f1..7ad0f8004e2f454b71d866d533f69ae8
// typically happens when popups are created.
virtual void WebContentsCreated(WebContents* source_contents,
diff --git a/content/renderer/render_frame_impl.cc b/content/renderer/render_frame_impl.cc
index e6ea8a334955ce1594a48e4cb8bb7edccd47e1d6..5e0d476b06a40f4cd76b72a0e8261ea71dc63296 100644
index f52f4d399f2524a80b184932a1c6e97596c5fa4b..33cf423de70edbec726d1664dbb5c3efd3065ba6 100644
--- a/content/renderer/render_frame_impl.cc
+++ b/content/renderer/render_frame_impl.cc
@@ -7146,6 +7146,10 @@ WebView* RenderFrameImpl::CreateNewWindow(
@@ -7149,6 +7149,10 @@ WebView* RenderFrameImpl::CreateNewWindow(
params->started_by_ad =
GetWebFrame()->IsAdFrame() || GetWebFrame()->IsAdScriptInStack();
@@ -242,7 +242,7 @@ index 1208199428a2de729650c82e988ab67abeb0e786..2e6643ede047a580a636dbf75e86c99f
} // namespace blink
diff --git a/third_party/blink/renderer/core/frame/local_dom_window.cc b/third_party/blink/renderer/core/frame/local_dom_window.cc
index 74cc1c0b517dc0472b0039e1b3c37f6c1c8672c9..422fa34869789de257a74c13cb695ed263aed196 100644
index 91f3d4d522a9c8c2bf53064c8f8825bfa1dda538..e446c059c2c382d25cea99a3f0e3f4cd065e4d4c 100644
--- a/third_party/blink/renderer/core/frame/local_dom_window.cc
+++ b/third_party/blink/renderer/core/frame/local_dom_window.cc
@@ -2492,6 +2492,8 @@ DOMWindow* LocalDOMWindow::open(v8::Isolate* isolate,
patches/chromium/chore_expose_isolate_parameter_in_script_lifecycle_observers.patch
+4 -4
View File
@@ -34,10 +34,10 @@ index f6771b8b6c1db5f00cde78877a3c2bdf5a38d61a..800eb200f8a9e4b7b44a4d22c0cf169c
virtual void DidClearWindowObject() {}
virtual void DidChangeScrollOffset() {}
diff --git a/content/renderer/render_frame_impl.cc b/content/renderer/render_frame_impl.cc
index df1ec3d96d73ea5dd6a93ea7f30a819736c12bcb..f1240be55e912db31074a61c0cfd99481ae9eb0a 100644
index 8238ff2ab588e2619fa21cabda9a4cccc4facc7a..751f651fafe5de0ccbee442f76ee9dc42e087e30 100644
--- a/content/renderer/render_frame_impl.cc
+++ b/content/renderer/render_frame_impl.cc
@@ -4985,10 +4985,11 @@ void RenderFrameImpl::DidInstallConditionalFeatures(
@@ -4988,10 +4988,11 @@ void RenderFrameImpl::DidInstallConditionalFeatures(
}
}
@@ -245,10 +245,10 @@ index 2381b103b6a77519eeacb0edd18465f9d79feba9..30c1da16453b564e19b4675e5e6f5aff
bool HasWebView() const override;
diff --git a/third_party/blink/renderer/core/loader/empty_clients.h b/third_party/blink/renderer/core/loader/empty_clients.h
index efc37656aeb434d08833f11732f0d112b5e8d464..f3a5ed58f33970dbbeff05e6d95290acf3d4c95a 100644
index e174b694f33c4ac9e99ac37fe545a04debc3fc99..1712497a502653de69ceba1ee8eda9b765e2927e 100644
--- a/third_party/blink/renderer/core/loader/empty_clients.h
+++ b/third_party/blink/renderer/core/loader/empty_clients.h
@@ -430,7 +430,8 @@ class CORE_EXPORT EmptyLocalFrameClient : public LocalFrameClient {
@@ -431,7 +431,8 @@ class CORE_EXPORT EmptyLocalFrameClient : public LocalFrameClient {
int32_t world_id) override {}
void DidInstallConditionalFeatures(v8::Local<v8::Context>,
int32_t world_id) override {}
patches/chromium/chore_modify_chromium_handling_of_mouse_events.patch
+6 -6
View File
@@ -34,10 +34,10 @@ index cc3f9bc9383f8272a5cd95b1f2ac56529d86e493..5ca29b84cdaf42ef516ef819ae32b230
class ScrollEvent;
diff --git a/ui/views/widget/desktop_aura/desktop_window_tree_host_win.cc b/ui/views/widget/desktop_aura/desktop_window_tree_host_win.cc
index fc21877740110c8b6820bce394d871179e5069e5..0b6a9edb5f72df0b7f833e7f6dc2b2589b1ea8fd 100644
index 46c29b5ab60704b816c6c580b72f7a3498bf18c4..50f5557384eb36618f983229617098e938c37bc7 100644
--- a/ui/views/widget/desktop_aura/desktop_window_tree_host_win.cc
+++ b/ui/views/widget/desktop_aura/desktop_window_tree_host_win.cc
@@ -1518,6 +1518,10 @@ HBRUSH DesktopWindowTreeHostWin::GetBackgroundPaintBrush() {
@@ -1523,6 +1523,10 @@ HBRUSH DesktopWindowTreeHostWin::GetBackgroundPaintBrush() {
return background_paint_brush_;
}
@@ -61,10 +61,10 @@ index 15a86085de29b9f70d78e85825a592a4bdffd9e3..12edd2db9b88af65892cd5c183271258
Widget* GetWidget();
const Widget* GetWidget() const;
diff --git a/ui/views/win/hwnd_message_handler.cc b/ui/views/win/hwnd_message_handler.cc
index 5ac5b4820f1db21af499cb460a968e29225dfc5a..4182b8c1b0daa44fa2889c5bf5c6d56334ef31a0 100644
index 4715a7d9f2e845f9ffc8e84a6d7dc4a9d3483393..513a4a0942a4bd1372034f4f94129c8a1b4d6418 100644
--- a/ui/views/win/hwnd_message_handler.cc
+++ b/ui/views/win/hwnd_message_handler.cc
@@ -3371,15 +3371,19 @@ LRESULT HWNDMessageHandler::HandleMouseEventInternal(UINT message,
@@ -3362,15 +3362,19 @@ LRESULT HWNDMessageHandler::HandleMouseEventInternal(UINT message,
}
// We must let Windows handle the caption buttons if it's drawing them, or
// they won't work.
@@ -86,7 +86,7 @@ index 5ac5b4820f1db21af499cb460a968e29225dfc5a..4182b8c1b0daa44fa2889c5bf5c6d563
return 0;
}
}
@@ -3402,6 +3406,7 @@ LRESULT HWNDMessageHandler::HandleMouseEventInternal(UINT message,
@@ -3393,6 +3397,7 @@ LRESULT HWNDMessageHandler::HandleMouseEventInternal(UINT message,
// handle alt-space, or in the frame itself.
is_right_mouse_pressed_on_caption_ = false;
::ReleaseCapture();
@@ -94,7 +94,7 @@ index 5ac5b4820f1db21af499cb460a968e29225dfc5a..4182b8c1b0daa44fa2889c5bf5c6d563
// |point| is in window coordinates, but WM_NCHITTEST and TrackPopupMenu()
// expect screen coordinates.
POINT screen_point = CR_POINT_INITIALIZER_FROM_LPARAM(l_param);
@@ -3410,7 +3415,17 @@ LRESULT HWNDMessageHandler::HandleMouseEventInternal(UINT message,
@@ -3401,7 +3406,17 @@ LRESULT HWNDMessageHandler::HandleMouseEventInternal(UINT message,
hwnd(), WM_NCHITTEST, 0, MAKELPARAM(screen_point.x, screen_point.y)));
if (w_param == HTCAPTION || w_param == HTSYSMENU) {
if (delegate_->UsesNativeSystemMenu()) {
patches/chromium/chore_provide_iswebcontentscreationoverridden_with_full_params.patch
+6 -6
View File
@@ -80,10 +80,10 @@ index 39fa45f0a0f9076bd7ac0be6f455dd540a276512..3d0381d463eed73470b28085830f2a23
content::WebContents* source,
const content::OpenURLParams& params,
diff --git a/chrome/browser/ui/browser_web_contents_delegate/browser_web_contents_delegate.cc b/chrome/browser/ui/browser_web_contents_delegate/browser_web_contents_delegate.cc
index b5fad89a577e8a3d7322656a0f29b56d7adf621a..97753f5806571d8882183774b4793ab5eaf30131 100644
index b7db7938af9dba708ee46fbd883b7c967d0a1204..b63b0dae79cc5839ecfcfb4ac4b9f256434cf978 100644
--- a/chrome/browser/ui/browser_web_contents_delegate/browser_web_contents_delegate.cc
+++ b/chrome/browser/ui/browser_web_contents_delegate/browser_web_contents_delegate.cc
@@ -1000,8 +1000,7 @@ bool BrowserWebContentsDelegate::IsWebContentsCreationOverridden(
@@ -998,8 +998,7 @@ bool BrowserWebContentsDelegate::IsWebContentsCreationOverridden(
content::SiteInstance* source_site_instance,
content::mojom::WindowContainerType window_container_type,
const GURL& opener_url,
@@ -93,7 +93,7 @@ index b5fad89a577e8a3d7322656a0f29b56d7adf621a..97753f5806571d8882183774b4793ab5
if (actor::HasActorTaskPreventingNewWebContents(opener)) {
// If an ExecutionEngine is acting on the opener, prevent it from creating a
// new WebContents. We'll instead force the navigation to happen in the same
@@ -1024,7 +1023,7 @@ bool BrowserWebContentsDelegate::IsWebContentsCreationOverridden(
@@ -1022,7 +1021,7 @@ bool BrowserWebContentsDelegate::IsWebContentsCreationOverridden(
content::mojom::WindowContainerType::BACKGROUND &&
ShouldCreateBackgroundContents(browser_->GetProfile(),
source_site_instance, opener_url,
@@ -385,10 +385,10 @@ index f459dddeb3f8f3a33ffead0e96fba791d18a0108..f7a229b186774ca3a01f2d747eab139a
content::RenderFrameHost* opener,
content::SiteInstance* source_site_instance,
diff --git a/fuchsia_web/webengine/browser/frame_impl.cc b/fuchsia_web/webengine/browser/frame_impl.cc
index fa8b5b91e88d91a615006d6809883418eb289430..dbe0974d2f22a166d3ac44ea0267d6c50c22eded 100644
index a8d8983d2d0ae1c73cfd5251da441caff6d9b9db..d4f8c1d5720bdfa9aa27e6bafc7884ad8d342428 100644
--- a/fuchsia_web/webengine/browser/frame_impl.cc
+++ b/fuchsia_web/webengine/browser/frame_impl.cc
@@ -592,8 +592,7 @@ bool FrameImpl::IsWebContentsCreationOverridden(
@@ -598,8 +598,7 @@ bool FrameImpl::IsWebContentsCreationOverridden(
content::SiteInstance* source_site_instance,
content::mojom::WindowContainerType window_container_type,
const GURL& opener_url,
@@ -399,7 +399,7 @@ index fa8b5b91e88d91a615006d6809883418eb289430..dbe0974d2f22a166d3ac44ea0267d6c5
// can catch bad client behavior while not interfering with normal operation.
constexpr size_t kMaxPendingWebContentsCount = 10;
diff --git a/fuchsia_web/webengine/browser/frame_impl.h b/fuchsia_web/webengine/browser/frame_impl.h
index 57122c5c70655e1e9c75546c175925ac399cec9f..2ee2f5338d522f04cfaf0758a08ac8254ddc50de 100644
index 43b46dac8989818606009abfaab7523b6beddfc0..a058b5a8a15fae1aca52883ad27cddd334ace46e 100644
--- a/fuchsia_web/webengine/browser/frame_impl.h
+++ b/fuchsia_web/webengine/browser/frame_impl.h
@@ -308,8 +308,7 @@ class WEB_ENGINE_EXPORT FrameImpl : public fuchsia::web::Frame,
patches/chromium/disable_compositor_recycling.patch
+1 -1
View File
@@ -6,7 +6,7 @@ Subject: fix: disabling compositor recycling
Compositor recycling is useful for Chrome because there can be many tabs and spinning up a compositor for each one would be costly. In practice, Chrome uses the parent compositor code path of browser_compositor_view_mac.mm; the NSView of each tab is detached when it's hidden and attached when it's shown. For Electron, there is no parent compositor, so we're forced into the "own compositor" code path, which seems to be non-optimal and pretty ruthless in terms of the release of resources. Electron has no real concept of multiple tabs per window, so it should be okay to disable this ruthless recycling altogether in Electron.
diff --git a/content/browser/renderer_host/render_widget_host_view_mac.mm b/content/browser/renderer_host/render_widget_host_view_mac.mm
index a60a2d91998cb55771adaa44a108d6ad0502d6fa..01c827d950e5f7010dc2bd5ef0034d7651046943 100644
index 96e2f9442b2fbfe37d56d119cc696b63aedceb46..19d30c501e8b0b619e28ed86e200b0489d183f71 100644
--- a/content/browser/renderer_host/render_widget_host_view_mac.mm
+++ b/content/browser/renderer_host/render_widget_host_view_mac.mm
@@ -673,7 +673,11 @@ void SendVisibleTimeRequestToDelegatedFrameHost(
patches/chromium/disable_hidden.patch
+2 -2
View File
@@ -34,10 +34,10 @@ index 0016174ffc095bf077e1ad3455bea5e28973eb63..b5879712fb76e792124491fb511ef5aa
// |routing_id| must not be IPC::mojom::kRoutingIdNone.
// If this object outlives |delegate|, DetachDelegate() must be called when
diff --git a/content/browser/renderer_host/render_widget_host_view_aura.cc b/content/browser/renderer_host/render_widget_host_view_aura.cc
index 533ae9987e6ff28c27a569b3ef24403df73cea71..31df7a158a0b855dd18c8dee6c46d93f01ed7cba 100644
index 7e155968e43e2493115d9a3935b243a2fe4e6c1c..6f41be18825d5ccf38e43673dfef687d402224d1 100644
--- a/content/browser/renderer_host/render_widget_host_view_aura.cc
+++ b/content/browser/renderer_host/render_widget_host_view_aura.cc
@@ -744,7 +744,7 @@ void RenderWidgetHostViewAura::HideImpl() {
@@ -745,7 +745,7 @@ void RenderWidgetHostViewAura::HideImpl() {
CHECK(visibility_ == Visibility::HIDDEN ||
visibility_ == Visibility::OCCLUDED);
patches/chromium/enable_reset_aspect_ratio.patch
+4 -4
View File
@@ -6,10 +6,10 @@ Subject: feat: enable setting aspect ratio to 0
Make SetAspectRatio accept 0 as valid input, which would reset to null.
diff --git a/ui/views/widget/desktop_aura/desktop_window_tree_host_win.cc b/ui/views/widget/desktop_aura/desktop_window_tree_host_win.cc
index f89325d420865fd88ffbeb10e68ec34015e544aa..fc21877740110c8b6820bce394d871179e5069e5 100644
index 634640338e2951d852d9f5df5f7f0e48d97d00e8..46c29b5ab60704b816c6c580b72f7a3498bf18c4 100644
--- a/ui/views/widget/desktop_aura/desktop_window_tree_host_win.cc
+++ b/ui/views/widget/desktop_aura/desktop_window_tree_host_win.cc
@@ -725,7 +725,7 @@ void DesktopWindowTreeHostWin::SetOpacity(float opacity) {
@@ -726,7 +726,7 @@ void DesktopWindowTreeHostWin::SetOpacity(float opacity) {
void DesktopWindowTreeHostWin::SetAspectRatio(
const gfx::SizeF& aspect_ratio,
const gfx::Size& excluded_margin) {
@@ -19,10 +19,10 @@ index f89325d420865fd88ffbeb10e68ec34015e544aa..fc21877740110c8b6820bce394d87117
excluded_margin);
}
diff --git a/ui/views/win/hwnd_message_handler.cc b/ui/views/win/hwnd_message_handler.cc
index e0b41883902f23e27f0b110772175b5d585d7c7b..5ac5b4820f1db21af499cb460a968e29225dfc5a 100644
index 42fd0087319f0ce9a15b327b52403607e08d092a..4715a7d9f2e845f9ffc8e84a6d7dc4a9d3483393 100644
--- a/ui/views/win/hwnd_message_handler.cc
+++ b/ui/views/win/hwnd_message_handler.cc
@@ -1104,8 +1104,11 @@ void HWNDMessageHandler::SetFullscreen(bool fullscreen,
@@ -1119,8 +1119,11 @@ void HWNDMessageHandler::SetFullscreen(bool fullscreen,
void HWNDMessageHandler::SetAspectRatio(float aspect_ratio,
const gfx::Size& excluded_margin) {
patches/chromium/feat_carry_embedder_startup_data_in_createnewwindowreply.patch
+7 -7
View File
@@ -26,7 +26,7 @@ hook called before the new RenderFrame is created so it can be picked up
by RenderFrameCreated() on the same call stack.
diff --git a/content/browser/renderer_host/render_frame_host_impl.cc b/content/browser/renderer_host/render_frame_host_impl.cc
index f4f1197db70b379eada2e0464b06ff50dee56db3..f4836a76ba5280b73c77765734a9d88897678fab 100644
index bf65e1803e32af0b683da63eaab06044df5faacf..c2911e42d8d2ca7fc98ab1afdf2e6b4f170c4d0b 100644
--- a/content/browser/renderer_host/render_frame_host_impl.cc
+++ b/content/browser/renderer_host/render_frame_host_impl.cc
@@ -10823,7 +10823,12 @@ void RenderFrameHostImpl::CreateNewWindow(
@@ -71,10 +71,10 @@ index 4fba4300c9ac22f2937b080e518f723a4fc1a4a7..b475f17c360a04cfc3750c0e2cb5fa21
// A per-navigation interface passed along with the BeginNavigation call, used
diff --git a/content/public/browser/content_browser_client.cc b/content/public/browser/content_browser_client.cc
index 05e73c2f63cbc468eadc8c93a480cf646a092a73..29a5a21b06aed299fa3430f99a369c4a91a35e5f 100644
index 988d83fdf70abec970f96188d3cb755ab885193f..1af71f5258dd95c2f51d51f52a1b7939baf70966 100644
--- a/content/public/browser/content_browser_client.cc
+++ b/content/public/browser/content_browser_client.cc
@@ -812,6 +812,13 @@ bool ContentBrowserClient::CanCreateWindow(
@@ -818,6 +818,13 @@ bool ContentBrowserClient::CanCreateWindow(
return true;
}
@@ -89,7 +89,7 @@ index 05e73c2f63cbc468eadc8c93a480cf646a092a73..29a5a21b06aed299fa3430f99a369c4a
ContentBrowserClient::CreateSpeechRecognitionManagerDelegate() {
return nullptr;
diff --git a/content/public/browser/content_browser_client.h b/content/public/browser/content_browser_client.h
index 7262f91eda90ae90091216c988ce0b78be8af6e2..515c65a0f50e7c4a959f9f7da8eda0e46d2eca60 100644
index a4e03cb95c0dc0bafecd402251e9f52490538957..8345356f57cedad95d8b1aa4471068de4f67f990 100644
--- a/content/public/browser/content_browser_client.h
+++ b/content/public/browser/content_browser_client.h
@@ -61,6 +61,7 @@
@@ -100,7 +100,7 @@ index 7262f91eda90ae90091216c988ce0b78be8af6e2..515c65a0f50e7c4a959f9f7da8eda0e4
#include "mojo/public/cpp/bindings/pending_remote.h"
#include "mojo/public/cpp/bindings/remote.h"
#include "mojo/public/cpp/system/message_pipe.h"
@@ -1276,6 +1277,17 @@ class CONTENT_EXPORT ContentBrowserClient {
@@ -1281,6 +1282,17 @@ class CONTENT_EXPORT ContentBrowserClient {
bool opener_suppressed,
bool* no_javascript_access);
@@ -148,10 +148,10 @@ index 51d460f9982489575e94ad3726a44f77800a44ba..84fb8167a48f033fd941cfcb6feabbc3
// `outermost_origin` is only set if it is an extension scheme, otherwise
// it will be null. It is null to avoid leaking unnecessary information into
diff --git a/content/renderer/render_frame_impl.cc b/content/renderer/render_frame_impl.cc
index f1240be55e912db31074a61c0cfd99481ae9eb0a..2f99118c7e4cef558cc8d70fc11bceed5c2eeb34 100644
index 751f651fafe5de0ccbee442f76ee9dc42e087e30..e4536360abf01b7df54f25b64ec497d6a1511027 100644
--- a/content/renderer/render_frame_impl.cc
+++ b/content/renderer/render_frame_impl.cc
@@ -7203,6 +7203,14 @@ WebView* RenderFrameImpl::CreateNewWindow(
@@ -7206,6 +7206,14 @@ WebView* RenderFrameImpl::CreateNewWindow(
return nullptr;
}
patches/chromium/feat_corner_smoothing_css_rule_and_blink_painting.patch
+9 -9
View File
@@ -46,10 +46,10 @@ index 1c01e4d6699da8760e074a5825784e139ed58fd4..c678a3df0b9e5a8c9e0bd99c1aa540b2
'internal-forced-visited-'):
internal_visited_order = 0
diff --git a/third_party/blink/renderer/core/css/css_properties.json5 b/third_party/blink/renderer/core/css/css_properties.json5
index ab541cfc657edb7ee4daa618e31a3aa791ae24cc..5cca68cab99c690ec6780c3551d26524103a4410 100644
index 8b836b1f586e4c444976d68ea9918b7add15e6bb..a964c3e8c80fe652358b20502b537b4f2037ce33 100644
--- a/third_party/blink/renderer/core/css/css_properties.json5
+++ b/third_party/blink/renderer/core/css/css_properties.json5
@@ -10338,6 +10338,27 @@
@@ -10300,6 +10300,27 @@
property_methods: ["ParseShorthand", "CSSValueFromComputedStyleInternal"],
},
@@ -91,10 +91,10 @@ index d9983abcd27cb91c62c1a45689813bd01328b245..8bd8885d7d9c59d4059a3c33b6d3d6df
return a.EmptyCells() == b.EmptyCells();
case CSSPropertyID::kFill:
diff --git a/third_party/blink/renderer/core/css/properties/longhands/longhands_custom.cc b/third_party/blink/renderer/core/css/properties/longhands/longhands_custom.cc
index 2fda33049b2f0d29b0dfef9b970c0d521037607f..26f4189f433b77685a6d41be5ee9b890ef6b3654 100644
index 80ce0cb2575100175ebc9b4bfd31f6561fe1e6ae..45cc1e9524f00806f1fa44bbc6c57b271f486f33 100644
--- a/third_party/blink/renderer/core/css/properties/longhands/longhands_custom.cc
+++ b/third_party/blink/renderer/core/css/properties/longhands/longhands_custom.cc
@@ -12795,5 +12795,36 @@ const CSSValue* InternalEmptyLineHeight::ParseSingleValue(
@@ -12788,5 +12788,36 @@ const CSSValue* InternalEmptyLineHeight::ParseSingleValue(
CSSValueID::kNone>(stream);
}
@@ -132,10 +132,10 @@ index 2fda33049b2f0d29b0dfef9b970c0d521037607f..26f4189f433b77685a6d41be5ee9b890
} // namespace css_longhand
} // namespace blink
diff --git a/third_party/blink/renderer/core/css/resolver/style_builder_converter.cc b/third_party/blink/renderer/core/css/resolver/style_builder_converter.cc
index 0a224a929d4597fec0c6b7460ba19c448461ae7c..cd6dd1e9097380e494ec6ef86946ef5fd5921d0b 100644
index 6acdae63ef23c9b1faea35b0ac4ba118704b8d18..7794bdd2f3466a09038ef0b3703b438ea575531d 100644
--- a/third_party/blink/renderer/core/css/resolver/style_builder_converter.cc
+++ b/third_party/blink/renderer/core/css/resolver/style_builder_converter.cc
@@ -4245,6 +4245,15 @@ PositionTryFallback StyleBuilderConverter::ConvertSinglePositionTryFallback(
@@ -4241,6 +4241,15 @@ PositionTryFallback StyleBuilderConverter::ConvertSinglePositionTryFallback(
return PositionTryFallback(scoped_name, tactic_list);
}
@@ -203,10 +203,10 @@ index 19cda703154dab9397827ab6ea66c2ca446c644d..dd5943c511886f4e39b2e7f10e67e60f
return result;
}
diff --git a/third_party/blink/renderer/platform/BUILD.gn b/third_party/blink/renderer/platform/BUILD.gn
index 03b97d9f743b1ccab026b696318c75a47ce63ad4..0a64ebb921fb8dbe30f451e4a3cc0768f1e9149e 100644
index 233618cf12e7b1516151780748d8fed164f3c0fd..e3d8d02d18d3b73423a8c51ed7667ac3c934016f 100644
--- a/third_party/blink/renderer/platform/BUILD.gn
+++ b/third_party/blink/renderer/platform/BUILD.gn
@@ -1692,6 +1692,8 @@ component("platform") {
@@ -1690,6 +1690,8 @@ component("platform") {
"widget/widget_base.h",
"widget/widget_base_client.h",
"windows_keyboard_codes.h",
@@ -314,7 +314,7 @@ index 398fc8badaaf1dddc3183211c9302460393da85f..b35c8261b27a2d5c5f6bd84b606925c9
auto DrawAsSinglePath = [&]() {
diff --git a/third_party/blink/renderer/platform/runtime_enabled_features.json5 b/third_party/blink/renderer/platform/runtime_enabled_features.json5
index 1e1caf1bc24040e4080343af7bd8f1060c10e62a..a30c5577c2cf4402100bb0f06b04596a64fbd2d4 100644
index ce4a2bcb322755dc8fb59d60b09df393af6ff9c0..f2ba4a559b9838cc744e5d67bc0bec52e0fbb553 100644
--- a/third_party/blink/renderer/platform/runtime_enabled_features.json5
+++ b/third_party/blink/renderer/platform/runtime_enabled_features.json5
@@ -215,6 +215,10 @@
patches/chromium/feat_deliver_service_worker_preload_data_via_embeddedworkerstartparams.patch
+4 -4
View File
@@ -33,10 +33,10 @@ index ef0bdca126875e5763b5bb01f4e733d322d0ab6c..2bbc9dae9e88cc533fb23c2fa375422b
if (policy_container_host_) {
params->policy_container =
diff --git a/content/public/browser/content_browser_client.cc b/content/public/browser/content_browser_client.cc
index 29a5a21b06aed299fa3430f99a369c4a91a35e5f..dc99234cfcf36ce68158a00b7bd82f51049e5f00 100644
index 1af71f5258dd95c2f51d51f52a1b7939baf70966..848e82817074353f81968be66dd4c3e4d6689cac 100644
--- a/content/public/browser/content_browser_client.cc
+++ b/content/public/browser/content_browser_client.cc
@@ -819,6 +819,13 @@ ContentBrowserClient::GetExtraCreateNewWindowReplyData(
@@ -825,6 +825,13 @@ ContentBrowserClient::GetExtraCreateNewWindowReplyData(
return std::nullopt;
}
@@ -51,10 +51,10 @@ index 29a5a21b06aed299fa3430f99a369c4a91a35e5f..dc99234cfcf36ce68158a00b7bd82f51
ContentBrowserClient::CreateSpeechRecognitionManagerDelegate() {
return nullptr;
diff --git a/content/public/browser/content_browser_client.h b/content/public/browser/content_browser_client.h
index 515c65a0f50e7c4a959f9f7da8eda0e46d2eca60..8302794d9a86387447bb3d4dd34cc41c5b052c57 100644
index 8345356f57cedad95d8b1aa4471068de4f67f990..a70317f0a40ccc8e07b82e43330a70d574b226c0 100644
--- a/content/public/browser/content_browser_client.h
+++ b/content/public/browser/content_browser_client.h
@@ -1288,6 +1288,17 @@ class CONTENT_EXPORT ContentBrowserClient {
@@ -1293,6 +1293,17 @@ class CONTENT_EXPORT ContentBrowserClient {
RenderFrameHost* new_window_main_frame,
const GURL& target_url);
patches/chromium/feat_expose_documentloader_setdefersloading_on_webdocumentloader.patch
+2 -2
View File
@@ -29,10 +29,10 @@ index b6da61a76551f1de95b8cfb0a1167b14040f3dd1..9413492f8e0fd6c5371c66329e1ad6d4
// Returns the http referrer of original request which initited this load.
diff --git a/third_party/blink/renderer/core/loader/document_loader.h b/third_party/blink/renderer/core/loader/document_loader.h
index d36cf49fbb7a83d53c0746803d52b54641df4275..f3251d9a1c26f7c31260ca942cf2468b08da145b 100644
index 145c25ad2e8177721fb53f8be524d822c58f195a..06650e6b037ca4731df125ffee156e316cdce64a 100644
--- a/third_party/blink/renderer/core/loader/document_loader.h
+++ b/third_party/blink/renderer/core/loader/document_loader.h
@@ -329,7 +329,7 @@ class CORE_EXPORT DocumentLoader : public GarbageCollected<DocumentLoader>,
@@ -330,7 +330,7 @@ class CORE_EXPORT DocumentLoader : public GarbageCollected<DocumentLoader>,
std::optional<scheduler::TaskAttributionId> task_state_id,
bool should_skip_screenshot);
patches/chromium/feat_separate_content_settings_callback_for_sync_and_async_clipboard.patch
+1 -1
View File
@@ -20,7 +20,7 @@ This patch will be removed when the deprecated sync api support is
removed.
diff --git a/components/permissions/permission_util.cc b/components/permissions/permission_util.cc
index 5f510af63db41687d95cdc95cce402b20c62b559..d10473bbb02ce2b1186d07c42f84db6983f441da 100644
index d20920174d7e7fafa4f58283db2a660beef7ef7a..fcff902ca98c598659e4418f96b633eea2296fc8 100644
--- a/components/permissions/permission_util.cc
+++ b/components/permissions/permission_util.cc
@@ -584,7 +584,8 @@ ContentSettingsType PermissionUtil::PermissionTypeToContentSettingsTypeSafe(
patches/chromium/fix_adjust_headless_mode_handling_in_native_widget.patch
+8 -8
View File
@@ -139,10 +139,10 @@ index ec371b4676ba3f91a3c8198db00facb9c926b869..719cae31fb885d12ffdd4c3a6ecf91dd
// Register the CGWindowID (used to identify this window for video capture)
diff --git a/ui/views/widget/widget.cc b/ui/views/widget/widget.cc
index d7af081768ba817874f56b85588041f4a4c819b8..03f64e855f7037d15e9f8cdc1313efffe1798d5b 100644
index c8c6adbd56070f01d09a7e12f5481ee2703718c6..17955f684f8aeb17d2a2a2a75763e3e33a78dfbb 100644
--- a/ui/views/widget/widget.cc
+++ b/ui/views/widget/widget.cc
@@ -267,6 +267,18 @@ ui::ZOrderLevel Widget::InitParams::EffectiveZOrderLevel() const {
@@ -268,6 +268,18 @@ ui::ZOrderLevel Widget::InitParams::EffectiveZOrderLevel() const {
}
}
@@ -161,7 +161,7 @@ index d7af081768ba817874f56b85588041f4a4c819b8..03f64e855f7037d15e9f8cdc1313efff
void Widget::InitParams::SetParent(Widget* parent_widget) {
SetParent(parent_widget->GetNativeView());
}
@@ -534,6 +546,7 @@ void Widget::Init(InitParams params) {
@@ -535,6 +547,7 @@ void Widget::Init(InitParams params) {
params.child |= (params.type == InitParams::TYPE_CONTROL);
is_top_level_ = !params.child;
@@ -170,10 +170,10 @@ index d7af081768ba817874f56b85588041f4a4c819b8..03f64e855f7037d15e9f8cdc1313efff
if (params.opacity == views::Widget::InitParams::WindowOpacity::kInferred &&
diff --git a/ui/views/widget/widget.h b/ui/views/widget/widget.h
index bf6786367bd80671af378015ea81023dc3195be4..51788586aa952afcdb9475fecaf72f7e479955f8 100644
index 4b71f0122b45668b0e3c0be11c1b0ef909273e4d..12da4e56e937d511f1b3b2546375125c497341e8 100644
--- a/ui/views/widget/widget.h
+++ b/ui/views/widget/widget.h
@@ -329,6 +329,11 @@ class VIEWS_EXPORT Widget : public internal::NativeWidgetDelegate,
@@ -331,6 +331,11 @@ class VIEWS_EXPORT Widget : public internal::NativeWidgetDelegate,
// case where |activatable| is |kDefault|.
bool CanActivate() const;
@@ -185,7 +185,7 @@ index bf6786367bd80671af378015ea81023dc3195be4..51788586aa952afcdb9475fecaf72f7e
// Returns the z-order level, based on the overriding |z_order| but also
// taking into account special levels due to |type|.
ui::ZOrderLevel EffectiveZOrderLevel() const;
@@ -509,6 +514,9 @@ class VIEWS_EXPORT Widget : public internal::NativeWidgetDelegate,
@@ -511,6 +516,9 @@ class VIEWS_EXPORT Widget : public internal::NativeWidgetDelegate,
// If true then the widget uses software compositing.
bool force_software_compositing = false;
@@ -195,7 +195,7 @@ index bf6786367bd80671af378015ea81023dc3195be4..51788586aa952afcdb9475fecaf72f7e
// If set, the window size will follow the content preferred size.
bool autosize = false;
@@ -1316,6 +1324,11 @@ class VIEWS_EXPORT Widget : public internal::NativeWidgetDelegate,
@@ -1318,6 +1326,11 @@ class VIEWS_EXPORT Widget : public internal::NativeWidgetDelegate,
// with it. TYPE_CONTROL and TYPE_TOOLTIP is not considered top level.
bool is_top_level() const { return is_top_level_; }
@@ -207,7 +207,7 @@ index bf6786367bd80671af378015ea81023dc3195be4..51788586aa952afcdb9475fecaf72f7e
// True if the window size will follow the content preferred size.
bool is_autosized() const { return is_autosized_; }
@@ -1802,6 +1815,9 @@ class VIEWS_EXPORT Widget : public internal::NativeWidgetDelegate,
@@ -1806,6 +1819,9 @@ class VIEWS_EXPORT Widget : public internal::NativeWidgetDelegate,
// If true, the mouse is currently down.
bool is_mouse_button_pressed_ = false;
patches/chromium/fix_constrain_allowuniversalaccessfromfileurls_to_file_origins_in.patch
+3 -3
View File
@@ -101,10 +101,10 @@ index b5464975a3c365a29e342b0dd57a8a73a311924a..72ebd275330e61a8abebfe6d2c06f425
// universal access privilege.
WeakMember<WindowAgent> universal_access_agent_;
diff --git a/third_party/blink/renderer/core/loader/document_loader.cc b/third_party/blink/renderer/core/loader/document_loader.cc
index 9f60b03e904238089d2dfc2dcc97732b255e0f87..1c3f3502308f0ace982d43b2aa3efea6453e0a9c 100644
index 21796a5f3fbc5920b71ee9b8703668a5ca23440e..b05a71f3e1200c9c3a3b1fe37307b48d815e3937 100644
--- a/third_party/blink/renderer/core/loader/document_loader.cc
+++ b/third_party/blink/renderer/core/loader/document_loader.cc
@@ -2689,22 +2689,16 @@ bool ShouldReuseDOMWindow(LocalDOMWindow* window,
@@ -2706,22 +2706,16 @@ bool ShouldReuseDOMWindow(LocalDOMWindow* window,
return *window_coi_key == *navigation_coi_key;
}
@@ -131,7 +131,7 @@ index 9f60b03e904238089d2dfc2dcc97732b255e0f87..1c3f3502308f0ace982d43b2aa3efea6
}
// Inheriting cases use their agent's AgentClusterKey value, which is set
@@ -2805,7 +2799,7 @@ void DocumentLoader::InitializeWindow(Document* owner_document) {
@@ -2822,7 +2816,7 @@ void DocumentLoader::InitializeWindow(Document* owner_document) {
// WindowAgentFactory::GetAgentForOrigin(), as the two conditions below hand
// out universal WindowAgent objects, and thus override the AgentClusterKey
// provided by the browser process.
patches/chromium/fix_crash_loading_non-standard_schemes_in_iframes.patch
+5 -5
View File
@@ -28,10 +28,10 @@ The patch should be removed in favor of either:
Upstream bug https://bugs.chromium.org/p/chromium/issues/detail?id=1081397.
diff --git a/content/browser/renderer_host/navigation_request.cc b/content/browser/renderer_host/navigation_request.cc
index cc0fa72127f88d309baeeca66d98e31828b74117..3eb6f30cc93eb0050af3d04f4ed80fd74e376059 100644
index d0cce51f7903262676279442a69addcea60dc0f5..8600e89ffd8aa012117192bec10a1406657392b9 100644
--- a/content/browser/renderer_host/navigation_request.cc
+++ b/content/browser/renderer_host/navigation_request.cc
@@ -12556,6 +12556,11 @@ url::Origin NavigationRequest::GetOriginForURLLoaderFactoryUnchecked() {
@@ -12558,6 +12558,11 @@ url::Origin NavigationRequest::GetOriginForURLLoaderFactoryUnchecked() {
target_rph_id);
}
@@ -44,10 +44,10 @@ index cc0fa72127f88d309baeeca66d98e31828b74117..3eb6f30cc93eb0050af3d04f4ed80fd7
// origin of |common_params.url| and/or |common_params.initiator_origin|.
url::Origin resolved_origin = url::Origin::Resolve(
diff --git a/third_party/blink/renderer/core/loader/document_loader.cc b/third_party/blink/renderer/core/loader/document_loader.cc
index 305b5987dbdb61881b9632bf988f285229377768..9f60b03e904238089d2dfc2dcc97732b255e0f87 100644
index 830302747f60ad1f503950c9da925ea2ad199644..21796a5f3fbc5920b71ee9b8703668a5ca23440e 100644
--- a/third_party/blink/renderer/core/loader/document_loader.cc
+++ b/third_party/blink/renderer/core/loader/document_loader.cc
@@ -2443,6 +2443,7 @@ Frame* DocumentLoader::CalculateOwnerFrame() {
@@ -2460,6 +2460,7 @@ Frame* DocumentLoader::CalculateOwnerFrame() {
scoped_refptr<SecurityOrigin> DocumentLoader::CalculateOrigin(
Document* owner_document) {
scoped_refptr<SecurityOrigin> origin;
@@ -55,7 +55,7 @@ index 305b5987dbdb61881b9632bf988f285229377768..9f60b03e904238089d2dfc2dcc97732b
// Whether the origin is newly created within this call, instead of copied
// from an existing document's origin or from `origin_to_commit_`. If this is
// true, we won't try to compare the nonce of this origin (if it's opaque) to
@@ -2479,6 +2480,9 @@ scoped_refptr<SecurityOrigin> DocumentLoader::CalculateOrigin(
@@ -2496,6 +2497,9 @@ scoped_refptr<SecurityOrigin> DocumentLoader::CalculateOrigin(
// non-renderer only origin bits will be the same, which will be asserted at
// the end of this function.
origin = origin_to_commit_;
patches/chromium/fix_export_zlib_symbols.patch
+2 -2
View File
@@ -6,10 +6,10 @@ Subject: fix: export zlib symbols
This patch sets ZLIB_DLL so that we properly export zlib symbols.
diff --git a/third_party/zlib/BUILD.gn b/third_party/zlib/BUILD.gn
index 61b3eb38c8a576bc076722380b9ab539dfe84a5c..d5f2914d526f6ebc083ee50bed589ac42754f1c7 100644
index c37b4252961e125d5a0c9ad431c7a17110b58c29..6b5e4df51dac256ce07a588c3773772bb9876877 100644
--- a/third_party/zlib/BUILD.gn
+++ b/third_party/zlib/BUILD.gn
@@ -317,6 +317,10 @@ component("zlib") {
@@ -327,6 +327,10 @@ component("zlib") {
defines = []
deps = []
patches/chromium/fix_move_autopipsettingshelper_behind_branding_buildflag.patch
+244 -2
View File
@@ -162,10 +162,21 @@ index f4ebbefe2590a610e3c505dfc78ce0c409731d40..fbaf1fd9431c1acb41320fa620bd6e92
// The display of the opener window, cached during
diff --git a/chrome/browser/ui/views/overlay/video_overlay_window_views.cc b/chrome/browser/ui/views/overlay/video_overlay_window_views.cc
index 85f05058b574862032b8b1438b0c7ce0d7a7c676..04469b862487826b9baf687e0b28824d7cfb0662 100644
index 5d375de1cdf8fa5a6a003a72c32e5b6c54f2a861..3dfe703403de9a35efa3eeeb5ef53559457fa523 100644
--- a/chrome/browser/ui/views/overlay/video_overlay_window_views.cc
+++ b/chrome/browser/ui/views/overlay/video_overlay_window_views.cc
@@ -415,11 +415,13 @@ std::unique_ptr<VideoOverlayWindowViews> VideoOverlayWindowViews::Create(
@@ -114,8 +114,10 @@ constexpr gfx::Size kMinWindowSize(284, 160);
constexpr int kOverlayBorderThickness = 10;
+#if BUILDFLAG(GOOGLE_CHROME_BRANDING)
// Minimum padding between the overlay view, if shown, and the window.
constexpr gfx::Size kOverlayViewPadding(64, 46);
+#endif
// Size for action buttons.
constexpr gfx::Size kActionButtonSize(28, 28);
@@ -415,11 +417,13 @@ std::unique_ptr<VideoOverlayWindowViews> VideoOverlayWindowViews::Create(
#endif // BUILDFLAG(IS_WIN)
@@ -179,3 +190,234 @@ index 85f05058b574862032b8b1438b0c7ce0d7a7c676..04469b862487826b9baf687e0b28824d
return overlay_window;
}
@@ -453,9 +457,11 @@ VideoOverlayWindowViews::VideoOverlayWindowViews(
}
VideoOverlayWindowViews::~VideoOverlayWindowViews() {
+#if BUILDFLAG(GOOGLE_CHROME_BRANDING)
if (overlay_view_) {
overlay_view_->RemoveObserver(this);
}
+#endif
display::Screen::Get()->RemoveObserver(this);
PictureInPictureWindowManager::GetInstance()->OnPictureInPictureWindowHidden(
this);
@@ -553,6 +559,7 @@ void VideoOverlayWindowViews::OnNativeBlur() {
}
gfx::Size VideoOverlayWindowViews::GetMinimumSize() const {
+#if BUILDFLAG(GOOGLE_CHROME_BRANDING)
if (IsOverlayViewShown()) {
// Make sure that our minimum is sufficiently large to enclose the bubble,
// plus some margin to make it look nicer.
@@ -561,6 +568,7 @@ gfx::Size VideoOverlayWindowViews::GetMinimumSize() const {
overlay_size.SetToMax(min_size_);
return overlay_size;
}
+#endif
return min_size_;
}
@@ -919,6 +927,7 @@ void VideoOverlayWindowViews::OnDisplayMetricsChanged(
}
}
+#if BUILDFLAG(GOOGLE_CHROME_BRANDING)
void VideoOverlayWindowViews::OnViewVisibilityChanged(
views::View* observed_view,
views::View* starting_view,
@@ -932,6 +941,7 @@ void VideoOverlayWindowViews::OnViewVisibilityChanged(
// The visibility of `overlay_view_` affects our minimum size.
OnSizeConstraintsChanged();
}
+#endif
void VideoOverlayWindowViews::SetForcedTucking(bool tuck) {
if (!tucker_) {
@@ -951,10 +961,12 @@ void VideoOverlayWindowViews::OnAnyBrowserEnteredFullscreen() {
}
#endif // BUILDFLAG(IS_MAC)
+#if BUILDFLAG(GOOGLE_CHROME_BRANDING)
void VideoOverlayWindowViews::OnAutoPipSettingOverlayViewHidden() {
// If there is an existing overlay view, remove it now.
RemoveOverlayViewIfExists();
}
+#endif
gfx::Rect VideoOverlayWindowViews::GetWorkAreaForWindow() const {
return display::Screen::Get()
@@ -1008,6 +1020,7 @@ void VideoOverlayWindowViews::UpdateMaxSize(const gfx::Rect& work_area) {
bool VideoOverlayWindowViews::ControlsHitTestContainsPoint(
const gfx::Point& point) {
+#if BUILDFLAG(GOOGLE_CHROME_BRANDING)
if (overlay_view_) {
// Let the overlay view consume this event if it wants to. If not, then
// ignore any of our controls as well. This will still permit dragging the
@@ -1016,6 +1029,7 @@ bool VideoOverlayWindowViews::ControlsHitTestContainsPoint(
views::View::ConvertPointToScreen(non_client_view(), point);
return overlay_view_->WantsEvent(point_in_screen);
}
+#endif
if (!AreControlsVisible()) {
return false;
@@ -1479,9 +1493,11 @@ void VideoOverlayWindowViews::UpdateLayerBoundsWithLetterboxing(
video_view_->SetBoundsRect(video_bounds);
video_view_->layer()->AsSurface()->SetSurfaceSize(video_bounds.size());
+#if BUILDFLAG(GOOGLE_CHROME_BRANDING)
if (IsOverlayViewShown()) {
overlay_view_->SetBoundsRect(gfx::Rect(GetBounds().size()));
}
+#endif
// Notify the controller that the bounds have changed.
controller_->UpdateLayerBounds();
@@ -1754,6 +1770,7 @@ void VideoOverlayWindowViews::ShowInactive() {
non_client_view()->frame_view()->UpdateWindowRoundedCorners();
#endif
+#if BUILDFLAG(GOOGLE_CHROME_BRANDING)
// If there is an existing overlay view, remove it now.
RemoveOverlayViewIfExists();
@@ -1775,6 +1792,7 @@ void VideoOverlayWindowViews::ShowInactive() {
overlay_view_->ShowBubble(GetNativeView());
SetBounds(CalculateAndUpdateWindowBounds());
}
+#endif
// When the window is first shown, make the title and top controls
// visible for a few seconds.
@@ -2366,10 +2384,15 @@ void VideoOverlayWindowViews::MaybeUnregisterFrameSinkHierarchy() {
}
bool VideoOverlayWindowViews::IsOverlayViewShown() const {
+#if BUILDFLAG(GOOGLE_CHROME_BRANDING)
return overlay_view_ && overlay_view_->GetVisible();
+#else
+ return false;
+#endif
}
void VideoOverlayWindowViews::RemoveOverlayViewIfExists() {
+#if BUILDFLAG(GOOGLE_CHROME_BRANDING)
if (overlay_view_) {
// Remove and delete the outgoing view. Note the trailing `T` on the method
// name -- this removes `overlay_view_` and returns a unique_ptr to it which
@@ -2378,6 +2401,7 @@ void VideoOverlayWindowViews::RemoveOverlayViewIfExists() {
GetContentsView()->RemoveChildViewT(overlay_view_.ExtractAsDangling());
OnSizeConstraintsChanged();
}
+#endif
}
void VideoOverlayWindowViews::OnProgressDragStateChanged(
diff --git a/chrome/browser/ui/views/overlay/video_overlay_window_views.h b/chrome/browser/ui/views/overlay/video_overlay_window_views.h
index 222a5167b5e719403268e672372acd809a043263..9d5a0af231d95830013d87d6fdc104a304d3d730 100644
--- a/chrome/browser/ui/views/overlay/video_overlay_window_views.h
+++ b/chrome/browser/ui/views/overlay/video_overlay_window_views.h
@@ -10,7 +10,10 @@
#include "base/memory/raw_ptr.h"
#include "base/memory/weak_ptr.h"
#include "base/timer/timer.h"
+#include "build/branding_buildflags.h"
+#if BUILDFLAG(GOOGLE_CHROME_BRANDING)
#include "chrome/browser/picture_in_picture/auto_pip_setting_overlay_view.h"
+#endif
#include "chrome/browser/picture_in_picture/picture_in_picture_widget_fade_animator.h"
#include "chrome/browser/picture_in_picture/picture_in_picture_window.h"
#include "components/global_media_controls/public/views/media_progress_view.h"
@@ -20,7 +23,9 @@
#include "ui/display/display.h"
#include "ui/display/display_observer.h"
#include "ui/gfx/geometry/size.h"
+#if BUILDFLAG(GOOGLE_CHROME_BRANDING)
#include "ui/views/view_observer.h"
+#endif
#include "ui/views/widget/widget.h"
#if BUILDFLAG(IS_CHROMEOS)
@@ -58,12 +63,16 @@ class ToggleMuteButton;
class VideoOverlayWindowViews : public content::VideoOverlayWindow,
public views::Widget,
public display::DisplayObserver,
+#if BUILDFLAG(GOOGLE_CHROME_BRANDING)
public views::ViewObserver,
- public PictureInPictureWindow,
- public AutoPipSettingOverlayView::Delegate {
+ public AutoPipSettingOverlayView::Delegate,
+#endif
+ public PictureInPictureWindow {
public:
+#if BUILDFLAG(GOOGLE_CHROME_BRANDING)
using GetOverlayViewCb =
base::RepeatingCallback<std::unique_ptr<AutoPipSettingOverlayView>()>;
+#endif
static std::unique_ptr<VideoOverlayWindowViews> Create(
content::VideoPictureInPictureWindowController* controller);
@@ -132,10 +141,12 @@ class VideoOverlayWindowViews : public content::VideoOverlayWindow,
void OnDisplayMetricsChanged(const display::Display& display,
uint32_t changed_metrics) override;
+#if BUILDFLAG(GOOGLE_CHROME_BRANDING)
// views::ViewObserver:
void OnViewVisibilityChanged(views::View* observed_view,
views::View* starting_view,
bool visible) override;
+#endif
// PictureInPictureWindow:
void SetForcedTucking(bool tuck) override;
@@ -143,8 +154,10 @@ class VideoOverlayWindowViews : public content::VideoOverlayWindow,
void OnAnyBrowserEnteredFullscreen() override;
#endif // BUILDFLAG(IS_MAC)
+#if BUILDFLAG(GOOGLE_CHROME_BRANDING)
// AutoPipSettingOverlayView::Delegate:
void OnAutoPipSettingOverlayViewHidden() override;
+#endif
bool ControlsHitTestContainsPoint(const gfx::Point& point);
#if BUILDFLAG(IS_CHROMEOS)
@@ -249,6 +262,7 @@ class VideoOverlayWindowViews : public content::VideoOverlayWindow,
void FireEnableControlsAfterMoveTimerForTesting();
+#if BUILDFLAG(GOOGLE_CHROME_BRANDING)
void set_overlay_view_cb_for_testing(GetOverlayViewCb get_overlay_view_cb) {
get_overlay_view_cb_ = std::move(get_overlay_view_cb);
}
@@ -256,6 +270,7 @@ class VideoOverlayWindowViews : public content::VideoOverlayWindow,
AutoPipSettingOverlayView* get_overlay_view_for_testing() {
return overlay_view_;
}
+#endif
PictureInPictureWidgetFadeAnimator* get_fade_animator_for_testing() {
return fade_animator_.get();
@@ -500,7 +515,9 @@ class VideoOverlayWindowViews : public content::VideoOverlayWindow,
raw_ptr<views::Label> live_status_ = nullptr;
raw_ptr<OverlayWindowLiveCaptionButton> live_caption_button_ = nullptr;
raw_ptr<OverlayWindowLiveCaptionDialog> live_caption_dialog_ = nullptr;
+#if BUILDFLAG(GOOGLE_CHROME_BRANDING)
raw_ptr<AutoPipSettingOverlayView> overlay_view_ = nullptr;
+#endif
raw_ptr<views::View> title_view_ = nullptr;
#if BUILDFLAG(IS_CHROMEOS)
@@ -566,9 +583,11 @@ class VideoOverlayWindowViews : public content::VideoOverlayWindow,
std::unique_ptr<OverlayControlsFadeAnimation>
title_and_top_scrim_fade_animation_;
+#if BUILDFLAG(GOOGLE_CHROME_BRANDING)
// Callback to get / create an overlay view. This is a callback to let tests
// provide alternate implementations.
GetOverlayViewCb get_overlay_view_cb_;
+#endif
// Used to animate the Picture-in-Picture window creation.
std::unique_ptr<PictureInPictureWidgetFadeAnimator> fade_animator_;
patches/chromium/fix_on-screen-keyboard_hides_on_input_blur_in_webview.patch
+2 -2
View File
@@ -9,10 +9,10 @@ focus node change via TextInputManager.
chromium-bug: https://crbug.com/1369605
diff --git a/content/browser/renderer_host/render_widget_host_view_aura.cc b/content/browser/renderer_host/render_widget_host_view_aura.cc
index 2b5b16f5040de4fc6b3f78fadf2e841201ab32cd..30d0de3d299e01492c61137a8960674074ff3016 100644
index 4a98ad648ab5399974ac15978064bc01f962ae9d..ea9acde2e35d488d16cf562ebd62c1500ae65168 100644
--- a/content/browser/renderer_host/render_widget_host_view_aura.cc
+++ b/content/browser/renderer_host/render_widget_host_view_aura.cc
@@ -3624,6 +3624,12 @@ void RenderWidgetHostViewAura::OnTextSelectionChanged(
@@ -3625,6 +3625,12 @@ void RenderWidgetHostViewAura::OnTextSelectionChanged(
}
}
patches/chromium/fix_remove_caption-removing_style_call.patch
+2 -2
View File
@@ -18,10 +18,10 @@ or resizing, but Electron does not seem to run into that issue
for opaque frameless windows even with that block commented out.
diff --git a/ui/views/win/hwnd_message_handler.cc b/ui/views/win/hwnd_message_handler.cc
index 4182b8c1b0daa44fa2889c5bf5c6d56334ef31a0..52671bba87e06c375284c53c35e9a6567218d450 100644
index 513a4a0942a4bd1372034f4f94129c8a1b4d6418..34cd39125326520426e7d42b1ed51a858b982dc2 100644
--- a/ui/views/win/hwnd_message_handler.cc
+++ b/ui/views/win/hwnd_message_handler.cc
@@ -1954,7 +1954,23 @@ LRESULT HWNDMessageHandler::OnCreate(CREATESTRUCT* create_struct) {
@@ -1969,7 +1969,23 @@ LRESULT HWNDMessageHandler::OnCreate(CREATESTRUCT* create_struct) {
::SendMessage(hwnd(), WM_CHANGEUISTATE, MAKELPARAM(UIS_CLEAR, UISF_HIDEFOCUS),
0);
patches/chromium/fix_resolve_dynamic_background_material_update_issue_on_windows_11.patch
+7 -7
View File
@@ -8,10 +8,10 @@ such as the background turning black when maximizing the window and
dynamic background material settings not taking effect.
diff --git a/ui/views/widget/desktop_aura/desktop_window_tree_host_win.cc b/ui/views/widget/desktop_aura/desktop_window_tree_host_win.cc
index 0b6a9edb5f72df0b7f833e7f6dc2b2589b1ea8fd..d122ddacbda12c4d70d5fd284cef322b700acc99 100644
index 50f5557384eb36618f983229617098e938c37bc7..d967500524dcaf1c962a39c11b917f46d89bbb66 100644
--- a/ui/views/widget/desktop_aura/desktop_window_tree_host_win.cc
+++ b/ui/views/widget/desktop_aura/desktop_window_tree_host_win.cc
@@ -243,6 +243,10 @@ bool DesktopWindowTreeHostWin::IsInNativeMoveResizeLoop() const {
@@ -244,6 +244,10 @@ bool DesktopWindowTreeHostWin::IsInNativeMoveResizeLoop() const {
message_handler_->IsInNativeMenuLoop());
}
@@ -36,10 +36,10 @@ index 12edd2db9b88af65892cd5c183271258eaccf63d..b9ee5824e422b75ad37536c8848ef825
// Overridden from DesktopWindowTreeHost:
void Init(const Widget::InitParams& params) override;
diff --git a/ui/views/win/hwnd_message_handler.cc b/ui/views/win/hwnd_message_handler.cc
index 52671bba87e06c375284c53c35e9a6567218d450..c4f339973d5122a64d2447f3c511074631d68fe0 100644
index 34cd39125326520426e7d42b1ed51a858b982dc2..1b89cd94b56bb0f8fd4eadd14227a762bf3eaffb 100644
--- a/ui/views/win/hwnd_message_handler.cc
+++ b/ui/views/win/hwnd_message_handler.cc
@@ -1049,13 +1049,13 @@ void HWNDMessageHandler::FrameTypeChanged() {
@@ -1064,13 +1064,13 @@ void HWNDMessageHandler::FrameTypeChanged() {
void HWNDMessageHandler::PaintAsActiveChanged() {
if (!delegate_->HasNonClientView() || !delegate_->CanActivate() ||
@@ -55,7 +55,7 @@ index 52671bba87e06c375284c53c35e9a6567218d450..c4f339973d5122a64d2447f3c5110746
}
void HWNDMessageHandler::SetWindowIcons(const gfx::ImageSkia& window_icon,
@@ -1135,7 +1135,14 @@ void HWNDMessageHandler::SizeConstraintsChanged() {
@@ -1150,7 +1150,14 @@ void HWNDMessageHandler::SizeConstraintsChanged() {
// allowing ui::GetResizableFrameThickness() to be used consistently when
// removing the visible system frame.
const bool had_caption_on_init = window_style() & WS_CAPTION;
@@ -71,7 +71,7 @@ index 52671bba87e06c375284c53c35e9a6567218d450..c4f339973d5122a64d2447f3c5110746
const bool can_maximize = can_resize && delegate_->CanMaximize();
auto set_style_func = [&style](LONG bit, bool should_set) {
@@ -1779,11 +1786,16 @@ void HWNDMessageHandler::ResetWindowRegion(bool force, bool redraw) {
@@ -1794,11 +1801,16 @@ void HWNDMessageHandler::ResetWindowRegion(bool force, bool redraw) {
// through, but that isn't the case when using Direct3D to draw transparent
// windows. So we route translucent windows throught to the delegate to
// allow for a custom hit mask.
@@ -89,7 +89,7 @@ index 52671bba87e06c375284c53c35e9a6567218d450..c4f339973d5122a64d2447f3c5110746
return;
}
@@ -2536,17 +2548,18 @@ LRESULT HWNDMessageHandler::OnNCActivate(UINT message,
@@ -2527,17 +2539,18 @@ LRESULT HWNDMessageHandler::OnNCActivate(UINT message,
delegate_->SchedulePaint();
}
patches/chromium/fix_return_v8_value_from_localframe_requestexecutescript.patch
+5 -5
View File
@@ -59,10 +59,10 @@ index cba373664bec3a32abad6fe0396bd67b53b7e67f..a54f1b3351efd2d8f324436f7f35cd43
#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 16f0ded5f914ef3b91481f5674a59771f3153f64..1cc66d178c17d0e0413fbfd07570d8097059044e 100644
index 874bc78f43dc71143771978a9a572bff8f109f28..57e9b78d9e0be8c90fb76f9fdde2f90524076282 100644
--- a/third_party/blink/renderer/core/frame/local_frame.cc
+++ b/third_party/blink/renderer/core/frame/local_frame.cc
@@ -3342,6 +3342,7 @@ void LocalFrame::RequestExecuteScript(
@@ -3379,6 +3379,7 @@ void LocalFrame::RequestExecuteScript(
mojom::blink::EvaluationTiming evaluation_timing,
mojom::blink::LoadEventBlockingOption blocking_option,
WebScriptExecutionCallback callback,
@@ -70,7 +70,7 @@ index 16f0ded5f914ef3b91481f5674a59771f3153f64..1cc66d178c17d0e0413fbfd07570d809
BackForwardCacheAware back_forward_cache_aware,
mojom::blink::WantResultOption want_result_option,
mojom::blink::PromiseResultOption promise_behavior,
@@ -3401,7 +3402,8 @@ void LocalFrame::RequestExecuteScript(
@@ -3438,7 +3439,8 @@ void LocalFrame::RequestExecuteScript(
PausableScriptExecutor::CreateAndRun(
script_state, std::move(script_sources), execute_script_policy,
user_gesture, evaluation_timing, blocking_option, want_result_option,
@@ -81,10 +81,10 @@ index 16f0ded5f914ef3b91481f5674a59771f3153f64..1cc66d178c17d0e0413fbfd07570d809
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 603523bb750775dac83a16622a525ea9e42c59dd..f4efce45d810b8813a7e76dc19fc09691ea6e019 100644
index ace6c5710094152ab6e3fa7a242b3995b6952009..b704b3311f61fa39452b005ff8d873063bce7b02 100644
--- a/third_party/blink/renderer/core/frame/local_frame.h
+++ b/third_party/blink/renderer/core/frame/local_frame.h
@@ -858,6 +858,7 @@ class CORE_EXPORT LocalFrame final
@@ -866,6 +866,7 @@ class CORE_EXPORT LocalFrame final
mojom::blink::EvaluationTiming,
mojom::blink::LoadEventBlockingOption,
WebScriptExecutionCallback,
patches/chromium/fix_use_bundled_devtools_frontend_url_for_remote_debugging.patch
+2 -2
View File
@@ -26,10 +26,10 @@ behavior for Chrome and other embedders.
Fixes: https://github.com/electron/electron/issues/51035
diff --git a/content/browser/devtools/devtools_http_handler.cc b/content/browser/devtools/devtools_http_handler.cc
index fbfe1abebb19119387d55a1296aba5fd1ca7d99b..2c2d263bc026a0b63010498fb02d9bb897852bc8 100644
index d14be48bac7febf0f2214ada695d5e25b7b75e9c..40033c476a9e60e54bf4c95865b76dd75f5889ab 100644
--- a/content/browser/devtools/devtools_http_handler.cc
+++ b/content/browser/devtools/devtools_http_handler.cc
@@ -544,7 +544,8 @@ std::string DevToolsHttpHandler::GetFrontendURLInternal(
@@ -542,7 +542,8 @@ std::string DevToolsHttpHandler::GetFrontendURLInternal(
const std::string& host) {
std::string frontend_url;
const std::string git_revision = CHROMIUM_GIT_REVISION;
patches/chromium/frame_host_manager.patch
+1 -1
View File
@@ -20,7 +20,7 @@ index ca23076b88c37b58ad16a3382448335d7c32b638..4e9115e2c5cdbe59876017acae02435e
}
diff --git a/content/public/browser/content_browser_client.h b/content/public/browser/content_browser_client.h
index f92b7763dace1c0307e4a4ac96d55182188d3e77..7262f91eda90ae90091216c988ce0b78be8af6e2 100644
index 8bb776827d657496abec10c2bef1b7682f9af10c..a4e03cb95c0dc0bafecd402251e9f52490538957 100644
--- a/content/public/browser/content_browser_client.h
+++ b/content/public/browser/content_browser_client.h
@@ -350,6 +350,11 @@ class CONTENT_EXPORT ContentBrowserClient {
patches/chromium/gritsettings_resource_ids.patch
+2 -2
View File
@@ -6,10 +6,10 @@ Subject: gritsettings_resource_ids.patch
Add electron resources file to the list of resource ids generation.
diff --git a/tools/gritsettings/resource_ids.spec b/tools/gritsettings/resource_ids.spec
index 05db40066491f22b7e0259ef44914abce6568d88..538a92d79c8ef2e129818f99d05305fccd3347f1 100644
index 9f87211bda65feb8b38cf3db2b0a83726d6810ab..0122a3142faf41c8fd33c1b55623d80a5906cbde 100644
--- a/tools/gritsettings/resource_ids.spec
+++ b/tools/gritsettings/resource_ids.spec
@@ -1797,6 +1797,11 @@
@@ -1800,6 +1800,11 @@
"includes": [12000],
},
patches/chromium/mas_avoid_private_macos_api_usage.patch.patch
+10 -10
View File
@@ -50,10 +50,10 @@ system font by checking if it's kCTFontPriorityAttribute is set to
system priority.
diff --git a/base/BUILD.gn b/base/BUILD.gn
index 738071da942f8fbc99b556ee5e41876de3264f2b..42cb17e1327cf71965185cbe366db93f5941b7d3 100644
index 809757ba0d27993e347006274faa21e22cec0363..a47655de11c5fe58c3a729022985a9aea1749c6a 100644
--- a/base/BUILD.gn
+++ b/base/BUILD.gn
@@ -1150,6 +1150,7 @@ component("base") {
@@ -1152,6 +1152,7 @@ component("base") {
"//build:ios_buildflags",
"//build/config/compiler:compiler_buildflags",
"//third_party/modp_b64",
@@ -1037,7 +1037,7 @@ index 2bab8a9ee3a89694d6adc0996d61eda13ddba7cd..0d1461a0b25878664ffd97effdf3d2ee
ui::AXTreeID parent_ax_tree_id_ = ui::AXTreeIDUnknown();
diff --git a/content/browser/renderer_host/render_widget_host_view_mac.mm b/content/browser/renderer_host/render_widget_host_view_mac.mm
index 749d207c359ebe621841fb7c0aae6272766b7236..a60a2d91998cb55771adaa44a108d6ad0502d6fa 100644
index c069e4b687cf5d6b69f876f4adee3ed124cdcf24..96e2f9442b2fbfe37d56d119cc696b63aedceb46 100644
--- a/content/browser/renderer_host/render_widget_host_view_mac.mm
+++ b/content/browser/renderer_host/render_widget_host_view_mac.mm
@@ -58,6 +58,7 @@
@@ -1206,7 +1206,7 @@ index a1068589ad844518038ee7bc15a3de9bc5cba525..1ff781c49f086ec8015c7d3c44567dbe
} // namespace content
diff --git a/content/test/BUILD.gn b/content/test/BUILD.gn
index ec2ca2bec629ccd6465178280983b18ad8999ad8..d59580a9fe2c00c27adda601c0eafee1f8b1f7db 100644
index a85404f6d12759a95672f09e3a7e8c1098c0bcfc..821bdf298c88e842985f9ed567205b827df435a5 100644
--- a/content/test/BUILD.gn
+++ b/content/test/BUILD.gn
@@ -651,6 +651,7 @@ static_library("test_support") {
@@ -1226,7 +1226,7 @@ index ec2ca2bec629ccd6465178280983b18ad8999ad8..d59580a9fe2c00c27adda601c0eafee1
}
mojom("content_test_mojo_bindings") {
@@ -2030,6 +2033,7 @@ test("content_browsertests") {
@@ -2031,6 +2034,7 @@ test("content_browsertests") {
"//ui/shell_dialogs",
"//ui/snapshot",
"//ui/webui:test_support",
@@ -1234,7 +1234,7 @@ index ec2ca2bec629ccd6465178280983b18ad8999ad8..d59580a9fe2c00c27adda601c0eafee1
]
if (!(is_chromeos && target_cpu == "arm64" && current_cpu == "arm")) {
@@ -3348,6 +3352,7 @@ test("content_unittests") {
@@ -3351,6 +3355,7 @@ test("content_unittests") {
"//ui/shell_dialogs",
"//ui/webui:test_support",
"//url",
@@ -2292,7 +2292,7 @@ index 93e90c4eba9bc9b93d68e834eb6baabeb2d0ecf0..1b90f41d05f847a94adf2f4da827b1d0
} // namespace
diff --git a/ui/display/BUILD.gn b/ui/display/BUILD.gn
index c09f41bea0da71a885d682fbb1e678d26f0d0284..aa5d07bd04af4f404026c20821859068c8e131e7 100644
index cf4c30f417f9a7689f02ceec3b9326e9ca9989b7..ed8059a069757b5d0ce4fd8b0925e89d69a97a07 100644
--- a/ui/display/BUILD.gn
+++ b/ui/display/BUILD.gn
@@ -142,6 +142,12 @@ component("display") {
@@ -2390,10 +2390,10 @@ index 65ae8170664d15c7884261812400d0ed638a681d..86c937f1e6d03b88803a2ca80abff19c
// enough.
return PlatformFontMac::SystemFontType::kGeneral;
diff --git a/ui/views/BUILD.gn b/ui/views/BUILD.gn
index 104ef3be5a984a59625ca544b94316370980ddd9..457d7418f264f8c117565eb9f694a3a4801f8ee0 100644
index ff6a3c14044d497c1617fd377598ac00fdcf0ba7..2a483479f92fa456d4abb6e15475206e18683110 100644
--- a/ui/views/BUILD.gn
+++ b/ui/views/BUILD.gn
@@ -791,6 +791,8 @@ component("views") {
@@ -793,6 +793,8 @@ component("views") {
"IOSurface.framework",
"QuartzCore.framework",
]
@@ -2402,7 +2402,7 @@ index 104ef3be5a984a59625ca544b94316370980ddd9..457d7418f264f8c117565eb9f694a3a4
}
if (is_win) {
@@ -1211,6 +1213,8 @@ source_set("test_support") {
@@ -1213,6 +1215,8 @@ source_set("test_support") {
"//ui/base/mojom:ui_base_types",
]
patches/chromium/notification_provenance.patch
+1 -1
View File
@@ -133,7 +133,7 @@ index 9bf238e64af483294ae3c3f18a4e9aed49a8658d..b9b2a4c8c387b8e8b4eb1f02fc0f891c
const GURL& document_url,
const WeakDocumentPtr& weak_document_ptr,
diff --git a/content/browser/renderer_host/render_process_host_impl.cc b/content/browser/renderer_host/render_process_host_impl.cc
index a44ebe8bf8418a00a6eb9749cdca75609dd1abe3..870f7ab26199af3d205119da77bc5cf652ae7e50 100644
index 2fc340328f54a1491b56eb6c611148dcfe0e7c11..19c2c049e1a29d66cbfbd93420d198842df68bcf 100644
--- a/content/browser/renderer_host/render_process_host_impl.cc
+++ b/content/browser/renderer_host/render_process_host_impl.cc
@@ -2500,7 +2500,7 @@ void RenderProcessHostImpl::CreateNotificationService(
patches/chromium/picture-in-picture.patch
+9 -9
View File
@@ -46,7 +46,7 @@ index ffaf5f5f5f68ab6811c115ef66c8eb8f7f370027..6a43f6b515aacac600e3928a33bda6ed
ui::ImageModel::FromVectorIcon(*icon, kColorPipWindowForeground,
kCloseButtonIconSize));
diff --git a/chrome/browser/ui/views/overlay/video_overlay_window_views.cc b/chrome/browser/ui/views/overlay/video_overlay_window_views.cc
index b785d6b81b134c74fd3e18d1875843b9cc047bd4..85f05058b574862032b8b1438b0c7ce0d7a7c676 100644
index 73373be91a5a4017b03955f0c99578acc8c0cdc0..5d375de1cdf8fa5a6a003a72c32e5b6c54f2a861 100644
--- a/chrome/browser/ui/views/overlay/video_overlay_window_views.cc
+++ b/chrome/browser/ui/views/overlay/video_overlay_window_views.cc
@@ -18,13 +18,17 @@
@@ -159,7 +159,7 @@ index b785d6b81b134c74fd3e18d1875843b9cc047bd4..85f05058b574862032b8b1438b0c7ce0
toggle_camera_button_ = vc_controls_container_view_->AddChildView(
std::move(toggle_camera_button));
@@ -1662,6 +1674,7 @@ void VideoOverlayWindowViews::OnUpdateControlsBounds() {
@@ -1660,6 +1672,7 @@ void VideoOverlayWindowViews::OnUpdateControlsBounds() {
timestamp_->SetSize({max_timestamp_width, kTimestampHeight});
timestamp_->SetVisible(!is_live_);
@@ -167,7 +167,7 @@ index b785d6b81b134c74fd3e18d1875843b9cc047bd4..85f05058b574862032b8b1438b0c7ce0
live_status_->SetPosition(timestamp_position);
live_status_->SetMaximumWidthSingleLine(max_timestamp_width);
live_status_->SetSize(
@@ -1669,7 +1682,6 @@ void VideoOverlayWindowViews::OnUpdateControlsBounds() {
@@ -1667,7 +1680,6 @@ void VideoOverlayWindowViews::OnUpdateControlsBounds() {
.width(),
kTimestampHeight});
live_status_->SetVisible(is_live_);
@@ -175,7 +175,7 @@ index b785d6b81b134c74fd3e18d1875843b9cc047bd4..85f05058b574862032b8b1438b0c7ce0
gfx::Rect live_caption_button_bounds(
bottom_controls_bounds.right() - kBottomControlsHorizontalMargin -
kActionButtonSize.width(),
@@ -1688,7 +1700,7 @@ void VideoOverlayWindowViews::OnUpdateControlsBounds() {
@@ -1686,7 +1698,7 @@ void VideoOverlayWindowViews::OnUpdateControlsBounds() {
live_caption_dialog_->SetPosition(
{live_caption_button_bounds.right() - live_caption_dialog_->width(),
live_caption_button_bounds.y() - live_caption_dialog_->height()});
@@ -184,7 +184,7 @@ index b785d6b81b134c74fd3e18d1875843b9cc047bd4..85f05058b574862032b8b1438b0c7ce0
// The play/pause button and replay/forward 10 seconds buttons should not be
// visible while dragging the progress bar or for live media.
const bool is_dragging_progress_bar =
@@ -2112,14 +2124,20 @@ gfx::Rect VideoOverlayWindowViews::GetProgressViewBounds() {
@@ -2110,14 +2122,20 @@ gfx::Rect VideoOverlayWindowViews::GetProgressViewBounds() {
}
gfx::Rect VideoOverlayWindowViews::GetLiveCaptionButtonBounds() {
@@ -205,7 +205,7 @@ index b785d6b81b134c74fd3e18d1875843b9cc047bd4..85f05058b574862032b8b1438b0c7ce0
}
gfx::Rect VideoOverlayWindowViews::GetToggleMuteButtonBounds() {
@@ -2131,6 +2149,7 @@ gfx::Rect VideoOverlayWindowViews::GetToggleMuteButtonBounds() {
@@ -2129,6 +2147,7 @@ gfx::Rect VideoOverlayWindowViews::GetToggleMuteButtonBounds() {
bool VideoOverlayWindowViews::HasHighMediaEngagement(
const url::Origin& origin) const {
@@ -213,7 +213,7 @@ index b785d6b81b134c74fd3e18d1875843b9cc047bd4..85f05058b574862032b8b1438b0c7ce0
MediaEngagementService* service =
MediaEngagementService::Get(Profile::FromBrowserContext(
GetController()->GetWebContents()->GetBrowserContext()));
@@ -2139,6 +2158,8 @@ bool VideoOverlayWindowViews::HasHighMediaEngagement(
@@ -2137,6 +2156,8 @@ bool VideoOverlayWindowViews::HasHighMediaEngagement(
}
return service->HasHighEngagement(origin);
@@ -222,7 +222,7 @@ index b785d6b81b134c74fd3e18d1875843b9cc047bd4..85f05058b574862032b8b1438b0c7ce0
}
bool VideoOverlayWindowViews::IsTrustedForMediaPlayback() const {
@@ -2405,11 +2426,14 @@ void VideoOverlayWindowViews::UpdateTimestampLabel(base::TimeDelta current_time,
@@ -2403,11 +2424,14 @@ void VideoOverlayWindowViews::UpdateTimestampLabel(base::TimeDelta current_time,
}
void VideoOverlayWindowViews::OnLiveCaptionButtonPressed() {
@@ -237,7 +237,7 @@ index b785d6b81b134c74fd3e18d1875843b9cc047bd4..85f05058b574862032b8b1438b0c7ce0
if (wanted_visibility == live_caption_dialog_->GetVisible()) {
return;
}
@@ -2437,6 +2461,7 @@ void VideoOverlayWindowViews::SetLiveCaptionDialogVisibility(
@@ -2435,6 +2459,7 @@ void VideoOverlayWindowViews::SetLiveCaptionDialogVisibility(
if (toggle_mute_button_) {
toggle_mute_button_->SetEnabled(!wanted_visibility);
}
patches/chromium/refactor_allow_customizing_config_in_freedesktopsecretkeyprovider.patch
+16 -16
View File
@@ -13,10 +13,10 @@ This allows FreedesktopSecretKeyProvider to be used by multiple apps without
naming conflicts. This should be upstreamed to Chromium if possible.
diff --git a/components/os_crypt/async/browser/freedesktop_secret_key_provider.cc b/components/os_crypt/async/browser/freedesktop_secret_key_provider.cc
index e2d9eab6355f45218a265310838912821bfa477e..4391fbe69d8d2bb90772ef119bd9444203eeecb0 100644
index bc569bb3d128e13c185bd3b4106b56cf575934cb..4e088389aee9c29a55a1632da5d93a8c2564b28a 100644
--- a/components/os_crypt/async/browser/freedesktop_secret_key_provider.cc
+++ b/components/os_crypt/async/browser/freedesktop_secret_key_provider.cc
@@ -36,6 +36,30 @@ namespace os_crypt_async {
@@ -35,6 +35,30 @@ namespace os_crypt_async {
namespace {
@@ -46,8 +46,8 @@ index e2d9eab6355f45218a265310838912821bfa477e..4391fbe69d8d2bb90772ef119bd94442
+
constexpr char kUmaInitStatus[] =
"OSCrypt.FreedesktopSecretKeyProvider.InitStatus";
constexpr char kUmaErrorDetail[] =
@@ -116,6 +140,24 @@ const char* InitStatusToString(
@@ -47,6 +71,24 @@ constexpr size_t kSecretLengthBytes = 16;
} // namespace
@@ -72,7 +72,7 @@ index e2d9eab6355f45218a265310838912821bfa477e..4391fbe69d8d2bb90772ef119bd94442
// A helper class to handle a Secret Service prompt. It is templated on the
// return type expected from the prompt.
template <typename T>
@@ -246,8 +288,19 @@ FreedesktopSecretKeyProvider::FreedesktopSecretKeyProvider(
@@ -173,8 +215,19 @@ FreedesktopSecretKeyProvider::FreedesktopSecretKeyProvider(
const std::string& password_store,
const std::string& product_name,
scoped_refptr<dbus::Bus> bus)
@@ -92,7 +92,7 @@ index e2d9eab6355f45218a265310838912821bfa477e..4391fbe69d8d2bb90772ef119bd94442
bus_(std::move(bus)) {
if (!bus_) {
bus_ = dbus_thread_linux::GetSharedSessionBus();
@@ -475,7 +528,7 @@ void FreedesktopSecretKeyProvider::OnOpenSession(
@@ -388,7 +441,7 @@ void FreedesktopSecretKeyProvider::OnOpenSession(
session_opened_ = true;
std::map<std::string, std::string> search_attrs{
@@ -101,7 +101,7 @@ index e2d9eab6355f45218a265310838912821bfa477e..4391fbe69d8d2bb90772ef119bd94442
dbus_utils::CallMethod<"a{ss}", "ao">(
default_collection_proxy_, kSecretCollectionInterface, kMethodSearchItems,
@@ -697,7 +750,7 @@ void FreedesktopSecretKeyProvider::OnKWalletOpen(int32_t handle) {
@@ -596,7 +649,7 @@ void FreedesktopSecretKeyProvider::OnKWalletOpen(int32_t handle) {
kwallet_proxy_, kKWalletInterface, kKWalletMethodHasFolder,
base::BindOnce(&FreedesktopSecretKeyProvider::OnKWalletHasFolder,
weak_ptr_factory_.GetWeakPtr()),
@@ -110,7 +110,7 @@ index e2d9eab6355f45218a265310838912821bfa477e..4391fbe69d8d2bb90772ef119bd94442
}
void FreedesktopSecretKeyProvider::OnKWalletHasFolder(
@@ -714,13 +767,13 @@ void FreedesktopSecretKeyProvider::OnKWalletHasFolder(
@@ -612,13 +665,13 @@ void FreedesktopSecretKeyProvider::OnKWalletHasFolder(
kwallet_proxy_, kKWalletInterface, kKWalletMethodHasEntry,
base::BindOnce(&FreedesktopSecretKeyProvider::OnKWalletHasEntry,
weak_ptr_factory_.GetWeakPtr()),
@@ -126,7 +126,7 @@ index e2d9eab6355f45218a265310838912821bfa477e..4391fbe69d8d2bb90772ef119bd94442
}
}
@@ -754,7 +807,7 @@ void FreedesktopSecretKeyProvider::OnKWalletHasEntry(
@@ -645,7 +698,7 @@ void FreedesktopSecretKeyProvider::OnKWalletHasEntry(
kwallet_proxy_, kKWalletInterface, kKWalletMethodReadPassword,
base::BindOnce(&FreedesktopSecretKeyProvider::OnKWalletReadPassword,
weak_ptr_factory_.GetWeakPtr()),
@@ -135,7 +135,7 @@ index e2d9eab6355f45218a265310838912821bfa477e..4391fbe69d8d2bb90772ef119bd94442
} else {
GenerateAndWriteKWalletPassword();
}
@@ -790,7 +843,7 @@ void FreedesktopSecretKeyProvider::GenerateAndWriteKWalletPassword() {
@@ -680,7 +733,7 @@ void FreedesktopSecretKeyProvider::GenerateAndWriteKWalletPassword() {
kwallet_proxy_, kKWalletInterface, kKWalletMethodWritePassword,
base::BindOnce(&FreedesktopSecretKeyProvider::OnKWalletWritePassword,
weak_ptr_factory_.GetWeakPtr(), secret),
@@ -144,7 +144,7 @@ index e2d9eab6355f45218a265310838912821bfa477e..4391fbe69d8d2bb90772ef119bd94442
product_name_);
}
@@ -818,14 +871,14 @@ void FreedesktopSecretKeyProvider::OnKWalletWritePassword(
@@ -706,14 +759,14 @@ void FreedesktopSecretKeyProvider::OnKWalletWritePassword(
void FreedesktopSecretKeyProvider::CreateItem(
scoped_refptr<base::RefCountedMemory> secret) {
std::map<std::string, std::string> attributes{
@@ -162,11 +162,11 @@ index e2d9eab6355f45218a265310838912821bfa477e..4391fbe69d8d2bb90772ef119bd94442
std::vector<uint8_t> secret_bytes(secret->begin(), secret->end());
auto secret_struct =
diff --git a/components/os_crypt/async/browser/freedesktop_secret_key_provider.h b/components/os_crypt/async/browser/freedesktop_secret_key_provider.h
index 34ad5ee9aa13521752d63f083351f08add3200d2..ea76a2f8300e5b4d09af425d3974ca86f4c0bd2c 100644
index e2eb3958ef6fad22079e3238de0c9ba2761e56fe..251f57a95733548c406a748c53911592d8178659 100644
--- a/components/os_crypt/async/browser/freedesktop_secret_key_provider.h
+++ b/components/os_crypt/async/browser/freedesktop_secret_key_provider.h
@@ -81,11 +81,32 @@ class FreedesktopSecretKeyProvider : public KeyProvider {
kMaxValue = kExtraDataInResponse,
@@ -62,11 +62,32 @@ class FreedesktopSecretKeyProvider : public KeyProvider {
kMaxValue = kKWalletWriteFailed,
};
+ struct Config {
@@ -198,7 +198,7 @@ index 34ad5ee9aa13521752d63f083351f08add3200d2..ea76a2f8300e5b4d09af425d3974ca86
// KeyProvider:
void GetKey(KeyCallback callback) override;
bool UseForEncryption() override;
@@ -172,16 +193,6 @@ class FreedesktopSecretKeyProvider : public KeyProvider {
@@ -153,16 +174,6 @@ class FreedesktopSecretKeyProvider : public KeyProvider {
static constexpr int kKWalletInvalidHandle = -1;
static constexpr int kKWalletInvalidTransactionId = -1;
@@ -215,7 +215,7 @@ index 34ad5ee9aa13521752d63f083351f08add3200d2..ea76a2f8300e5b4d09af425d3974ca86
void InitializeFreedesktopSecretService();
void OnServiceStarted(std::optional<bool> service_started);
void OnReadAliasDefault(dbus_utils::CallMethodResultSig<"o"> collection_path);
@@ -243,6 +254,7 @@ class FreedesktopSecretKeyProvider : public KeyProvider {
@@ -223,6 +234,7 @@ class FreedesktopSecretKeyProvider : public KeyProvider {
const std::string password_store_;
const std::string product_name_;
patches/chromium/refactor_patch_electron_permissiontypes_into_blink.patch
+1 -1
View File
@@ -6,7 +6,7 @@ Subject: refactor: patch electron PermissionTypes into blink
6387077: [PermissionOptions] Generalize PermissionRequestDescription | https://chromium-review.googlesource.com/c/chromium/src/+/6387077
diff --git a/components/permissions/permission_util.cc b/components/permissions/permission_util.cc
index d10473bbb02ce2b1186d07c42f84db6983f441da..c23d36f0912de55e1dacf20e305e4e26cbcabcc9 100644
index fcff902ca98c598659e4418f96b633eea2296fc8..9a63f8206823cec2a44d7477d821354110a58610 100644
--- a/components/permissions/permission_util.cc
+++ b/components/permissions/permission_util.cc
@@ -584,9 +584,17 @@ ContentSettingsType PermissionUtil::PermissionTypeToContentSettingsTypeSafe(
patches/chromium/revert_remove_the_feature_flag_kdropinputeventswhilepaintholding.patch
+3 -3
View File
@@ -41,10 +41,10 @@ index 461a128e6151b3f61da330c48dcf63dff0fe30e3..a75ddffded2d5d60c685c009241b2909
// If we filter a GSB for paint holding, we'd like to receive a new one -
// see IsWheelScrollInProgress. Note that we leave is_in_gesture_scroll_ set
diff --git a/third_party/blink/common/features.cc b/third_party/blink/common/features.cc
index 99cadd522f4cbb3df96af167ce23af99549665fa..4a418f4d641f23a82f762a2eddf3209aad5a184d 100644
index ef45da890741d4c27fd726968c398aed5be07338..1a1f11786b9ee0a0691fbfaee1da55fac4f382cd 100644
--- a/third_party/blink/common/features.cc
+++ b/third_party/blink/common/features.cc
@@ -576,6 +576,11 @@ BASE_FEATURE(kDisableArrayBufferSizeLimitsForTesting,
@@ -577,6 +577,11 @@ BASE_FEATURE(kDisableArrayBufferSizeLimitsForTesting,
BASE_FEATURE(kDiscardInputEventsToRecentlyMovedFrames,
base::FEATURE_DISABLED_BY_DEFAULT);
@@ -57,7 +57,7 @@ index 99cadd522f4cbb3df96af167ce23af99549665fa..4a418f4d641f23a82f762a2eddf3209a
// Performance Panel, which (when clicked) call into a DevTools extension.
BASE_FEATURE(kEnableDevtoolsDeepLinkViaExtensibilityApi,
diff --git a/third_party/blink/public/common/features.h b/third_party/blink/public/common/features.h
index f8346504d1312fce8d41c3546bd308d11355c21e..45251e5118ee1d22f799c249100cfa4fa4c62578 100644
index 441aafd2a79029e92a4a719519c5c1bd3f68ef35..6e4b61162965852cc2f5e317f0645914c8f800f4 100644
--- a/third_party/blink/public/common/features.h
+++ b/third_party/blink/public/common/features.h
@@ -408,6 +408,8 @@ BLINK_COMMON_EXPORT BASE_DECLARE_FEATURE(
patches/chromium/short-circuit_permissions_checks_in_mediastreamdevicescontroller.patch
+1 -1
View File
@@ -15,7 +15,7 @@ short-circuit all the permissions checks in MSDC for now to allow us to
unduplicate this code.
diff --git a/components/webrtc/media_stream_devices_controller.cc b/components/webrtc/media_stream_devices_controller.cc
index 0add6e5931bcaea720bdc0238fb1b7c79f948437..2710831a2cf382a110c8a0124c94f67196362f95 100644
index cc52998162acd58c928ce47ea08fb92dd8c7ea18..178d3885a282d7fa26b83a7652182968fcb92265 100644
--- a/components/webrtc/media_stream_devices_controller.cc
+++ b/components/webrtc/media_stream_devices_controller.cc
@@ -58,7 +58,8 @@ bool PermissionIsRequested(blink::PermissionType permission,
patches/chromium/support_mixed_sandbox_with_zygote.patch
+1 -1
View File
@@ -22,7 +22,7 @@ However, the patch would need to be reviewed by the security team, as it
does touch a security-sensitive class.
diff --git a/content/browser/renderer_host/render_process_host_impl.cc b/content/browser/renderer_host/render_process_host_impl.cc
index 870f7ab26199af3d205119da77bc5cf652ae7e50..85c13454d1b8fc86fda4969f5b6f6c38c8f1be60 100644
index 19c2c049e1a29d66cbfbd93420d198842df68bcf..fdb38c97986421122b5e7066c6ada9186e963681 100644
--- a/content/browser/renderer_host/render_process_host_impl.cc
+++ b/content/browser/renderer_host/render_process_host_impl.cc
@@ -2071,6 +2071,10 @@ bool RenderProcessHostImpl::Init() {
patches/chromium/webview_fullscreen.patch
+1 -1
View File
@@ -15,7 +15,7 @@ Note that we also need to manually update embedder's
`api::WebContents::IsFullscreenForTabOrPending` value.
diff --git a/content/browser/renderer_host/render_frame_host_impl.cc b/content/browser/renderer_host/render_frame_host_impl.cc
index 365ae11f87d7ff2cbdf0cb3cbf9850a9a6e55bec..f4f1197db70b379eada2e0464b06ff50dee56db3 100644
index 21063c58e982092c6de635d46eaf728b47d2b708..bf65e1803e32af0b683da63eaab06044df5faacf 100644
--- a/content/browser/renderer_host/render_frame_host_impl.cc
+++ b/content/browser/renderer_host/render_frame_host_impl.cc
@@ -9585,6 +9585,17 @@ void RenderFrameHostImpl::EnterFullscreen(
spec/api-protocol-spec.ts
+38 -23
View File
@@ -17,7 +17,7 @@ import { setTimeout } from 'node:timers/promises';
import * as url from 'node:url';
import { collectStreamBody, getResponse } from './lib/net-helpers';
import { listen, defer, ifit } from './lib/spec-helpers';
import { listen, defer } from './lib/spec-helpers';
import { WebmGenerator } from './lib/video-helpers';
import { closeAllWindows, closeWindow } from './lib/window-helpers';
@@ -2215,32 +2215,49 @@ describe('protocol module', () => {
expect(response).to.be.string("hello to it's-a me! Mario!");
});
// TODO(nornagon): this test doesn't pass on Linux currently, investigate.
// test is also flaky on CI on macOS so it is currently disabled there as well.
ifit(process.platform !== 'linux' && (!process.env.CI || process.platform !== 'darwin'))('is fast', async () => {
// 128 MB of spaces.
it('is fast', async () => {
// 128 MB payload.
const chunk = new Uint8Array(128 * 1024 * 1024);
chunk.fill(' '.charCodeAt(0));
await contents.loadURL('about:blank');
const server = http.createServer((req, res) => {
// The sniffed mime type for the space-filled chunk will be
// text/plain, which chews up all its performance in the renderer
// trying to wrap lines. Setting content-type to text/html measures
// something closer to just the raw cost of getting the bytes over
// the wire.
res.setHeader('content-type', 'text/html');
res.setHeader('access-control-allow-origin', '*');
res.setHeader('cache-control', 'no-store');
res.setHeader('content-type', 'application/octet-stream');
res.end(chunk);
});
defer(() => server.close());
const { url } = await listen(server);
const rawTime = await (async () => {
await contents.loadURL(url); // warm
const fetchPayload = async () => {
const begin = Date.now();
await contents.loadURL(url);
const length = await contents.executeJavaScript(`
fetch(${JSON.stringify(url)}).then(async response => {
const reader = response.body.getReader();
let length = 0;
while (true) {
const { done, value } = await reader.read();
if (done) return length;
length += value.byteLength;
}
})
`);
const end = Date.now();
expect(length).to.equal(chunk.byteLength);
return end - begin;
})();
};
const measurePayload = async () => {
const samples = [];
for (let i = 0; i < 3; i++) {
samples.push(await fetchPayload());
}
samples.sort((a, b) => a - b);
return samples[1];
};
await fetchPayload(); // Warm the direct network path.
const rawTime = await measurePayload();
// Fetching through an intercepted handler should not be too much slower
// than it would be if the protocol hadn't been intercepted.
@@ -2252,13 +2269,11 @@ describe('protocol module', () => {
protocol.unhandle('http');
});
const interceptedTime = await (async () => {
const begin = Date.now();
await contents.loadURL(url);
const end = Date.now();
return end - begin;
})();
expect(interceptedTime).to.be.lessThan(rawTime * 1.6);
await fetchPayload(); // Warm the protocol handler path.
const interceptedTime = await measurePayload();
// Interception adds another response body pipeline; allow headroom above
// its expected ~2x cost while still catching substantial regressions.
expect(interceptedTime).to.be.lessThan(rawTime * 3);
});
});
});