26e1bda335* chore: bump chromium in DEPS to 140.0.7296.0
* chore: update patches
* 6702959: Remove OwnedByWidgetPassKey usage from content analysis dialog tests | https://chromium-review.googlesource.com/c/chromium/src/+/6702959
* 6722750: Remove un-used `stream_id` argument for `AidaCodeComplete` | https://chromium-review.googlesource.com/c/chromium/src/+/6722750
* 6696478: Reland Reland [video pip] Add fade in/out animation to controls visibility changes | https://chromium-review.googlesource.com/c/chromium/src/+/6696478
* chore: update libc++-filenames
* build: explicitly include cstdlib in Boyer-Moore patch
* chore: bump chromium in DEPS to 140.0.7297.0
* chore: update patches
* 6729537: [FPF] Pipe flag state from the browser to the renderer | https://chromium-review.googlesource.com/c/chromium/src/+/6729537
* 6727996: [Win] Detect pre-IPC crashes in sandboxed utility processes | https://chromium-review.googlesource.com/c/chromium/src/+/6727996
* 6707182: Move wtf/cross_thread_copier*.* to "blink" namespace | https://chromium-review.googlesource.com/c/chromium/src/+/6707182
* 6730796: extensions: Extract safe browsing/telemetry methods to new client class | https://chromium-review.googlesource.com/c/chromium/src/+/6730796
* chore: bump chromium in DEPS to 140.0.7299.0
* chore: update patches
* chore: update main patches
* build: reset the minimum macOS SDK to 15 to match upstream
This reverts commit 499e987c77.
* 6730215: Remove IPC_MESSAGE_LOG_ENABLED ifdef blocks. | https://chromium-review.googlesource.com/c/chromium/src/+/6730215
* 6690442: Delete ppapi/buildflags/buildflags.h | https://chromium-review.googlesource.com/c/chromium/src/+/6690442
* [wip]: 6667681: Use more binaries from clang toolchain in mac build | https://chromium-review.googlesource.com/c/chromium/src/+/6667681
* chore: bump chromium in DEPS to 140.0.7301.0
* chore: update patches
* 6656309: extensions: Port proxy API to desktop Android | https://chromium-review.googlesource.com/c/chromium/src/+/6656309
* 6758510: Reland 'Move GN enable_plugins variable out of //ppapi' | https://chromium-review.googlesource.com/c/chromium/src/+/6758510
* 6701466: [Extensions] Remove NaCl arch info from Update Client URLs | https://chromium-review.googlesource.com/c/chromium/src/+/6701466
* 6735979: [FSA] Replace `request_writable` with a new enum `FileSystemAccessPermissionMode`. | https://chromium-review.googlesource.com/c/chromium/src/+/6735979
* 6712080: Reland "Turn on gender translation PAK generation everywhere" | https://chromium-review.googlesource.com/c/chromium/src/+/6712080
* 6730796: extensions: Extract safe browsing/telemetry methods to new client class | https://chromium-review.googlesource.com/c/chromium/src/+/6730796
* build: restore minimum macOS SDK to 10, restore patch
This reverts commit a04c579b994d5f4a782b793a69f34ff7a260e74f.
* fixup! 6701466: [Extensions] Remove NaCl arch info from Update Client URLs | https://chromium-review.googlesource.com/c/chromium/src/+/6701466
* chore: correct node patches
* fixup! 6667681: Use more binaries from clang toolchain in mac build | https://chromium-review.googlesource.com/c/chromium/src/+/6667681
---------
Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com>
Co-authored-by: Keeley Hammond <khammond@slack-corp.com>
Co-authored-by: Keeley Hammond <vertedinde@electronjs.org>
Co-authored-by: patchup[bot] <73610968+patchup[bot]@users.noreply.github.com>
41 lines
2.2 KiB
Diff
41 lines
2.2 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Samuel Attard <samuel.r.attard@gmail.com>
|
|
Date: Tue, 5 Sep 2023 13:22:31 -0700
|
|
Subject: Revert "Remove the AllowAggressiveThrottlingWithWebSocket feature."
|
|
|
|
This reverts commit 615c1810a187840ffeb04096087efff86edb37de.
|
|
|
|
diff --git a/third_party/blink/renderer/modules/websockets/websocket_channel_impl.cc b/third_party/blink/renderer/modules/websockets/websocket_channel_impl.cc
|
|
index 2678fd5ec188cb5eac7a5cc493eb4adf7f0434af..a6b77a8284cf92448eb782a02097737985271f04 100644
|
|
--- a/third_party/blink/renderer/modules/websockets/websocket_channel_impl.cc
|
|
+++ b/third_party/blink/renderer/modules/websockets/websocket_channel_impl.cc
|
|
@@ -101,6 +101,17 @@ enum WebSocketOpCode {
|
|
kOpCodeBinary = 0x2,
|
|
};
|
|
|
|
+// When enabled, a page can be aggressively throttled even if it uses a
|
|
+// WebSocket. Aggressive throttling does not affect the execution of WebSocket
|
|
+// event handlers, so there is little reason to disable it on pages using a
|
|
+// WebSocket.
|
|
+//
|
|
+// TODO(crbug.com/1121725): Cleanup this feature in June 2021, when it becomes
|
|
+// enabled by default on Stable.
|
|
+BASE_FEATURE(kAllowAggressiveThrottlingWithWebSocket,
|
|
+ "AllowAggressiveThrottlingWithWebSocket",
|
|
+ base::FEATURE_ENABLED_BY_DEFAULT);
|
|
+
|
|
} // namespace
|
|
|
|
WebSocketChannelImpl::MessageDataDeleter::MessageDataDeleter(
|
|
@@ -294,7 +305,10 @@ bool WebSocketChannelImpl::Connect(const KURL& url, const String& protocol) {
|
|
// even if the `WebSocketChannel` is closed.
|
|
feature_handle_for_scheduler_ = scheduler->RegisterFeature(
|
|
SchedulingPolicy::Feature::kWebSocket,
|
|
- SchedulingPolicy{SchedulingPolicy::DisableBackForwardCache()});
|
|
+ base::FeatureList::IsEnabled(kAllowAggressiveThrottlingWithWebSocket)
|
|
+ ? SchedulingPolicy{SchedulingPolicy::DisableBackForwardCache()}
|
|
+ : SchedulingPolicy{SchedulingPolicy::DisableAggressiveThrottling(),
|
|
+ SchedulingPolicy::DisableBackForwardCache()});
|
|
scheduler->RegisterStickyFeature(
|
|
SchedulingPolicy::Feature::kWebSocketSticky,
|
|
SchedulingPolicy{SchedulingPolicy::DisableBackForwardCache()});
|