Skip to content

Commit 7a87603

Browse files
nilayaryaelectron-roller[bot]codebytere
committed
chore: bump chromium to 143.0.7499.0 (main) (electron#48707)
* chore: bump chromium in DEPS to 143.0.7499.0 * 7079895: Allow full screen reentry when full screen parameters changed https://chromium-review.googlesource.com/c/chromium/src/+/7079895 --------- Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com> Co-authored-by: Shelley Vohr <[email protected]>
1 parent 5d9a642 commit 7a87603

19 files changed

+64
-62
lines changed

DEPS

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ gclient_gn_args_from = 'src'
22

33
vars = {
44
'chromium_version':
5-
'143.0.7497.0',
5+
'143.0.7499.0',
66
'node_version':
77
'v22.20.0',
88
'nan_version':

patches/chromium/add_electron_deps_to_license_credits_file.patch

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,10 @@ Ensure that licenses for the dependencies introduced by Electron
77
are included in `LICENSES.chromium.html`
88

99
diff --git a/tools/licenses/licenses.py b/tools/licenses/licenses.py
10-
index 833a80f1387c64eec418b57d74373dd93130a9dc..a85714b903fc934593258192bc61d72cc557615b 100755
10+
index 514be069768cc1bbd39f2b261cefb1a9f267f89f..0a1ab64914cfaa087e4000fb81bfafd18aa1b98b 100755
1111
--- a/tools/licenses/licenses.py
1212
+++ b/tools/licenses/licenses.py
13-
@@ -356,6 +356,31 @@ SPECIAL_CASES = {
13+
@@ -357,6 +357,31 @@ SPECIAL_CASES = {
1414
"License": "Apache 2.0",
1515
"License File": ["//third_party/sample3/the_license"],
1616
},

patches/chromium/build_do_not_depend_on_packed_resource_integrity.patch

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -33,10 +33,10 @@ index c51468e6fdb46634b5458b387d1c78caf2dd083f..7236611d2a392008f43b1b83ae125e94
3333
"//base",
3434
"//build:branding_buildflags",
3535
diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
36-
index 03b7e243f304528ed12fcb0194f084bb4475d3a6..5ae8aaea4939b6a5500f487fa79c6352ffd6d173 100644
36+
index 848ddc7610d01dee15e0008e2095d4d0af056ac6..6bbacd81a079e54559989050e38e31b852102e15 100644
3737
--- a/chrome/browser/BUILD.gn
3838
+++ b/chrome/browser/BUILD.gn
39-
@@ -4823,7 +4823,7 @@ static_library("browser") {
39+
@@ -4829,7 +4829,7 @@ static_library("browser") {
4040
]
4141
}
4242

@@ -46,10 +46,10 @@ index 03b7e243f304528ed12fcb0194f084bb4475d3a6..5ae8aaea4939b6a5500f487fa79c6352
4646
# than here in :chrome_dll.
4747
deps += [ "//chrome:packed_resources_integrity_header" ]
4848
diff --git a/chrome/test/BUILD.gn b/chrome/test/BUILD.gn
49-
index 870557c8f7edb33c6373d59ffa9e87483262ca27..0e7ce248a0af7b9062ae258613474f859a3e153c 100644
49+
index c0fa565f990a956af43720850ac85451f3c25b8c..bf5e2c0f7e628befdee6e38a6a6dddefea8bce7a 100644
5050
--- a/chrome/test/BUILD.gn
5151
+++ b/chrome/test/BUILD.gn
52-
@@ -7583,9 +7583,12 @@ test("unit_tests") {
52+
@@ -7585,9 +7585,12 @@ test("unit_tests") {
5353
"//chrome/notification_helper",
5454
]
5555

@@ -63,7 +63,7 @@ index 870557c8f7edb33c6373d59ffa9e87483262ca27..0e7ce248a0af7b9062ae258613474f85
6363
"//chrome//services/util_win:unit_tests",
6464
"//chrome/app:chrome_dll_resources",
6565
"//chrome/app:win_unit_tests",
66-
@@ -8521,6 +8524,10 @@ test("unit_tests") {
66+
@@ -8527,6 +8530,10 @@ test("unit_tests") {
6767
"../browser/performance_manager/policies/background_tab_loading_policy_unittest.cc",
6868
]
6969

@@ -74,7 +74,7 @@ index 870557c8f7edb33c6373d59ffa9e87483262ca27..0e7ce248a0af7b9062ae258613474f85
7474
sources += [
7575
# The importer code is not used on Android.
7676
"../common/importer/firefox_importer_utils_unittest.cc",
77-
@@ -8577,7 +8584,6 @@ test("unit_tests") {
77+
@@ -8583,7 +8590,6 @@ test("unit_tests") {
7878
# TODO(crbug.com/417513088): Maybe merge with the non-android `deps` declaration above?
7979
deps += [
8080
"../browser/screen_ai:screen_ai_install_state",

patches/chromium/can_create_window.patch

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,10 @@ potentially prevent a window from being created.
99
TODO(loc): this patch is currently broken.
1010

1111
diff --git a/content/browser/renderer_host/render_frame_host_impl.cc b/content/browser/renderer_host/render_frame_host_impl.cc
12-
index c6addeca2a539557c4b6bbb1c20e9904c64525f5..c50cceaf899308e126844e986abc4e01bc7497bb 100644
12+
index ce1e5c65773a1967bcaa31e5b2572d4e7fa8b148..9d54e7e7ccabad6dfcdc54214683df8b3b414208 100644
1313
--- a/content/browser/renderer_host/render_frame_host_impl.cc
1414
+++ b/content/browser/renderer_host/render_frame_host_impl.cc
15-
@@ -9848,6 +9848,7 @@ void RenderFrameHostImpl::CreateNewWindow(
15+
@@ -9953,6 +9953,7 @@ void RenderFrameHostImpl::CreateNewWindow(
1616
last_committed_origin_, params->window_container_type,
1717
params->target_url, params->referrer.To<Referrer>(),
1818
params->frame_name, params->disposition, *params->features,

patches/chromium/chore_provide_iswebcontentscreationoverridden_with_full_params.patch

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -80,10 +80,10 @@ index 39fa45f0a0f9076bd7ac0be6f455dd540a276512..3d0381d463eed73470b28085830f2a23
8080
content::WebContents* source,
8181
const content::OpenURLParams& params,
8282
diff --git a/chrome/browser/ui/browser.cc b/chrome/browser/ui/browser.cc
83-
index 7477bbc1a4e6ccb536d2c63ffe7c2b0982a5d298..5bfbf89e19e9c35c942b856276b35707a75fc0ef 100644
83+
index e550b21eba674396ba97b9ec21535964502d1b36..24e13b4f6ab01bdbefba791002edb0a4faf4811a 100644
8484
--- a/chrome/browser/ui/browser.cc
8585
+++ b/chrome/browser/ui/browser.cc
86-
@@ -2366,7 +2366,8 @@ bool Browser::IsWebContentsCreationOverridden(
86+
@@ -2369,7 +2369,8 @@ bool Browser::IsWebContentsCreationOverridden(
8787
content::mojom::WindowContainerType window_container_type,
8888
const GURL& opener_url,
8989
const std::string& frame_name,
@@ -93,7 +93,7 @@ index 7477bbc1a4e6ccb536d2c63ffe7c2b0982a5d298..5bfbf89e19e9c35c942b856276b35707
9393
if (HasActorTask(profile(), opener)) {
9494
// If an ExecutionEngine is acting on the opener, prevent it from creating a
9595
// new WebContents. We'll instead force the navigation to happen in the same
96-
@@ -2379,7 +2380,7 @@ bool Browser::IsWebContentsCreationOverridden(
96+
@@ -2382,7 +2383,7 @@ bool Browser::IsWebContentsCreationOverridden(
9797
return (window_container_type ==
9898
content::mojom::WindowContainerType::BACKGROUND &&
9999
ShouldCreateBackgroundContents(source_site_instance, opener_url,
@@ -103,7 +103,7 @@ index 7477bbc1a4e6ccb536d2c63ffe7c2b0982a5d298..5bfbf89e19e9c35c942b856276b35707
103103

104104
WebContents* Browser::CreateCustomWebContents(
105105
diff --git a/chrome/browser/ui/browser.h b/chrome/browser/ui/browser.h
106-
index 5eb967dec8c8ec8b8959b361438807a987011d04..784c2ad55d22bc82b5e629f364561d3f49c00887 100644
106+
index e0d63627518a5e0e1bdef510f3c0d849db4cc0d8..a052d78b6578a1e1fab88e1acafff77e5871c335 100644
107107
--- a/chrome/browser/ui/browser.h
108108
+++ b/chrome/browser/ui/browser.h
109109
@@ -935,8 +935,7 @@ class Browser : public TabStripModelObserver,

patches/chromium/expose_setuseragent_on_networkcontext.patch

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -33,10 +33,10 @@ index 0ab8187b0db8ae6db46d81738f653a2bc4c566f6..de3d55e85c22317f7f9375eb94d0d5d4
3333

3434
} // namespace net
3535
diff --git a/services/network/network_context.cc b/services/network/network_context.cc
36-
index cf1cee2251d8ba88535acc1e41cf82986b62f259..27c1a38d0f1b06cbc0722f2067fe39a4f86f0903 100644
36+
index 3598823a6400c4e5045621950433d2688cfbba89..66379714141b83a2ded90f88ce8b89bf900ca5a6 100644
3737
--- a/services/network/network_context.cc
3838
+++ b/services/network/network_context.cc
39-
@@ -1910,6 +1910,13 @@ void NetworkContext::EnableDurableMessageCollector(
39+
@@ -1911,6 +1911,13 @@ void NetworkContext::EnableDurableMessageCollector(
4040
it->second->AddReceiver(std::move(receiver));
4141
}
4242

@@ -63,10 +63,10 @@ index 90cf1a70c068771ac98b2d5a283cba5e54c05ff4..0dc8de8d4e37e48cb28d8112c0233ac8
6363
void SetEnableReferrers(bool enable_referrers) override;
6464
#if BUILDFLAG(IS_CT_SUPPORTED)
6565
diff --git a/services/network/public/mojom/network_context.mojom b/services/network/public/mojom/network_context.mojom
66-
index 00374e2ad12939733983fc6ea4643ff72134942a..ed149b049cb837adb17dfbd302f3ccc597c85fba 100644
66+
index 434cd63a228ddbdf2efffc0c6a17ab6376beb19d..75d2ad3ccdf4408a2c40c042be60ebd75c320b90 100644
6767
--- a/services/network/public/mojom/network_context.mojom
6868
+++ b/services/network/public/mojom/network_context.mojom
69-
@@ -1353,6 +1353,9 @@ interface NetworkContext {
69+
@@ -1357,6 +1357,9 @@ interface NetworkContext {
7070
mojo_base.mojom.UnguessableToken throttling_profile_id,
7171
pending_receiver<DurableMessageCollector> receiver);
7272

patches/chromium/feat_allow_code_cache_in_custom_schemes.patch

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -405,7 +405,7 @@ index 70a23343d5815db0722e2977d966219b824a83b1..85ac45c1868832c47460108f93d86a51
405405
std::vector<std::string> extension_schemes;
406406
// Registers a URL scheme with a predefined default custom handler.
407407
diff --git a/url/url_util.cc b/url/url_util.cc
408-
index 5f45b59482b66aad4e8ab08cae9f3eef3f4e6fa7..88512b7dc2c04364af76182a42c414212a46cd58 100644
408+
index 90c06884c9c7e91a706d58917b38c0919e546c1b..f3aa192ac229423fa0b9c8caa8f7b1df18cc45ec 100644
409409
--- a/url/url_util.cc
410410
+++ b/url/url_util.cc
411411
@@ -136,6 +136,9 @@ struct SchemeRegistry {
@@ -418,7 +418,7 @@ index 5f45b59482b66aad4e8ab08cae9f3eef3f4e6fa7..88512b7dc2c04364af76182a42c41421
418418
// Schemes with a predefined default custom handler.
419419
std::vector<SchemeWithHandler> predefined_handler_schemes;
420420

421-
@@ -679,6 +682,15 @@ const std::vector<std::string>& GetEmptyDocumentSchemes() {
421+
@@ -677,6 +680,15 @@ const std::vector<std::string>& GetEmptyDocumentSchemes() {
422422
return GetSchemeRegistry().empty_document_schemes;
423423
}
424424

patches/chromium/feat_corner_smoothing_css_rule_and_blink_painting.patch

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ making three primary changes to Blink:
2020
* Controls whether the CSS rule is available.
2121

2222
diff --git a/third_party/blink/public/mojom/use_counter/metrics/css_property_id.mojom b/third_party/blink/public/mojom/use_counter/metrics/css_property_id.mojom
23-
index 5e04647ae947613138ca3e803a5bac34acf9672f..edfdb10888b4c8efb63e6713f04858d35050112a 100644
23+
index cd3f33a59c40705ee5aa0869c298dc11b3caac21..803212c1b7662f9b78f4e1f7a61acec129f54280 100644
2424
--- a/third_party/blink/public/mojom/use_counter/metrics/css_property_id.mojom
2525
+++ b/third_party/blink/public/mojom/use_counter/metrics/css_property_id.mojom
2626
@@ -48,6 +48,7 @@ enum CSSSampleId {
@@ -45,10 +45,10 @@ index e189d584f05f2ce6354c03a9b19f56985df8a15e..41b430e8f2416be098494f5c49fb97ca
4545
'internal-forced-visited-'):
4646
internal_visited_order = 0
4747
diff --git a/third_party/blink/renderer/core/css/css_properties.json5 b/third_party/blink/renderer/core/css/css_properties.json5
48-
index 8ea9539c27b3c565efb05b8da39fcead8e4c2ee3..27346b484d7d6e78e3eea36bc9b1f819b98892cd 100644
48+
index bb84e7fb7845a64a336e95a20a47d32d7f74aa16..4849f6ac85715e816930ae35fdd9d2815165a133 100644
4949
--- a/third_party/blink/renderer/core/css/css_properties.json5
5050
+++ b/third_party/blink/renderer/core/css/css_properties.json5
51-
@@ -9049,6 +9049,26 @@
51+
@@ -9074,6 +9074,26 @@
5252
property_methods: ["ParseShorthand", "CSSValueFromComputedStyleInternal"],
5353
},
5454

@@ -76,7 +76,7 @@ index 8ea9539c27b3c565efb05b8da39fcead8e4c2ee3..27346b484d7d6e78e3eea36bc9b1f819
7676
{
7777
name: "-internal-visited-color",
7878
diff --git a/third_party/blink/renderer/core/css/css_property_equality.cc b/third_party/blink/renderer/core/css/css_property_equality.cc
79-
index f4806d8ea97785e8450ba7d08da45108702c4217..71398ba97655c1a96633a8be2c0387604bfabf9d 100644
79+
index 64a361128ec56be0382c72ef40db1bd01cb8d9a0..1dc51536f5860448dda9adc2b1129f53efbbd595 100644
8080
--- a/third_party/blink/renderer/core/css/css_property_equality.cc
8181
+++ b/third_party/blink/renderer/core/css/css_property_equality.cc
8282
@@ -354,6 +354,8 @@ bool CSSPropertyEquality::PropertiesEqual(const PropertyHandle& property,
@@ -89,10 +89,10 @@ index f4806d8ea97785e8450ba7d08da45108702c4217..71398ba97655c1a96633a8be2c038760
8989
return a.EmptyCells() == b.EmptyCells();
9090
case CSSPropertyID::kFill:
9191
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
92-
index 56d4ea1c4c27062adb90754d75d3595a0fb71a9e..40b786c32a0c21ff31886a1fc8b6d7b2cfff2e91 100644
92+
index c818580d191226b88dbac41d4eabbabf0b6035d9..c91591362e5b5fce9a383c07270f3c5e62771fe2 100644
9393
--- a/third_party/blink/renderer/core/css/properties/longhands/longhands_custom.cc
9494
+++ b/third_party/blink/renderer/core/css/properties/longhands/longhands_custom.cc
95-
@@ -12500,5 +12500,36 @@ const CSSValue* InternalEmptyLineHeight::ParseSingleValue(
95+
@@ -12521,5 +12521,36 @@ const CSSValue* InternalEmptyLineHeight::ParseSingleValue(
9696
CSSValueID::kNone>(stream);
9797
}
9898

@@ -130,10 +130,10 @@ index 56d4ea1c4c27062adb90754d75d3595a0fb71a9e..40b786c32a0c21ff31886a1fc8b6d7b2
130130
} // namespace css_longhand
131131
} // namespace blink
132132
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
133-
index b2cfcac17cac610bf2f686ded14e6cfe3b7023a9..81e98f83c0387a4c527e3d46361fcfe4c9791e9c 100644
133+
index 4c4a4ca1c5d0d9ebfc361323bf932b2c36de9c49..e350bb786146ade7991422fc8f8c640daa7ea2a8 100644
134134
--- a/third_party/blink/renderer/core/css/resolver/style_builder_converter.cc
135135
+++ b/third_party/blink/renderer/core/css/resolver/style_builder_converter.cc
136-
@@ -4122,6 +4122,15 @@ PositionTryFallback StyleBuilderConverter::ConvertSinglePositionTryFallback(
136+
@@ -4119,6 +4119,15 @@ PositionTryFallback StyleBuilderConverter::ConvertSinglePositionTryFallback(
137137
return PositionTryFallback(scoped_name, tactic_list);
138138
}
139139

@@ -312,7 +312,7 @@ index 1d6b8160e8db2a94ee61ed41ac9a74db5b1bfb17..373bcd30c6a4526262912021aaf2b560
312312

313313
auto DrawAsSinglePath = [&]() {
314314
diff --git a/third_party/blink/renderer/platform/runtime_enabled_features.json5 b/third_party/blink/renderer/platform/runtime_enabled_features.json5
315-
index 1ce3037cb0f173c192707de4e36b92bd733a89c0..195d4430d824d815b7de7799842c6e53b6a997aa 100644
315+
index 02815bb434a54acaacbd11e408fb26564bb5d0a6..e47d5eba72cd3e08675eea76927e4efd28b43a31 100644
316316
--- a/third_party/blink/renderer/platform/runtime_enabled_features.json5
317317
+++ b/third_party/blink/renderer/platform/runtime_enabled_features.json5
318318
@@ -214,6 +214,10 @@

patches/chromium/feat_enable_offscreen_rendering_with_viz_compositor.patch

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -180,7 +180,7 @@ index 07502f4ff2afd53a43d8f0ab68d4c4c39f6c0737..20d51f86d5084edf0b05ce0ab11fcd12
180180
HWND child_hwnd;
181181
auto device = CreateSoftwareOutputDeviceWin(
182182
diff --git a/components/viz/service/display_embedder/output_surface_provider_impl.h b/components/viz/service/display_embedder/output_surface_provider_impl.h
183-
index e4b46a79560e7698a6400b2ab8a57f38205a8718..3cb2518c6644cf0618f625d981befd466a3dfb2c 100644
183+
index f49bbc5d568f0cb323a22997a949e2cae8f35d59..c0154ee828e67b197eb2ddb1abf04c0aede0d264 100644
184184
--- a/components/viz/service/display_embedder/output_surface_provider_impl.h
185185
+++ b/components/viz/service/display_embedder/output_surface_provider_impl.h
186186
@@ -54,7 +54,8 @@ class VIZ_SERVICE_EXPORT OutputSurfaceProviderImpl

patches/chromium/fix_adapt_exclusive_access_for_electron_needs.patch

Lines changed: 13 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ Linux or Windows to un-fullscreen in some circumstances without this
1616
change.
1717

1818
diff --git a/chrome/browser/ui/exclusive_access/fullscreen_controller.cc b/chrome/browser/ui/exclusive_access/fullscreen_controller.cc
19-
index 9c29254d3400d4c52a71d7527b2db45858ce8cc2..5517cea76af4ea2b91c4a31fc359ebd0669f2517 100644
19+
index 3d17e79f291e6d3925d29cf349c30b4f7c7a6f54..a7494e62a6a49a71e5aef2c8abb4ec29426a5d23 100644
2020
--- a/chrome/browser/ui/exclusive_access/fullscreen_controller.cc
2121
+++ b/chrome/browser/ui/exclusive_access/fullscreen_controller.cc
2222
@@ -47,7 +47,7 @@
@@ -37,7 +37,7 @@ index 9c29254d3400d4c52a71d7527b2db45858ce8cc2..5517cea76af4ea2b91c4a31fc359ebd0
3737
if (!popunder_preventer_) {
3838
popunder_preventer_ = std::make_unique<PopunderPreventer>(web_contents);
3939
} else {
40-
@@ -317,12 +317,14 @@ void FullscreenController::ExitFullscreenModeForTab(WebContents* web_contents) {
40+
@@ -326,12 +326,14 @@ void FullscreenController::ExitFullscreenModeForTab(WebContents* web_contents) {
4141
void FullscreenController::FullscreenTabOpeningPopup(
4242
content::WebContents* opener,
4343
content::WebContents* popup) {
@@ -52,7 +52,7 @@ index 9c29254d3400d4c52a71d7527b2db45858ce8cc2..5517cea76af4ea2b91c4a31fc359ebd0
5252
}
5353
#endif // !BUILDFLAG(IS_ANDROID)
5454

55-
@@ -406,8 +408,7 @@ void FullscreenController::FullscreenTransitionCompleted() {
55+
@@ -415,8 +417,7 @@ void FullscreenController::FullscreenTransitionCompleted() {
5656
#endif // DCHECK_IS_ON()
5757
tab_fullscreen_target_display_id_ = display::kInvalidDisplayId;
5858
started_fullscreen_transition_ = false;
@@ -62,7 +62,7 @@ index 9c29254d3400d4c52a71d7527b2db45858ce8cc2..5517cea76af4ea2b91c4a31fc359ebd0
6262
if (!IsTabFullscreen()) {
6363
// Activate any popup windows created while content fullscreen, after exit.
6464
popunder_preventer_.reset();
65-
@@ -543,18 +544,17 @@ void FullscreenController::EnterFullscreenModeInternal(
65+
@@ -552,19 +553,18 @@ void FullscreenController::EnterFullscreenModeInternal(
6666
// Do not enter fullscreen mode if disallowed by pref. This prevents the user
6767
// from manually entering fullscreen mode and also disables kiosk mode on
6868
// desktop platforms.
@@ -76,6 +76,7 @@ index 9c29254d3400d4c52a71d7527b2db45858ce8cc2..5517cea76af4ea2b91c4a31fc359ebd0
7676
return;
7777
- }
7878
#endif
79+
fullscreen_parameters_ = fullscreen_tab_params;
7980
started_fullscreen_transition_ = true;
8081
toggled_into_fullscreen_ = true;
8182
+#if 0
@@ -86,28 +87,29 @@ index 9c29254d3400d4c52a71d7527b2db45858ce8cc2..5517cea76af4ea2b91c4a31fc359ebd0
8687
if (option == TAB) {
8788
origin = GetRequestingOrigin();
8889
tab_fullscreen_ = true;
89-
@@ -592,6 +592,7 @@ void FullscreenController::EnterFullscreenModeInternal(
90+
@@ -602,6 +602,7 @@ void FullscreenController::EnterFullscreenModeInternal(
9091
origin = url::Origin::Create(extension_url_.value());
9192
}
9293
}
9394
+#endif
9495

9596
fullscreen_start_time_ = base::TimeTicks::Now();
9697
if (option == BROWSER) {
97-
@@ -613,6 +614,7 @@ void FullscreenController::ExitFullscreenModeInternal() {
98+
@@ -623,6 +624,7 @@ void FullscreenController::ExitFullscreenModeInternal() {
9899
return;
99100
}
100101

101102
+#if 0
102103
// `fullscreen_start_time_` is null if a fullscreen tab moves to a new window.
103104
if (fullscreen_start_time_ && exclusive_access_tab()) {
104105
ukm::SourceId source_id =
105-
@@ -624,18 +626,19 @@ void FullscreenController::ExitFullscreenModeInternal() {
106+
@@ -634,19 +636,20 @@ void FullscreenController::ExitFullscreenModeInternal() {
106107
.Record(ukm::UkmRecorder::Get());
107108
fullscreen_start_time_.reset();
108109
}
109110
+#endif
110111

112+
fullscreen_parameters_.reset();
111113
toggled_into_fullscreen_ = false;
112114
started_fullscreen_transition_ = true;
113115
-#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_ANDROID)
@@ -126,12 +128,12 @@ index 9c29254d3400d4c52a71d7527b2db45858ce8cc2..5517cea76af4ea2b91c4a31fc359ebd0
126128
extension_url_.reset();
127129
exclusive_access_manager()->UpdateBubble(base::NullCallback());
128130
diff --git a/chrome/browser/ui/exclusive_access/fullscreen_controller.h b/chrome/browser/ui/exclusive_access/fullscreen_controller.h
129-
index f9e3ec3c61e0c9f16b13e2ee5fd447e26b49a6da..e06b1fb4a0c256c0f51ff66d06663af46c9c88ae 100644
131+
index e80fa0ad07db3b670812b7b8b4fe09e1986933be..f86bd0cbfe79462617ed191b616cb5b6237c5ce8 100644
130132
--- a/chrome/browser/ui/exclusive_access/fullscreen_controller.h
131133
+++ b/chrome/browser/ui/exclusive_access/fullscreen_controller.h
132-
@@ -256,7 +256,7 @@ class FullscreenController : public ExclusiveAccessControllerBase {
133-
// Used in testing to set the state to tab fullscreen.
134-
bool is_tab_fullscreen_for_testing_ = false;
134+
@@ -261,7 +261,7 @@ class FullscreenController : public ExclusiveAccessControllerBase {
135+
// Set of parameters used to enter fullscreen
136+
std::optional<FullscreenTabParams> fullscreen_parameters_;
135137

136138
-#if !BUILDFLAG(IS_ANDROID)
137139
+#if 0

0 commit comments

Comments
 (0)