github/electron
1
1
Fork 0
mirror of https://github.com/electron/electron.git synced 2026-04-10 03:01:51 -04:00
Code Issues Packages Projects Releases Wiki Activity

chore: update patch indices

Browse Source
This commit is contained in:
Shelley Vohr
2021-04-09 18:16:45 +02:00
committed by Samuel Attard
parent 0fac051a0c
commit 01235ba336
35 changed files with 208 additions and 209 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
patches/chromium/add_didinstallconditionalfeatures.patch
View File

@@ -23,10 +23,10 @@ index 5a733f2086ec10d3010da52a2758e1748d1178e1..d8c7ef2e3c03f5275c1ed58849ec892f
int32_t world_id) {}
virtual void DidClearWindowObject() {}
diff --git a/content/renderer/render_frame_impl.cc b/content/renderer/render_frame_impl.cc
index 55a2ea42966e7bca9495aabbc73183bfc7df9de2..9b8a8cbafdc34c9b8216a182c881687e946b1650 100644
index 580974507f1a3007564e43b75142772b690a22c5..8999d6bbb3acc55dbedc2b36cca03862614f139f 100644
--- a/content/renderer/render_frame_impl.cc
+++ b/content/renderer/render_frame_impl.cc
@@ -4552,6 +4552,12 @@ void RenderFrameImpl::DidCreateScriptContext(v8::Local<v8::Context> context,
@@ -4540,6 +4540,12 @@ void RenderFrameImpl::DidCreateScriptContext(v8::Local<v8::Context> context,
observer.DidCreateScriptContext(context, world_id);
}
@@ -40,10 +40,10 @@ index 55a2ea42966e7bca9495aabbc73183bfc7df9de2..9b8a8cbafdc34c9b8216a182c881687e
int world_id) {
for (auto& observer : observers_)
diff --git a/content/renderer/render_frame_impl.h b/content/renderer/render_frame_impl.h
index eedbed861396c1de4faf828e23bee8b9920ba602..b4c0b684e5a710806376cc83dfcefe82c153faba 100644
index 74944d9fb6ba23c001217607bc9f07c65761b26c..7ffdbb65978239dff50403fedb5c0bcf4d00c231 100644
--- a/content/renderer/render_frame_impl.h
+++ b/content/renderer/render_frame_impl.h
@@ -585,6 +585,8 @@ class CONTENT_EXPORT RenderFrameImpl
@@ -579,6 +579,8 @@ class CONTENT_EXPORT RenderFrameImpl
blink::WebLocalFrameClient::LazyLoadBehavior lazy_load_behavior) override;
void DidCreateScriptContext(v8::Local<v8::Context> context,
int world_id) override;

6
patches/chromium/blink_local_frame.patch
View File

@@ -49,10 +49,10 @@ index b52bd3cffc6fff968c2da489c93e89f69173bcd8..684c9104e6e3c07eaf7a19e2fb00768e
// 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 af527cf40657dbd17ab4c2fa731a60c06073b43d..705e97d6c312aa106aaa974e9d07c69a74009876 100644
index 4da1c9cbfdbf611ef71c2e024bbc74c654863caf..a4f621600468c12f1495564394cd78711f8763bb 100644
--- a/third_party/blink/renderer/core/frame/local_frame.cc
+++ b/third_party/blink/renderer/core/frame/local_frame.cc
@@ -672,10 +672,6 @@ bool LocalFrame::DetachImpl(FrameDetachType type) {
@@ -674,10 +674,6 @@ bool LocalFrame::DetachImpl(FrameDetachType type) {
}
DCHECK(!view_ || !view_->IsAttached());
@@ -63,7 +63,7 @@ index af527cf40657dbd17ab4c2fa731a60c06073b43d..705e97d6c312aa106aaa974e9d07c69a
if (!Client())
return false;
@@ -717,6 +713,11 @@ bool LocalFrame::DetachImpl(FrameDetachType type) {
@@ -723,6 +719,11 @@ bool LocalFrame::DetachImpl(FrameDetachType type) {
DCHECK(!view_->IsAttached());
Client()->WillBeDetached();

6
patches/chromium/blink_world_context.patch
View File

@@ -7,7 +7,7 @@ This exposes a method for obtaining a reference to an isolated world, which is
otherwise not available in the Blink API.
diff --git a/third_party/blink/public/web/web_local_frame.h b/third_party/blink/public/web/web_local_frame.h
index 8505e1e62eab91a69bae9a409ecd51fdfbcc1896..4b792e288366ee1cbb29199fc955cbb2e94e78f2 100644
index 50702c6c3a1871b9d38ad38b5e6844f54ff2fdc5..45368849a627270a13241107e7165e020bf37d79 100644
--- a/third_party/blink/public/web/web_local_frame.h
+++ b/third_party/blink/public/web/web_local_frame.h
@@ -368,6 +368,8 @@ class WebLocalFrame : public WebFrame {
@@ -20,7 +20,7 @@ index 8505e1e62eab91a69bae9a409ecd51fdfbcc1896..4b792e288366ee1cbb29199fc955cbb2
// Executes script in the context of the current page and returns the value
// that the script evaluated to with callback. Script execution can be
diff --git a/third_party/blink/renderer/core/frame/web_local_frame_impl.cc b/third_party/blink/renderer/core/frame/web_local_frame_impl.cc
index e00a3d8189ffa348f23c0ef65636226bdc088e85..48aeac714fa736a7cf1a21dcf64834df85445cd3 100644
index 80f58a5f2762fa7e1d4aed8e64cca88ae4162c15..8660df6074865b845f1b8341cb1348adb28c2339 100644
--- a/third_party/blink/renderer/core/frame/web_local_frame_impl.cc
+++ b/third_party/blink/renderer/core/frame/web_local_frame_impl.cc
@@ -1037,6 +1037,13 @@ v8::Local<v8::Object> WebLocalFrameImpl::GlobalProxy() const {
@@ -38,7 +38,7 @@ index e00a3d8189ffa348f23c0ef65636226bdc088e85..48aeac714fa736a7cf1a21dcf64834df
return BindingSecurity::ShouldAllowAccessToFrame(
CurrentDOMWindow(V8PerIsolateData::MainThreadIsolate()),
diff --git a/third_party/blink/renderer/core/frame/web_local_frame_impl.h b/third_party/blink/renderer/core/frame/web_local_frame_impl.h
index 3e37593a263133b5c02a06f12be29961f8163c3e..0ddd40b2543de1c771a03169fbaed657ae0e58e9 100644
index 04035ce2827f28592f6a80100e9dd5912bff80cf..31edba8a2af07c0dc41bbd47b74259d1dfa1818b 100644
--- a/third_party/blink/renderer/core/frame/web_local_frame_impl.h
+++ b/third_party/blink/renderer/core/frame/web_local_frame_impl.h
@@ -166,6 +166,8 @@ class CORE_EXPORT WebLocalFrameImpl final

24
patches/chromium/can_create_window.patch
View File

@@ -9,10 +9,10 @@ potentially prevent a window from being created.
TODO(loc): this patch is currently broken.
diff --git a/content/browser/renderer_host/render_frame_host_impl.cc b/content/browser/renderer_host/render_frame_host_impl.cc
index 626e79ef10b6d469d4dac4b49db22805071722a8..3add04961c43d2461f0762b6a765156f3c3ae5c2 100644
index e5b9d4722ff48101cd3476b74076958f0baa54b2..0af3a69dff5d2509c4187f127da11c74b486fc28 100644
--- a/content/browser/renderer_host/render_frame_host_impl.cc
+++ b/content/browser/renderer_host/render_frame_host_impl.cc
@@ -5434,6 +5434,7 @@ void RenderFrameHostImpl::CreateNewWindow(
@@ -5440,6 +5440,7 @@ void RenderFrameHostImpl::CreateNewWindow(
last_committed_origin_, params->window_container_type,
params->target_url, params->referrer.To<Referrer>(),
params->frame_name, params->disposition, *params->features,
@@ -21,10 +21,10 @@ index 626e79ef10b6d469d4dac4b49db22805071722a8..3add04961c43d2461f0762b6a765156f
&no_javascript_access);
diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser/web_contents/web_contents_impl.cc
index 5df36f3afdb65ed98fcc1e75c14b1c86b0166b2f..b733ac6cd210af4d873cf91292c8ba6654b70e2a 100644
index b7e32f44573be28d975b00c7ebc9bd377cae9ff2..3a307ea6a66109e09faae4849426f9166583f977 100644
--- a/content/browser/web_contents/web_contents_impl.cc
+++ b/content/browser/web_contents/web_contents_impl.cc
@@ -3596,6 +3596,14 @@ RenderFrameHostDelegate* WebContentsImpl::CreateNewWindow(
@@ -3608,6 +3608,14 @@ RenderFrameHostDelegate* WebContentsImpl::CreateNewWindow(
}
auto* new_contents_impl = new_contents.get();
@@ -39,7 +39,7 @@ index 5df36f3afdb65ed98fcc1e75c14b1c86b0166b2f..b733ac6cd210af4d873cf91292c8ba66
new_contents_impl->GetController().SetSessionStorageNamespace(
partition_id, session_storage_namespace);
@@ -3638,12 +3646,6 @@ RenderFrameHostDelegate* WebContentsImpl::CreateNewWindow(
@@ -3650,12 +3658,6 @@ RenderFrameHostDelegate* WebContentsImpl::CreateNewWindow(
AddWebContentsDestructionObserver(new_contents_impl);
}
@@ -53,10 +53,10 @@ index 5df36f3afdb65ed98fcc1e75c14b1c86b0166b2f..b733ac6cd210af4d873cf91292c8ba66
new_contents_impl, opener, params.target_url,
params.referrer.To<Referrer>(), params.disposition,
diff --git a/content/common/frame.mojom b/content/common/frame.mojom
index fb71337543f3c967a50e8e6031c8f2f2a997ebe2..54c53188a78d1011dc6a6758f0c515c2e9060275 100644
index 32d021e049b34a72ab6cf8d86ba0c46a0046d069..f94644667683872fdb2ce3c7a66aef99faf04fdb 100644
--- a/content/common/frame.mojom
+++ b/content/common/frame.mojom
@@ -528,6 +528,10 @@ struct CreateNewWindowParams {
@@ -521,6 +521,10 @@ struct CreateNewWindowParams {
// The impression associated with the navigation in the new window, if
// one is specified.
Impression? impression;
@@ -68,7 +68,7 @@ index fb71337543f3c967a50e8e6031c8f2f2a997ebe2..54c53188a78d1011dc6a6758f0c515c2
// 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 6eaf6018ef555acda3f1df371b8b51d555121c04..421a6c9acc4079df2c5de7322d1566039a17222c 100644
index 0fadf2a320b0c7985aba4c8d19cdddf4da184a30..0d2eba4321ece3e9cfb2b16dead343dd51672714 100644
--- a/content/public/browser/content_browser_client.cc
+++ b/content/public/browser/content_browser_client.cc
@@ -560,6 +560,8 @@ bool ContentBrowserClient::CanCreateWindow(
@@ -81,7 +81,7 @@ index 6eaf6018ef555acda3f1df371b8b51d555121c04..421a6c9acc4079df2c5de7322d156603
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 ce7f8420500006145b768da2e4b68f0e0f8ecff3..90629ac2c0c17100f67e99e93148ff1556add33b 100644
index b031e69e4fe094efa8ca96cc7bc278c991e841f0..47befa844ca54f463b627864827aa670454dfed4 100644
--- a/content/public/browser/content_browser_client.h
+++ b/content/public/browser/content_browser_client.h
@@ -160,6 +160,7 @@ class NetworkService;
@@ -92,7 +92,7 @@ index ce7f8420500006145b768da2e4b68f0e0f8ecff3..90629ac2c0c17100f67e99e93148ff15
} // namespace network
namespace sandbox {
@@ -914,6 +915,8 @@ class CONTENT_EXPORT ContentBrowserClient {
@@ -915,6 +916,8 @@ class CONTENT_EXPORT ContentBrowserClient {
const std::string& frame_name,
WindowOpenDisposition disposition,
const blink::mojom::WindowFeatures& features,
@@ -221,10 +221,10 @@ index 4f735ad0d97eaac9a57dad137e479f8a7ec33a36..0a3c5821962c85609b64b3625fa6b8d6
} // 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 07eb8b3b47fa0b105e31597b86ceb0753407cabf..b3b3053dcf09c15eee7e5c989dcdfbb3e0af7201 100644
index 5d847b7086b53be5d93fde3f0a3434f0888deaba..cb27351e327b2ec074ed10ffb02b7a8a32090df7 100644
--- a/third_party/blink/renderer/core/frame/local_dom_window.cc
+++ b/third_party/blink/renderer/core/frame/local_dom_window.cc
@@ -1996,6 +1996,7 @@ DOMWindow* LocalDOMWindow::open(v8::Isolate* isolate,
@@ -1976,6 +1976,7 @@ DOMWindow* LocalDOMWindow::open(v8::Isolate* isolate,
}
WebWindowFeatures window_features = GetWindowFeaturesFromString(features);

12
patches/chromium/chore_provide_iswebcontentscreationoverridden_with_full_params.patch
View File

@@ -140,10 +140,10 @@ index 33f1168f834d138aefb190b7718271d6962b3532..aeb30a22349e0682586bd1bad20dc5e2
}
diff --git a/chrome/browser/ui/browser.cc b/chrome/browser/ui/browser.cc
index 97fc111d388ad70edfda4f2b1d68d1aa68dc8c4d..c7a7ae2676df6ef170b8fab256a9ed8684742706 100644
index 37b121e2b667d2f3f3fca2de20cc78c1d473fcab..87b76090dd396b529b7e42fc9df88389cc4ccfed 100644
--- a/chrome/browser/ui/browser.cc
+++ b/chrome/browser/ui/browser.cc
@@ -1775,12 +1775,11 @@ bool Browser::IsWebContentsCreationOverridden(
@@ -1776,12 +1776,11 @@ bool Browser::IsWebContentsCreationOverridden(
content::SiteInstance* source_site_instance,
content::mojom::WindowContainerType window_container_type,
const GURL& opener_url,
@@ -201,10 +201,10 @@ index 058ec72442d59989c4d6df4a7c791ecfeff0ef99..f7c8c2139382cb2e290c561624291afe
// The profile used for the presentation.
Profile* otr_profile_;
diff --git a/components/embedder_support/android/delegate/web_contents_delegate_android.cc b/components/embedder_support/android/delegate/web_contents_delegate_android.cc
index bf69ad20f61b6928b1a65edef324577dcc6af689..82050776a23fa7b6af4b27bd28325c10f75c5fb7 100644
index e878f49dd6cc69f5ba0b43e666277d29ed8c0d91..3a8eb296fee0ac2dda52435b58537a98d90e4467 100644
--- a/components/embedder_support/android/delegate/web_contents_delegate_android.cc
+++ b/components/embedder_support/android/delegate/web_contents_delegate_android.cc
@@ -168,14 +168,13 @@ bool WebContentsDelegateAndroid::IsWebContentsCreationOverridden(
@@ -169,14 +169,13 @@ bool WebContentsDelegateAndroid::IsWebContentsCreationOverridden(
content::SiteInstance* source_site_instance,
content::mojom::WindowContainerType window_container_type,
const GURL& opener_url,
@@ -264,10 +264,10 @@ index c5c5a7b63b5b3b62a9517cbef3ae23ce57a3c89c..4f1b7e88d6d2ae89a60311c8aeb1fcee
void AddNewContents(content::WebContents* source,
std::unique_ptr<content::WebContents> new_contents,
diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser/web_contents/web_contents_impl.cc
index 257cc8b9323843c8d04a94f150707365e84ef9ce..dfc5a8a612a9964f4f9b5697a23ca16d54a8a3fa 100644
index 0f8ab5c4eeb78b3997e4af2ef2bd9a0902803887..e91e0f35fe3ec98d299da675acfad996a0801faf 100644
--- a/content/browser/web_contents/web_contents_impl.cc
+++ b/content/browser/web_contents/web_contents_impl.cc
@@ -3548,8 +3548,7 @@ RenderFrameHostDelegate* WebContentsImpl::CreateNewWindow(
@@ -3560,8 +3560,7 @@ RenderFrameHostDelegate* WebContentsImpl::CreateNewWindow(
if (delegate_ && delegate_->IsWebContentsCreationOverridden(
source_site_instance, params.window_container_type,

4
patches/chromium/chore_use_electron_resources_not_chrome_for_spellchecker.patch
View File

@@ -7,10 +7,10 @@ spellchecker uses a few IDS_ resources. We need to load these from
Electrons grit header instead of Chromes
diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
index bfdcfaaf749926032864738d832c6f116d760271..2aa87be9a6f539a2e937de1a0909299b123bf7e2 100644
index c7970e581a9760eb1a077baf1bb9e177aafacb93..91b4e8d440ee867fbaad651d5849d6b002dc59a8 100644
--- a/chrome/browser/BUILD.gn
+++ b/chrome/browser/BUILD.gn
@@ -6291,6 +6291,7 @@ static_library("browser") {
@@ -6262,6 +6262,7 @@ static_library("browser") {
deps += [
"//components/spellcheck/browser",
"//components/spellcheck/common",

161
patches/chromium/command-ismediakey.patch
View File

@@ -10,27 +10,6 @@ Also apply electron/electron@0f67b1866a9f00b852370e721affa4efda623f3a
and electron/electron@d2368d2d3b3de9eec4cc32b6aaf035cc89921bf1 as
patches.
diff --git a/chrome/browser/extensions/global_shortcut_listener_win.cc b/chrome/browser/extensions/global_shortcut_listener_win.cc
index 0f344ee352a48497e77a72bb298146c61e7fcf2a..3bad4263ea552fc63445bf5613f8add746a3a374 100644
--- a/chrome/browser/extensions/global_shortcut_listener_win.cc
+++ b/chrome/browser/extensions/global_shortcut_listener_win.cc
@@ -62,6 +62,8 @@ void GlobalShortcutListenerWin::OnWndProc(HWND hwnd,
modifiers |= (LOWORD(lparam) & MOD_SHIFT) ? ui::EF_SHIFT_DOWN : 0;
modifiers |= (LOWORD(lparam) & MOD_ALT) ? ui::EF_ALT_DOWN : 0;
modifiers |= (LOWORD(lparam) & MOD_CONTROL) ? ui::EF_CONTROL_DOWN : 0;
+ modifiers |= (LOWORD(lparam) & MOD_WIN) ? ui::EF_COMMAND_DOWN : 0;
+
ui::Accelerator accelerator(
ui::KeyboardCodeForWindowsKeyCode(key_code), modifiers);
@@ -92,6 +94,7 @@ bool GlobalShortcutListenerWin::RegisterAcceleratorImpl(
modifiers |= accelerator.IsShiftDown() ? MOD_SHIFT : 0;
modifiers |= accelerator.IsCtrlDown() ? MOD_CONTROL : 0;
modifiers |= accelerator.IsAltDown() ? MOD_ALT : 0;
+ modifiers |= accelerator.IsCmdDown() ? MOD_WIN : 0;
// Create an observer that registers a hot key for |accelerator|.
std::unique_ptr<gfx::SingletonHwndHotKeyObserver> observer =
diff --git a/chrome/browser/extensions/global_shortcut_listener_ozone.cc b/chrome/browser/extensions/global_shortcut_listener_ozone.cc
index d6d896b87bb327bd7387335bd5bbac4616316f1e..ec0293ba8b66df5c9a34435cb2a0c9a333ebdf7a 100644
--- a/chrome/browser/extensions/global_shortcut_listener_ozone.cc
@@ -86,6 +65,27 @@ index 27655641551afe9763cd76afe366f04e56efbbc6..14ff891a057464a1bd570cb14e127ce8
void OnPlatformListenerDestroyed() override;
bool is_listening_ = false;
diff --git a/chrome/browser/extensions/global_shortcut_listener_win.cc b/chrome/browser/extensions/global_shortcut_listener_win.cc
index 0f344ee352a48497e77a72bb298146c61e7fcf2a..3bad4263ea552fc63445bf5613f8add746a3a374 100644
--- a/chrome/browser/extensions/global_shortcut_listener_win.cc
+++ b/chrome/browser/extensions/global_shortcut_listener_win.cc
@@ -62,6 +62,8 @@ void GlobalShortcutListenerWin::OnWndProc(HWND hwnd,
modifiers |= (LOWORD(lparam) & MOD_SHIFT) ? ui::EF_SHIFT_DOWN : 0;
modifiers |= (LOWORD(lparam) & MOD_ALT) ? ui::EF_ALT_DOWN : 0;
modifiers |= (LOWORD(lparam) & MOD_CONTROL) ? ui::EF_CONTROL_DOWN : 0;
+ modifiers |= (LOWORD(lparam) & MOD_WIN) ? ui::EF_COMMAND_DOWN : 0;
+
ui::Accelerator accelerator(
ui::KeyboardCodeForWindowsKeyCode(key_code), modifiers);
@@ -92,6 +94,7 @@ bool GlobalShortcutListenerWin::RegisterAcceleratorImpl(
modifiers |= accelerator.IsShiftDown() ? MOD_SHIFT : 0;
modifiers |= accelerator.IsCtrlDown() ? MOD_CONTROL : 0;
modifiers |= accelerator.IsAltDown() ? MOD_ALT : 0;
+ modifiers |= accelerator.IsCmdDown() ? MOD_WIN : 0;
// Create an observer that registers a hot key for |accelerator|.
std::unique_ptr<gfx::SingletonHwndHotKeyObserver> observer =
diff --git a/chrome/browser/extensions/global_shortcut_listener_x11.cc b/chrome/browser/extensions/global_shortcut_listener_x11.cc
index ab719d290288a0cd35851f4e952b39180f4f3a22..882bd38d886d3b499fa8a6403c409fcee1374953 100644
--- a/chrome/browser/extensions/global_shortcut_listener_x11.cc
@@ -141,6 +141,65 @@ index 49d1c3224fdab07526a6150318d7603bf4a3f27c..3aab0d9033554035ca2b0909f219592d
std::set<ui::Accelerator> registered_hot_keys_;
};
diff --git a/content/browser/media/media_keys_listener_manager_impl.cc b/content/browser/media/media_keys_listener_manager_impl.cc
index 4145418210c2b1033390ec8a2e657cb1fcd048f8..5938f75742b793868638e693a9a8c8dc686dfc46 100644
--- a/content/browser/media/media_keys_listener_manager_impl.cc
+++ b/content/browser/media/media_keys_listener_manager_impl.cc
@@ -290,6 +290,11 @@ void MediaKeysListenerManagerImpl::UpdateSystemMediaControlsEnabledControls() {
case ui::VKEY_MEDIA_STOP:
system_media_controls_->SetIsStopEnabled(should_enable);
break;
+ case ui::VKEY_VOLUME_DOWN:
+ case ui::VKEY_VOLUME_UP:
+ case ui::VKEY_VOLUME_MUTE:
+ // Do nothing.
+ break;
default:
NOTREACHED();
}
diff --git a/ui/base/accelerators/media_keys_listener.cc b/ui/base/accelerators/media_keys_listener.cc
index 1145e1f3d79482b5bb468c3128431ac674310e5f..e9f595045e0c076e0735f27dfc38bfbc7951d372 100644
--- a/ui/base/accelerators/media_keys_listener.cc
+++ b/ui/base/accelerators/media_keys_listener.cc
@@ -13,7 +13,8 @@ MediaKeysListener::~MediaKeysListener() = default;
// static
bool MediaKeysListener::IsMediaKeycode(KeyboardCode key_code) {
return key_code == VKEY_MEDIA_PLAY_PAUSE || key_code == VKEY_MEDIA_STOP ||
- key_code == VKEY_MEDIA_PREV_TRACK || key_code == VKEY_MEDIA_NEXT_TRACK;
+ key_code == VKEY_MEDIA_PREV_TRACK || key_code == VKEY_MEDIA_NEXT_TRACK ||
+ key_code == VKEY_VOLUME_UP || key_code == VKEY_VOLUME_DOWN || key_code == VKEY_VOLUME_MUTE;
}
} // namespace ui
diff --git a/ui/base/accelerators/media_keys_listener_mac.mm b/ui/base/accelerators/media_keys_listener_mac.mm
index 60f7ad6ffb28fa6554e02a7e031408f4d1124d86..0e8325e993178443d926249c427957bb16991861 100644
--- a/ui/base/accelerators/media_keys_listener_mac.mm
+++ b/ui/base/accelerators/media_keys_listener_mac.mm
@@ -32,6 +32,12 @@ KeyboardCode MediaKeyCodeToKeyboardCode(int key_code) {
case NX_KEYTYPE_NEXT:
case NX_KEYTYPE_FAST:
return VKEY_MEDIA_NEXT_TRACK;
+ case NX_KEYTYPE_SOUND_UP:
+ return VKEY_VOLUME_UP;
+ case NX_KEYTYPE_SOUND_DOWN:
+ return VKEY_VOLUME_DOWN;
+ case NX_KEYTYPE_MUTE:
+ return VKEY_VOLUME_MUTE;
}
return VKEY_UNKNOWN;
}
@@ -191,7 +197,10 @@ static CGEventRef EventTapCallback(CGEventTapProxy proxy,
int key_code = (data1 & 0xFFFF0000) >> 16;
if (key_code != NX_KEYTYPE_PLAY && key_code != NX_KEYTYPE_NEXT &&
key_code != NX_KEYTYPE_PREVIOUS && key_code != NX_KEYTYPE_FAST &&
- key_code != NX_KEYTYPE_REWIND) {
+ key_code != NX_KEYTYPE_REWIND &&
+ key_code != NX_KEYTYPE_SOUND_UP &&
+ key_code != NX_KEYTYPE_SOUND_DOWN &&
+ key_code != NX_KEYTYPE_MUTE) {
return event;
}
diff --git a/ui/base/x/x11_global_shortcut_listener.cc b/ui/base/x/x11_global_shortcut_listener.cc
index 658c04c865f0e0f17501fc97965adc3bd56c709a..8c693eecbca10cd8b287fdd504d498e6a5e72e96 100644
--- a/ui/base/x/x11_global_shortcut_listener.cc
@@ -250,63 +309,3 @@ index 9e472d76423a748cbf6257c6656d8fd69853dd93..87ee1a5f8c6cd3587f96258ed548690c
private:
// Due to how system key grabbing works on X11, we have to be a bit greedy and
diff --git a/content/browser/media/media_keys_listener_manager_impl.cc b/content/browser/media/media_keys_listener_manager_impl.cc
index 4145418210c2b1033390ec8a2e657cb1fcd048f8..5938f75742b793868638e693a9a8c8dc686dfc46 100644
--- a/content/browser/media/media_keys_listener_manager_impl.cc
+++ b/content/browser/media/media_keys_listener_manager_impl.cc
@@ -290,6 +290,11 @@ void MediaKeysListenerManagerImpl::UpdateSystemMediaControlsEnabledControls() {
case ui::VKEY_MEDIA_STOP:
system_media_controls_->SetIsStopEnabled(should_enable);
break;
+ case ui::VKEY_VOLUME_DOWN:
+ case ui::VKEY_VOLUME_UP:
+ case ui::VKEY_VOLUME_MUTE:
+ // Do nothing.
+ break;
default:
NOTREACHED();
}
diff --git a/ui/base/accelerators/media_keys_listener.cc b/ui/base/accelerators/media_keys_listener.cc
index 1145e1f3d79482b5bb468c3128431ac674310e5f..e9f595045e0c076e0735f27dfc38bfbc7951d372 100644
--- a/ui/base/accelerators/media_keys_listener.cc
+++ b/ui/base/accelerators/media_keys_listener.cc
@@ -13,7 +13,8 @@ MediaKeysListener::~MediaKeysListener() = default;
// static
bool MediaKeysListener::IsMediaKeycode(KeyboardCode key_code) {
return key_code == VKEY_MEDIA_PLAY_PAUSE || key_code == VKEY_MEDIA_STOP ||
- key_code == VKEY_MEDIA_PREV_TRACK || key_code == VKEY_MEDIA_NEXT_TRACK;
+ key_code == VKEY_MEDIA_PREV_TRACK || key_code == VKEY_MEDIA_NEXT_TRACK ||
+ key_code == VKEY_VOLUME_UP || key_code == VKEY_VOLUME_DOWN || key_code == VKEY_VOLUME_MUTE;
}
} // namespace ui
diff --git a/ui/base/accelerators/media_keys_listener_mac.mm b/ui/base/accelerators/media_keys_listener_mac.mm
index 60f7ad6ffb28fa6554e02a7e031408f4d1124d86..0e8325e993178443d926249c427957bb16991861 100644
--- a/ui/base/accelerators/media_keys_listener_mac.mm
+++ b/ui/base/accelerators/media_keys_listener_mac.mm
@@ -32,6 +32,12 @@ KeyboardCode MediaKeyCodeToKeyboardCode(int key_code) {
case NX_KEYTYPE_NEXT:
case NX_KEYTYPE_FAST:
return VKEY_MEDIA_NEXT_TRACK;
+ case NX_KEYTYPE_SOUND_UP:
+ return VKEY_VOLUME_UP;
+ case NX_KEYTYPE_SOUND_DOWN:
+ return VKEY_VOLUME_DOWN;
+ case NX_KEYTYPE_MUTE:
+ return VKEY_VOLUME_MUTE;
}
return VKEY_UNKNOWN;
}
@@ -191,7 +197,10 @@ static CGEventRef EventTapCallback(CGEventTapProxy proxy,
int key_code = (data1 & 0xFFFF0000) >> 16;
if (key_code != NX_KEYTYPE_PLAY && key_code != NX_KEYTYPE_NEXT &&
key_code != NX_KEYTYPE_PREVIOUS && key_code != NX_KEYTYPE_FAST &&
- key_code != NX_KEYTYPE_REWIND) {
+ key_code != NX_KEYTYPE_REWIND &&
+ key_code != NX_KEYTYPE_SOUND_UP &&
+ key_code != NX_KEYTYPE_SOUND_DOWN &&
+ key_code != NX_KEYTYPE_MUTE) {
return event;
}

30
patches/chromium/disable_color_correct_rendering.patch
View File

@@ -81,7 +81,7 @@ index 4dbfd138a467462bae4ff062d9a8062b76ecaa4c..cc7c95bb0f4e6ec6b3579ced90a0f103
!command_line->HasSwitch(switches::kUIDisablePartialSwap);
#if defined(OS_APPLE)
diff --git a/components/viz/service/display/gl_renderer.cc b/components/viz/service/display/gl_renderer.cc
index 74ff0db39229e2a85feebf3f753ad9073adca142..0da3f016948b87dab9f55e7b836bdec8073627b7 100644
index de998b97d01272e90a6e77a3fef66ece15c06115..5c3508bf29a96560442c6ee8a95c792dd77d08f7 100644
--- a/components/viz/service/display/gl_renderer.cc
+++ b/components/viz/service/display/gl_renderer.cc
@@ -88,6 +88,9 @@
@@ -106,7 +106,7 @@ index 74ff0db39229e2a85feebf3f753ad9073adca142..0da3f016948b87dab9f55e7b836bdec8
// Use the full quad_rect for debug quads to not move the edges based on
// partial swaps.
@@ -1666,7 +1670,8 @@ void GLRenderer::ChooseRPDQProgram(DrawRenderPassDrawQuadParams* params,
@@ -1671,7 +1675,8 @@ void GLRenderer::ChooseRPDQProgram(DrawRenderPassDrawQuadParams* params,
params->use_color_matrix, tint_gl_composited_content_,
params->apply_shader_based_rounded_corner &&
ShouldApplyRoundedCorner(params->quad)),
@@ -116,7 +116,7 @@ index 74ff0db39229e2a85feebf3f753ad9073adca142..0da3f016948b87dab9f55e7b836bdec8
}
void GLRenderer::UpdateRPDQUniforms(DrawRenderPassDrawQuadParams* params) {
@@ -2139,15 +2144,16 @@ void GLRenderer::DrawSolidColorQuad(const SolidColorDrawQuad* quad,
@@ -2144,15 +2149,16 @@ void GLRenderer::DrawSolidColorQuad(const SolidColorDrawQuad* quad,
SetUseProgram(ProgramKey::SolidColor(use_aa ? USE_AA : NO_AA,
tint_gl_composited_content_,
ShouldApplyRoundedCorner(quad)),
@@ -136,7 +136,7 @@ index 74ff0db39229e2a85feebf3f753ad9073adca142..0da3f016948b87dab9f55e7b836bdec8
gfx::ColorTransform::TriStim col(color_f.fR, color_f.fG, color_f.fB);
color_transform->Transform(&col, 1);
color_f.fR = col.x();
@@ -2369,7 +2375,8 @@ void GLRenderer::DrawContentQuadAA(const ContentDrawQuadBase* quad,
@@ -2374,7 +2380,8 @@ void GLRenderer::DrawContentQuadAA(const ContentDrawQuadBase* quad,
: NON_PREMULTIPLIED_ALPHA,
false, false, tint_gl_composited_content_,
ShouldApplyRoundedCorner(quad)),
@@ -146,7 +146,7 @@ index 74ff0db39229e2a85feebf3f753ad9073adca142..0da3f016948b87dab9f55e7b836bdec8
if (current_program_->tint_color_matrix_location() != -1) {
auto matrix = cc::DebugColors::TintCompositedContentColorTransformMatrix();
@@ -2468,7 +2475,8 @@ void GLRenderer::DrawContentQuadNoAA(const ContentDrawQuadBase* quad,
@@ -2473,7 +2480,8 @@ void GLRenderer::DrawContentQuadNoAA(const ContentDrawQuadBase* quad,
!quad->ShouldDrawWithBlending(), has_tex_clamp_rect,
tint_gl_composited_content_,
ShouldApplyRoundedCorner(quad)),
@@ -156,7 +156,7 @@ index 74ff0db39229e2a85feebf3f753ad9073adca142..0da3f016948b87dab9f55e7b836bdec8
if (current_program_->tint_color_matrix_location() != -1) {
auto matrix = cc::DebugColors::TintCompositedContentColorTransformMatrix();
@@ -2578,7 +2586,8 @@ void GLRenderer::DrawYUVVideoQuad(const YUVVideoDrawQuad* quad,
@@ -2583,7 +2591,8 @@ void GLRenderer::DrawYUVVideoQuad(const YUVVideoDrawQuad* quad,
// The source color space should never be RGB.
DCHECK_NE(src_color_space, src_color_space.GetAsFullRangeRGB());
@@ -166,7 +166,7 @@ index 74ff0db39229e2a85feebf3f753ad9073adca142..0da3f016948b87dab9f55e7b836bdec8
#if defined(OS_WIN)
// Force sRGB output on Windows for overlay candidate video quads to match
@@ -2759,7 +2768,8 @@ void GLRenderer::DrawStreamVideoQuad(const StreamVideoDrawQuad* quad,
@@ -2764,7 +2773,8 @@ void GLRenderer::DrawStreamVideoQuad(const StreamVideoDrawQuad* quad,
SetUseProgram(ProgramKey::VideoStream(tex_coord_precision,
ShouldApplyRoundedCorner(quad)),
@@ -176,7 +176,7 @@ index 74ff0db39229e2a85feebf3f753ad9073adca142..0da3f016948b87dab9f55e7b836bdec8
DCHECK_EQ(GL_TEXTURE0, GetActiveTextureUnit(gl_));
gl_->BindTexture(GL_TEXTURE_EXTERNAL_OES, lock.texture_id());
@@ -2830,8 +2840,8 @@ void GLRenderer::FlushTextureQuadCache(BoundGeometry flush_binding) {
@@ -2835,8 +2845,8 @@ void GLRenderer::FlushTextureQuadCache(BoundGeometry flush_binding) {
draw_cache_.nearest_neighbor ? GL_NEAREST : GL_LINEAR);
// Bind the program to the GL state.
@@ -187,7 +187,7 @@ index 74ff0db39229e2a85feebf3f753ad9073adca142..0da3f016948b87dab9f55e7b836bdec8
/*adjust_src_white_level=*/draw_cache_.is_video_frame);
if (current_program_->rounded_corner_rect_location() != -1) {
@@ -3659,7 +3669,9 @@ void GLRenderer::SetUseProgram(const ProgramKey& program_key_no_color,
@@ -3664,7 +3674,9 @@ void GLRenderer::SetUseProgram(const ProgramKey& program_key_no_color,
const gfx::ColorSpace& src_color_space,
const gfx::ColorSpace& dst_color_space,
bool adjust_src_white_level) {
@@ -198,7 +198,7 @@ index 74ff0db39229e2a85feebf3f753ad9073adca142..0da3f016948b87dab9f55e7b836bdec8
gfx::ColorSpace adjusted_src_color_space = src_color_space;
if (adjust_src_white_level) {
// If the input color space is HDR, and it did not specify a white level,
@@ -4037,9 +4049,9 @@ void GLRenderer::CopyRenderPassDrawQuadToOverlayResource(
@@ -4042,9 +4054,9 @@ void GLRenderer::CopyRenderPassDrawQuadToOverlayResource(
cc::MathUtil::CheckedRoundUp(iosurface_height, iosurface_multiple);
}
@@ -211,7 +211,7 @@ index 74ff0db39229e2a85feebf3f753ad9073adca142..0da3f016948b87dab9f55e7b836bdec8
*new_bounds = gfx::RectF(updated_dst_rect.origin(),
gfx::SizeF((*overlay_texture)->texture.size()));
@@ -4259,8 +4271,8 @@ void GLRenderer::FlushOverdrawFeedback(const gfx::Rect& output_rect) {
@@ -4264,8 +4276,8 @@ void GLRenderer::FlushOverdrawFeedback(const gfx::Rect& output_rect) {
PrepareGeometry(SHARED_BINDING);
@@ -222,14 +222,14 @@ index 74ff0db39229e2a85feebf3f753ad9073adca142..0da3f016948b87dab9f55e7b836bdec8
gfx::Transform render_matrix;
render_matrix.Translate(0.5 * output_rect.width() + output_rect.x(),
@@ -4450,3 +4462,5 @@ GLRenderer::OverlayTexture::OverlayTexture() = default;
@@ -4455,3 +4467,5 @@ GLRenderer::OverlayTexture::OverlayTexture() = default;
GLRenderer::OverlayTexture::~OverlayTexture() = default;
} // namespace viz
+
+#undef PATCH_CS
diff --git a/content/browser/gpu/gpu_process_host.cc b/content/browser/gpu/gpu_process_host.cc
index cfdcd88441ea797a3fd48d2754113a89db21daf6..cb5203f4684c83f0e419ec10fdb9960e822023a4 100644
index 9b18e1b5c476f199cc46d57e9fd5d57e07964c33..dd897f6991ed9ef0f8437170cdd52e579480593c 100644
--- a/content/browser/gpu/gpu_process_host.cc
+++ b/content/browser/gpu/gpu_process_host.cc
@@ -224,6 +224,7 @@ GpuTerminationStatus ConvertToGpuTerminationStatus(
@@ -241,7 +241,7 @@ index cfdcd88441ea797a3fd48d2754113a89db21daf6..cb5203f4684c83f0e419ec10fdb9960e
sandbox::policy::switches::kGpuSandboxAllowSysVShm,
sandbox::policy::switches::kGpuSandboxFailuresFatal,
diff --git a/content/browser/renderer_host/render_process_host_impl.cc b/content/browser/renderer_host/render_process_host_impl.cc
index 26db3958ef5a7f475eefe07476690839b1f6224f..29f9d639496a6ef5e24520f9abf8231c24786b1c 100644
index 7b9c07b33a70ba95e8ec7b909fefd3c0cc8cee9d..70fdcbc234a3d943988005fd2917796014e20176 100644
--- a/content/browser/renderer_host/render_process_host_impl.cc
+++ b/content/browser/renderer_host/render_process_host_impl.cc
@@ -212,6 +212,7 @@
@@ -252,7 +252,7 @@ index 26db3958ef5a7f475eefe07476690839b1f6224f..29f9d639496a6ef5e24520f9abf8231c
#include "ui/gl/gl_switches.h"
#include "ui/native_theme/native_theme_features.h"
#include "url/origin.h"
@@ -3157,6 +3158,7 @@ void RenderProcessHostImpl::PropagateBrowserCommandLineToRenderer(
@@ -3197,6 +3198,7 @@ void RenderProcessHostImpl::PropagateBrowserCommandLineToRenderer(
// Propagate the following switches to the renderer command line (along
// with any associated values) if present in the browser command line.
static const char* const kSwitchNames[] = {

4
patches/chromium/disable_hidden.patch
View File

@@ -6,10 +6,10 @@ Subject: disable_hidden.patch
Electron uses this to disable background throttling for hidden windows.
diff --git a/content/browser/renderer_host/render_widget_host_impl.cc b/content/browser/renderer_host/render_widget_host_impl.cc
index 5d773621a64c248dc889bdaf0aaf729b6496ca31..58db1ea17dd657397cd1f7ffbbbfd68a9c633446 100644
index a0e7d4a24f658ef3c76b7ba0109b0ebca2180c0c..76bce6517555132e3f873c8294eb0ed5d2a3a87a 100644
--- a/content/browser/renderer_host/render_widget_host_impl.cc
+++ b/content/browser/renderer_host/render_widget_host_impl.cc
@@ -709,6 +709,9 @@ void RenderWidgetHostImpl::WasHidden() {
@@ -711,6 +711,9 @@ void RenderWidgetHostImpl::WasHidden() {
if (is_hidden_)
return;

6
patches/chromium/disable_unload_metrics.patch
View File

@@ -24,10 +24,10 @@ This patch temporarily disables the metrics so we can have green CI, and we
should continue seeking for a real fix.
diff --git a/content/browser/renderer_host/navigator.cc b/content/browser/renderer_host/navigator.cc
index a60cc27c4384d1aaab75f3b913fca1943780b54e..e11ce8bc595b513b9e3c84b3216aef66e812d0c4 100644
index a1ac14539687960c31f5cf0e6d1140937cd83e33..3864a055c817c3dfbf5f1c8659e99d0ec0797dc1 100644
--- a/content/browser/renderer_host/navigator.cc
+++ b/content/browser/renderer_host/navigator.cc
@@ -1018,6 +1018,7 @@ void Navigator::RecordNavigationMetrics(
@@ -1055,6 +1055,7 @@ void Navigator::RecordNavigationMetrics(
.InMilliseconds());
}
@@ -35,7 +35,7 @@ index a60cc27c4384d1aaab75f3b913fca1943780b54e..e11ce8bc595b513b9e3c84b3216aef66
// If this is a same-process navigation and we have timestamps for unload
// durations, fill those metrics out as well.
if (params.unload_start && params.unload_end &&
@@ -1064,6 +1065,7 @@ void Navigator::RecordNavigationMetrics(
@@ -1101,6 +1102,7 @@ void Navigator::RecordNavigationMetrics(
first_before_unload_start_time)
.InMilliseconds());
}

4
patches/chromium/don_t_use_potentially_null_getwebframe_-_view_when_get_blink.patch
View File

@@ -11,10 +11,10 @@ This regressed in https://chromium-review.googlesource.com/c/chromium/src/+/2572
Upstream: https://chromium-review.googlesource.com/c/chromium/src/+/2598393
diff --git a/content/renderer/render_frame_impl.cc b/content/renderer/render_frame_impl.cc
index 68caa1d044eb5fe437f861f53b5e12efd904879e..0b23b2ea39f1ce3d4645057a0c3324f4237949f1 100644
index 3e1eb1d3a54566627c33a268a5ff8e3500c58616..d5009d7d2204e5adf59234a84707ac69cc3e4520 100644
--- a/content/renderer/render_frame_impl.cc
+++ b/content/renderer/render_frame_impl.cc
@@ -2629,7 +2629,7 @@ blink::WebLocalFrame* RenderFrameImpl::GetWebFrame() {
@@ -2617,7 +2617,7 @@ blink::WebLocalFrame* RenderFrameImpl::GetWebFrame() {
}
const blink::web_pref::WebPreferences& RenderFrameImpl::GetBlinkPreferences() {

4
patches/chromium/feat_add_set_theme_source_to_allow_apps_to.patch
View File

@@ -13,10 +13,10 @@ uses internally for things like menus and devtools.
We can remove this patch once it has in some shape been upstreamed.
diff --git a/ui/native_theme/native_theme.cc b/ui/native_theme/native_theme.cc
index 63baac7dfc28f34193493f287208990bb00f0f51..5497bb92f408323e853451faea34fee8254eb2d4 100644
index 998e819abb47ebc14ba6c4fa8929eb0577d1867a..15bee858e16cbbca626d1fa31ed5bcd08dcc1cb9 100644
--- a/ui/native_theme/native_theme.cc
+++ b/ui/native_theme/native_theme.cc
@@ -332,6 +332,8 @@ base::Optional<SkColor> NativeTheme::GetColorProviderColor(
@@ -132,6 +132,8 @@ base::Optional<SkColor> NativeTheme::GetColorProviderColor(
}
bool NativeTheme::ShouldUseDarkColors() const {

6
patches/chromium/feat_allow_disabling_blink_scheduler_throttling_per_renderview.patch
View File

@@ -85,10 +85,10 @@ index 209067240ccce0458882ad008363cdb996dd1a80..eaacca18d1488b3a2f7445bb44949ccb
// Visibility -----------------------------------------------------------
diff --git a/third_party/blink/renderer/core/exported/web_view_impl.cc b/third_party/blink/renderer/core/exported/web_view_impl.cc
index 79ace5f2d480ab9951ff04c9b7deba46d4ce1050..eb740d3685c2226f5af55dca1224bd5348ea0d0e 100644
index f8ac3ecb711fae5650201cc4058083563447e9f6..55ce52d8c72b24d3397f6dd8a6b3237541835ce3 100644
--- a/third_party/blink/renderer/core/exported/web_view_impl.cc
+++ b/third_party/blink/renderer/core/exported/web_view_impl.cc
@@ -3554,6 +3554,13 @@ PageScheduler* WebViewImpl::Scheduler() const {
@@ -3547,6 +3547,13 @@ PageScheduler* WebViewImpl::Scheduler() const {
return GetPage()->GetPageScheduler();
}
@@ -102,7 +102,7 @@ index 79ace5f2d480ab9951ff04c9b7deba46d4ce1050..eb740d3685c2226f5af55dca1224bd53
void WebViewImpl::SetVisibilityState(
mojom::blink::PageVisibilityState visibility_state,
bool is_initial_state) {
@@ -3566,7 +3573,8 @@ void WebViewImpl::SetVisibilityState(
@@ -3559,7 +3566,8 @@ void WebViewImpl::SetVisibilityState(
}
GetPage()->SetVisibilityState(visibility_state, is_initial_state);
GetPage()->GetPageScheduler()->SetPageVisible(

4
patches/chromium/feat_enable_offscreen_rendering_with_viz_compositor.patch
View File

@@ -511,10 +511,10 @@ index 7d804bdc81608b2e93e5e66503cd42bdc0c46b1f..632814810b3b3d2e3a6560563aae045b
// Creating output surface failed. The host can send a new request, possibly
// with a different compositing mode.
diff --git a/content/browser/compositor/viz_process_transport_factory.cc b/content/browser/compositor/viz_process_transport_factory.cc
index 11ac1649ed0f5be1d12e8a30b8d170f86b8e9bb8..05746d9a561c3933ae0c5578467f20b486453943 100644
index 2d80f84280b5a636d5e06958582c7aa931a2eadc..ca49f59d4795c49a57fdbe0548b8d254e71ab757 100644
--- a/content/browser/compositor/viz_process_transport_factory.cc
+++ b/content/browser/compositor/viz_process_transport_factory.cc
@@ -414,8 +414,14 @@ void VizProcessTransportFactory::OnEstablishedGpuChannel(
@@ -418,8 +418,14 @@ void VizProcessTransportFactory::OnEstablishedGpuChannel(
compositor_data.display_private.reset();
root_params->display_private =
compositor_data.display_private.BindNewEndpointAndPassReceiver();

4
patches/chromium/fix_route_mouse_event_navigations_through_the_web_contents_delegate.patch
View File

@@ -13,10 +13,10 @@ This patch can be removed once app.allowRendererProcessReuse is forced
to true as then Chromiums assumptions around processes become correct.
diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser/web_contents/web_contents_impl.cc
index a9195bdbded68a967bbb16df3731ac0011c5dbff..a5e77ef77f89d0da6b0c9c0638e91f905b0c74fc 100644
index b6f93e3b8b719d28d21984abf305c839755fda48..b964f104f044ed2bf6259f0c58b6dce5387b008b 100644
--- a/content/browser/web_contents/web_contents_impl.cc
+++ b/content/browser/web_contents/web_contents_impl.cc
@@ -3015,11 +3015,13 @@ bool WebContentsImpl::HandleMouseEvent(const blink::WebMouseEvent& event) {
@@ -3027,11 +3027,13 @@ bool WebContentsImpl::HandleMouseEvent(const blink::WebMouseEvent& event) {
WebContentsImpl* outermost = GetOutermostWebContents();
if (event.button == blink::WebPointerProperties::Button::kBack &&
outermost->GetController().CanGoBack()) {

2
patches/chromium/fix_use_electron_generated_resources.patch
View File

@@ -12,7 +12,7 @@ as they will loaded as empty strings.
* IDS_UTILITY_PROCESS_PRINTING_SERVICE_NAME on Windows
diff --git a/chrome/browser/pdf/pdf_extension_util.cc b/chrome/browser/pdf/pdf_extension_util.cc
index 0944d8c843985ee2f72e28bca37105a681cb82bb..6b1a3a1b7f8b776323d321d0b425e040654646a9 100644
index f4dd5157210dafc93b40055f1179c730c9809ff3..f9fa3a8146b41f81fe8ec7c6e60f5c257e953387 100644
--- a/chrome/browser/pdf/pdf_extension_util.cc
+++ b/chrome/browser/pdf/pdf_extension_util.cc
@@ -9,8 +9,7 @@

30
patches/chromium/frame_host_manager.patch
View File

@@ -8,10 +8,10 @@ and respond with custom instance. Also allows for us to at-runtime
enable or disable this patch.
diff --git a/content/browser/browsing_instance.cc b/content/browser/browsing_instance.cc
index b21dc7ca8847378ca87df6dd1a76ff79fbbf0a07..d0badbd48c1ac19d899dc65e73c699df5548c00f 100644
index 30e374aeba7aceacdb58add9c79cb46c6b93af4d..3e34643c4e1d5561c6c7b01e3de8cdd46910afb0 100644
--- a/content/browser/browsing_instance.cc
+++ b/content/browser/browsing_instance.cc
@@ -77,6 +77,13 @@ scoped_refptr<SiteInstanceImpl> BrowsingInstance::GetSiteInstanceForURL(
@@ -61,6 +61,13 @@ scoped_refptr<SiteInstanceImpl> BrowsingInstance::GetSiteInstanceForURL(
return instance;
}
@@ -26,10 +26,10 @@ index b21dc7ca8847378ca87df6dd1a76ff79fbbf0a07..d0badbd48c1ac19d899dc65e73c699df
bool allow_default_instance) {
scoped_refptr<SiteInstanceImpl> site_instance =
diff --git a/content/browser/browsing_instance.h b/content/browser/browsing_instance.h
index 65e627f2fa89352b0be27b5813d71a622bf1d326..113f4fd00f1cf994b39f64c9da38785545ba321f 100644
index f426d1ebdaa9d13c7e47f22ce617e2b61a862854..26907541dd4268e3f8c82676bdda892bd1ed04e7 100644
--- a/content/browser/browsing_instance.h
+++ b/content/browser/browsing_instance.h
@@ -149,6 +149,11 @@ class CONTENT_EXPORT BrowsingInstance final
@@ -151,6 +151,11 @@ class CONTENT_EXPORT BrowsingInstance final
const UrlInfo& url_info,
bool allow_default_instance);
@@ -42,10 +42,10 @@ index 65e627f2fa89352b0be27b5813d71a622bf1d326..113f4fd00f1cf994b39f64c9da387855
// another SiteInstance for the same site.
void RegisterSiteInstance(SiteInstanceImpl* site_instance);
diff --git a/content/browser/renderer_host/navigation_request.cc b/content/browser/renderer_host/navigation_request.cc
index d3f9eb74b0323577f37b98c81a7ac739c9a85488..6216a650ef69f7931981edfc221bb4f304ef14b8 100644
index 12132d0bc651adf1b912712fa667062027ebce34..03cf7c0eb2b13d36b4c56cd73d3a9a9da992d887 100644
--- a/content/browser/renderer_host/navigation_request.cc
+++ b/content/browser/renderer_host/navigation_request.cc
@@ -1567,6 +1567,21 @@ void NavigationRequest::BeginNavigation() {
@@ -1568,6 +1568,21 @@ void NavigationRequest::BeginNavigation() {
if (IsSameDocument()) {
render_frame_host_ = frame_tree_node_->current_frame_host();
} else {
@@ -67,7 +67,7 @@ index d3f9eb74b0323577f37b98c81a7ac739c9a85488..6216a650ef69f7931981edfc221bb4f3
// Select an appropriate RenderFrameHost.
std::string frame_host_choice_reason;
render_frame_host_ =
@@ -6128,6 +6143,7 @@ void NavigationRequest::CheckStateTransition(NavigationState state) const {
@@ -6142,6 +6157,7 @@ void NavigationRequest::CheckStateTransition(NavigationState state) const {
{WILL_START_REQUEST, {
WILL_REDIRECT_REQUEST,
WILL_PROCESS_RESPONSE,
@@ -75,7 +75,7 @@ index d3f9eb74b0323577f37b98c81a7ac739c9a85488..6216a650ef69f7931981edfc221bb4f3
READY_TO_COMMIT,
DID_COMMIT,
CANCELING,
@@ -6141,10 +6157,14 @@ void NavigationRequest::CheckStateTransition(NavigationState state) const {
@@ -6155,10 +6171,14 @@ void NavigationRequest::CheckStateTransition(NavigationState state) const {
WILL_FAIL_REQUEST,
}},
{WILL_PROCESS_RESPONSE, {
@@ -91,7 +91,7 @@ index d3f9eb74b0323577f37b98c81a7ac739c9a85488..6216a650ef69f7931981edfc221bb4f3
NOT_STARTED,
DID_COMMIT,
diff --git a/content/browser/renderer_host/navigation_request.h b/content/browser/renderer_host/navigation_request.h
index 0465c8072ee9996a27ba9ed00a56396a37df3a78..fbadf6474a037f9aeba4da0f48872892e2e8e1a4 100644
index e1568bf756ea90a08645303b0be986c7cbe848ce..a6fa64a8728b2b95293a10c96c4d0fdd644cd3a0 100644
--- a/content/browser/renderer_host/navigation_request.h
+++ b/content/browser/renderer_host/navigation_request.h
@@ -140,6 +140,10 @@ class CONTENT_EXPORT NavigationRequest
@@ -201,10 +201,10 @@ index af497e6916d72bfbd40fe9f131be6022482ef810..74f9fe3a0a0de20d48bc8b2d39710938
}
diff --git a/content/browser/site_instance_impl.cc b/content/browser/site_instance_impl.cc
index 4dc300404357e74a6e13aed107611ccad9293a30..31aa723b8e23e3802dcb096c651241939a9ce362 100644
index 8013a8606e4f01ef63b7b546fd7537f9232648c3..2f74a84667d7cf760642fb1577f22ad85ca00ecd 100644
--- a/content/browser/site_instance_impl.cc
+++ b/content/browser/site_instance_impl.cc
@@ -1159,6 +1159,10 @@ bool SiteInstanceImpl::HasRelatedSiteInstance(const SiteInfo& site_info) {
@@ -1135,6 +1135,10 @@ bool SiteInstanceImpl::HasRelatedSiteInstance(const SiteInfo& site_info) {
return browsing_instance_->HasSiteInstance(site_info);
}
@@ -216,7 +216,7 @@ index 4dc300404357e74a6e13aed107611ccad9293a30..31aa723b8e23e3802dcb096c65124193
const GURL& url) {
return GetRelatedSiteInstanceImpl(
diff --git a/content/browser/site_instance_impl.h b/content/browser/site_instance_impl.h
index ef8b504b762d28537a75ef35f86839a75768c0e3..82a92741e04e42e41e223db146d173c6ea65fda8 100644
index 40c314243ae5aa8540ce6528273ee2f0b7f0aca1..dce5cf6cde036d35c1b78b8fa768617628d380c2 100644
--- a/content/browser/site_instance_impl.h
+++ b/content/browser/site_instance_impl.h
@@ -501,6 +501,7 @@ class CONTENT_EXPORT SiteInstanceImpl final : public SiteInstance,
@@ -228,7 +228,7 @@ index ef8b504b762d28537a75ef35f86839a75768c0e3..82a92741e04e42e41e223db146d173c6
size_t GetRelatedActiveContentsCount() override;
bool RequiresDedicatedProcess() override;
diff --git a/content/public/browser/content_browser_client.cc b/content/public/browser/content_browser_client.cc
index 421a6c9acc4079df2c5de7322d1566039a17222c..dc38c85baf1c8e3cd67617b92be9a8957238e8aa 100644
index 0d2eba4321ece3e9cfb2b16dead343dd51672714..45fe96cb01e4d6e2772f1304eb1c5ac274c4f713 100644
--- a/content/public/browser/content_browser_client.cc
+++ b/content/public/browser/content_browser_client.cc
@@ -72,6 +72,21 @@
@@ -254,10 +254,10 @@ index 421a6c9acc4079df2c5de7322d1566039a17222c..dc38c85baf1c8e3cd67617b92be9a895
const MainFunctionParams& parameters) {
return nullptr;
diff --git a/content/public/browser/content_browser_client.h b/content/public/browser/content_browser_client.h
index 90629ac2c0c17100f67e99e93148ff1556add33b..c20b3a3bd785511c2cdb73dd15ad65aed47dea57 100644
index 47befa844ca54f463b627864827aa670454dfed4..010a63958d094f65b0f1838888991ecd6679b086 100644
--- a/content/public/browser/content_browser_client.h
+++ b/content/public/browser/content_browser_client.h
@@ -260,8 +260,45 @@ class CONTENT_EXPORT ContentBrowserClient {
@@ -261,8 +261,45 @@ class CONTENT_EXPORT ContentBrowserClient {
using IsClipboardPasteContentAllowedCallback =
base::OnceCallback<void(ClipboardPasteContentAllowed)>;

4
patches/chromium/gpu_notify_when_dxdiag_request_fails.patch
View File

@@ -40,10 +40,10 @@ index 15ee11b33aca857edf44d799004f4424214ecf2e..2735668757843639ca30aa7e270abbdb
// Update the GPU feature info. This updates the blocklist and enabled status
// of GPU rasterization. In the future this will be used for more features.
diff --git a/content/browser/gpu/gpu_data_manager_impl_private.cc b/content/browser/gpu/gpu_data_manager_impl_private.cc
index 782c4e276e808fe5c830e1c952eef05f1e175069..295555d03b9d62ff855c6acc57c80e1f386bf716 100644
index 4c67be38f54198feb025562664658f5ed653fd36..ec41a23fa3dd8b637165bb7abeef14e80274f560 100644
--- a/content/browser/gpu/gpu_data_manager_impl_private.cc
+++ b/content/browser/gpu/gpu_data_manager_impl_private.cc
@@ -1075,6 +1075,11 @@ void GpuDataManagerImplPrivate::TerminateInfoCollectionGpuProcess() {
@@ -1087,6 +1087,11 @@ void GpuDataManagerImplPrivate::TerminateInfoCollectionGpuProcess() {
host->ForceShutdown();
}

2
patches/chromium/mas_disable_remote_accessibility.patch
View File

@@ -170,7 +170,7 @@ index 253f9581e3438a83d65a1b2ade6a6bc1c3c0be68..f3c060b5c678d8f14639d2c8e1ed8f11
///////////////////////////////////////////////////////////////////////////////
diff --git a/ui/base/BUILD.gn b/ui/base/BUILD.gn
index d6f794192d25924262ecd8ac23bd63ccdb88dfd1..0bf01a254effc21655c4a6fe02edd93b5fcb34ca 100644
index d26e454c8ed7db2ec7d9c17cc296ab7febea2fb0..7582d6f00f3419fb33f3727883a8f031bb9ba8a9 100644
--- a/ui/base/BUILD.gn
+++ b/ui/base/BUILD.gn
@@ -316,6 +316,13 @@ component("base") {

10
patches/chromium/mas_no_private_api.patch
View File

@@ -46,10 +46,10 @@ index 1659e070cae733cf2213d752fcc262fb2bce2b54..57a3a34365f723b6e75a5f90d50533a4
NSArray* node_array,
const LineIndexer* line_indexer) const {
diff --git a/content/browser/accessibility/accessibility_tree_formatter_utils_mac.mm b/content/browser/accessibility/accessibility_tree_formatter_utils_mac.mm
index 88f339d1669436db9c1e4d048a46fc28038c83fe..2e194c5174c24552eb684faa339ad92b640d9dd7 100644
index 32b687fd92b73328e01cddd73d0c87f8d999519a..c58dcb76eede2b3671bc043f4ca5adc35749f2d6 100644
--- a/content/browser/accessibility/accessibility_tree_formatter_utils_mac.mm
+++ b/content/browser/accessibility/accessibility_tree_formatter_utils_mac.mm
@@ -234,6 +234,7 @@
@@ -237,6 +237,7 @@
if (property_name == "AXIndexForChildUIElement") { // UIElement
return OptionalNSObject::NotNilOrError(PropertyNodeToUIElement(arg_node));
}
@@ -57,7 +57,7 @@ index 88f339d1669436db9c1e4d048a46fc28038c83fe..2e194c5174c24552eb684faa339ad92b
if (property_name == "AXIndexForTextMarker") { // TextMarker
return OptionalNSObject::NotNilOrError(PropertyNodeToTextMarker(arg_node));
}
@@ -241,6 +242,7 @@
@@ -244,6 +245,7 @@
return OptionalNSObject::NotNilOrError(
PropertyNodeToTextMarkerRange(arg_node));
}
@@ -65,7 +65,7 @@ index 88f339d1669436db9c1e4d048a46fc28038c83fe..2e194c5174c24552eb684faa339ad92b
return OptionalNSObject::NotApplicable();
}
@@ -306,6 +308,7 @@
@@ -309,6 +311,7 @@
return uielement;
}
@@ -73,7 +73,7 @@ index 88f339d1669436db9c1e4d048a46fc28038c83fe..2e194c5174c24552eb684faa339ad92b
id AttributeInvoker::DictNodeToTextMarker(
const AXPropertyNode& dictnode) const {
if (!dictnode.IsDict()) {
@@ -413,6 +416,7 @@ OptionalNSObject TextMarkerRangeGetEndMarker(const OptionalNSObject& obj) {
@@ -416,6 +419,7 @@ OptionalNSObject TextMarkerRangeGetEndMarker(const OptionalNSObject& obj) {
return OptionalNSObject::NotNilOrError(content::AXTextMarkerFrom(
cocoa_node, range.focus()->text_offset(), range.focus()->affinity()));
}

4
patches/chromium/moves_background_color_setter_of_webview_to_blinks_webprefs_logic.patch
View File

@@ -12,7 +12,7 @@ Ideally we could add an embedder observer pattern here but that can be
done in future work.
diff --git a/third_party/blink/renderer/core/exported/web_view_impl.cc b/third_party/blink/renderer/core/exported/web_view_impl.cc
index eb740d3685c2226f5af55dca1224bd5348ea0d0e..42f0ee71b2edfeca05f56d82fb3fba80c795e960 100644
index 55ce52d8c72b24d3397f6dd8a6b3237541835ce3..5205a51540d1aaaba3c485dd5acaef45b8592b09 100644
--- a/third_party/blink/renderer/core/exported/web_view_impl.cc
+++ b/third_party/blink/renderer/core/exported/web_view_impl.cc
@@ -155,6 +155,7 @@
@@ -23,7 +23,7 @@ index eb740d3685c2226f5af55dca1224bd5348ea0d0e..42f0ee71b2edfeca05f56d82fb3fba80
#include "third_party/blink/renderer/platform/graphics/image.h"
#include "third_party/blink/renderer/platform/graphics/paint/cull_rect.h"
#include "third_party/blink/renderer/platform/graphics/paint/paint_record_builder.h"
@@ -1776,6 +1777,14 @@ void WebView::ApplyWebPreferences(const web_pref::WebPreferences& prefs,
@@ -1769,6 +1770,14 @@ void WebView::ApplyWebPreferences(const web_pref::WebPreferences& prefs,
RuntimeEnabledFeatures::SetTranslateServiceEnabled(
prefs.translate_service_available);

4
patches/chromium/notification_provenance.patch
View File

@@ -108,10 +108,10 @@ index 60558d5f40b765ed3ca2f7d1abc1b95f7518fee9..ab44370dc89f64fe2b86089fd9781b71
mojo::PendingReceiver<blink::mojom::NotificationService> receiver);
diff --git a/content/browser/renderer_host/render_process_host_impl.cc b/content/browser/renderer_host/render_process_host_impl.cc
index 42bcfb1628a2aad9acdf167898237d11d9b689ae..d3deb54a100b5ca63ffae2e38427f003263b14a0 100644
index 7fe6d104ac4899b162d66adddf77e19c44750d63..92020f227578b25bb7eb0cd5555716e357905e8e 100644
--- a/content/browser/renderer_host/render_process_host_impl.cc
+++ b/content/browser/renderer_host/render_process_host_impl.cc
@@ -2103,7 +2103,7 @@ void RenderProcessHostImpl::CreateNotificationService(
@@ -2124,7 +2124,7 @@ void RenderProcessHostImpl::CreateNotificationService(
mojo::PendingReceiver<blink::mojom::NotificationService> receiver) {
DCHECK_CURRENTLY_ON(BrowserThread::UI);
storage_partition_impl_->GetPlatformNotificationContext()->CreateService(

6
patches/chromium/picture-in-picture.patch
View File

@@ -48,7 +48,7 @@ index 4b741d67c4c20766e248f0799825103ba4f2a1ce..adf85811da98e1666e8e93e5b339e176
#include "ui/base/l10n/l10n_util.h"
#include "ui/gfx/paint_vector_icon.h"
diff --git a/chrome/browser/ui/views/overlay/overlay_window_views.cc b/chrome/browser/ui/views/overlay/overlay_window_views.cc
index 820d6a2cf397729a634d6102e9be4836081d7097..bb6e477da51501a65caeb4811154b6d452750c74 100644
index 820d6a2cf397729a634d6102e9be4836081d7097..81d945f44e8d1c9ab16b6e81068bfc4a55cb776d 100644
--- a/chrome/browser/ui/views/overlay/overlay_window_views.cc
+++ b/chrome/browser/ui/views/overlay/overlay_window_views.cc
@@ -16,9 +16,11 @@
@@ -72,7 +72,7 @@ index 820d6a2cf397729a634d6102e9be4836081d7097..bb6e477da51501a65caeb4811154b6d4
#include "components/url_formatter/url_formatter.h"
#include "components/vector_icons/vector_icons.h"
#include "content/public/browser/picture_in_picture_window_controller.h"
@@ -52,7 +54,7 @@
@@ -55,7 +57,7 @@
#include "ui/aura/window.h"
#endif
@@ -81,7 +81,7 @@ index 820d6a2cf397729a634d6102e9be4836081d7097..bb6e477da51501a65caeb4811154b6d4
#include "chrome/browser/shell_integration_win.h"
#include "ui/aura/window.h"
#include "ui/aura/window_tree_host.h"
@@ -229,7 +231,7 @@ std::unique_ptr<OverlayWindowViews> OverlayWindowViews::Create(
@@ -232,7 +234,7 @@ std::unique_ptr<OverlayWindowViews> OverlayWindowViews::Create(
overlay_window->Init(std::move(params));
overlay_window->OnRootViewReady();

4
patches/chromium/put_back_deleted_colors_for_autofill.patch
View File

@@ -42,7 +42,7 @@ index 4f72827700dc76f090e8dafd7bb5ff862a610cd7..29d1606e873f9674354b586fbf0d1445
// TODO(thomasanderson): Render GtkSpinner directly.
case ui::kColorThrobber:
diff --git a/ui/native_theme/common_theme.cc b/ui/native_theme/common_theme.cc
index cdd49c092b611176f27fd581cb56c153b6583eeb..91141ded0d83ccb1b31f7555e8579843b2c5eb33 100644
index cdd49c092b611176f27fd581cb56c153b6583eeb..384e639e1b6739536bb10fcabe2c3f895d7bd635 100644
--- a/ui/native_theme/common_theme.cc
+++ b/ui/native_theme/common_theme.cc
@@ -68,6 +68,14 @@ base::Optional<SkColor> GetDarkSchemeColor(NativeTheme::ColorId color_id,
@@ -60,7 +60,7 @@ index cdd49c092b611176f27fd581cb56c153b6583eeb..91141ded0d83ccb1b31f7555e8579843
// Button
case NativeTheme::kColorId_ProminentButtonColor:
return gfx::kGoogleBlue300;
@@ -540,6 +549,18 @@ SkColor GetDefaultColor(NativeTheme::ColorId color_id,
@@ -551,6 +559,18 @@ SkColor GetDefaultColor(NativeTheme::ColorId color_id,
case NativeTheme::kColorId_WindowBackground:
return SK_ColorWHITE;

16
patches/chromium/refactor_expose_cursor_changes_to_the_webcontentsobserver.patch
View File

@@ -30,10 +30,10 @@ index 4a60eef424879cf96003bc2522887dc8c7630254..51bcc78ecd8f5f40e90a5e9077ac59b3
// RenderWidgetHost on the main frame, and false otherwise.
virtual bool IsWidgetForMainFrame(RenderWidgetHostImpl*);
diff --git a/content/browser/renderer_host/render_widget_host_impl.cc b/content/browser/renderer_host/render_widget_host_impl.cc
index 58db1ea17dd657397cd1f7ffbbbfd68a9c633446..aee38b7ed7b006f98ba47600c0b72fcdb0bf2bdb 100644
index 76bce6517555132e3f873c8294eb0ed5d2a3a87a..fc8916ac6dc76968e0cbd06877ffb80c95f3abf4 100644
--- a/content/browser/renderer_host/render_widget_host_impl.cc
+++ b/content/browser/renderer_host/render_widget_host_impl.cc
@@ -1937,6 +1937,8 @@ void RenderWidgetHostImpl::FilterDropData(DropData* drop_data) {
@@ -1939,6 +1939,8 @@ void RenderWidgetHostImpl::FilterDropData(DropData* drop_data) {
void RenderWidgetHostImpl::SetCursor(const ui::Cursor& cursor) {
if (view_)
view_->UpdateCursor(WebCursor(cursor));
@@ -43,10 +43,10 @@ index 58db1ea17dd657397cd1f7ffbbbfd68a9c633446..aee38b7ed7b006f98ba47600c0b72fcd
void RenderWidgetHostImpl::ShowContextMenuAtPoint(
diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser/web_contents/web_contents_impl.cc
index b733ac6cd210af4d873cf91292c8ba6654b70e2a..257cc8b9323843c8d04a94f150707365e84ef9ce 100644
index 3a307ea6a66109e09faae4849426f9166583f977..0f8ab5c4eeb78b3997e4af2ef2bd9a0902803887 100644
--- a/content/browser/web_contents/web_contents_impl.cc
+++ b/content/browser/web_contents/web_contents_impl.cc
@@ -4139,6 +4139,11 @@ TextInputManager* WebContentsImpl::GetTextInputManager() {
@@ -4151,6 +4151,11 @@ TextInputManager* WebContentsImpl::GetTextInputManager() {
return text_input_manager_.get();
}
@@ -59,10 +59,10 @@ index b733ac6cd210af4d873cf91292c8ba6654b70e2a..257cc8b9323843c8d04a94f150707365
RenderWidgetHostImpl* render_widget_host) {
return render_widget_host == GetMainFrame()->GetRenderWidgetHost();
diff --git a/content/browser/web_contents/web_contents_impl.h b/content/browser/web_contents/web_contents_impl.h
index 50248eeb37835d1df3223dd8617a5a1ea2586c73..cb9b52638a77c53e139315cfeb23cf5701ca89ab 100644
index 0342fbc5d6cc5a808925a6e12d6f288864798347..43b6f3bb996a296f6f6619eff60c84c2a1dc0da5 100644
--- a/content/browser/web_contents/web_contents_impl.h
+++ b/content/browser/web_contents/web_contents_impl.h
@@ -952,6 +952,7 @@ class CONTENT_EXPORT WebContentsImpl : public WebContents,
@@ -953,6 +953,7 @@ class CONTENT_EXPORT WebContentsImpl : public WebContents,
blink::mojom::FrameVisibility visibility) override;
void SendScreenRects() override;
TextInputManager* GetTextInputManager() override;
@@ -71,7 +71,7 @@ index 50248eeb37835d1df3223dd8617a5a1ea2586c73..cb9b52638a77c53e139315cfeb23cf57
bool IsShowingContextMenuOnPage() const override;
void DidChangeScreenOrientation() override;
diff --git a/content/public/browser/web_contents_observer.h b/content/public/browser/web_contents_observer.h
index 35a7139dc5713261bd0bb2078e604fe9010030ac..8419ef0dbd5e403de39e088d3ecbb0c40dac31ec 100644
index 7ee27742d3c055065ce01e92cf24a0258c42f802..1196d911eefda44698aa41b1875e918a7516c6da 100644
--- a/content/public/browser/web_contents_observer.h
+++ b/content/public/browser/web_contents_observer.h
@@ -14,6 +14,7 @@
@@ -82,7 +82,7 @@ index 35a7139dc5713261bd0bb2078e604fe9010030ac..8419ef0dbd5e403de39e088d3ecbb0c4
#include "content/public/browser/allow_service_worker_result.h"
#include "content/public/browser/cookie_access_details.h"
#include "content/public/browser/navigation_controller.h"
@@ -373,6 +374,9 @@ class CONTENT_EXPORT WebContentsObserver : public IPC::Listener {
@@ -406,6 +407,9 @@ class CONTENT_EXPORT WebContentsObserver : public IPC::Listener {
// Invoked every time the WebContents changes visibility.
virtual void OnVisibilityChanged(Visibility visibility) {}

4
patches/chromium/revert_remove_contentrendererclient_shouldfork.patch
View File

@@ -88,10 +88,10 @@ index f259835ef4cabb8923f8b0fe9b3f6ae8f2b2b79f..a538b9ebcfa232b90fc7713e6569608a
// |url|. If the function returns a valid |new_url|, the request must be
// updated to use it.
diff --git a/content/renderer/render_frame_impl.cc b/content/renderer/render_frame_impl.cc
index 9b8a8cbafdc34c9b8216a182c881687e946b1650..68caa1d044eb5fe437f861f53b5e12efd904879e 100644
index 8999d6bbb3acc55dbedc2b36cca03862614f139f..3e1eb1d3a54566627c33a268a5ff8e3500c58616 100644
--- a/content/renderer/render_frame_impl.cc
+++ b/content/renderer/render_frame_impl.cc
@@ -5333,6 +5333,22 @@ void RenderFrameImpl::BeginNavigation(
@@ -5321,6 +5321,22 @@ void RenderFrameImpl::BeginNavigation(
// we can do a per-frame check here rather than a process-wide check.
bool should_fork = HasWebUIScheme(url) || HasWebUIScheme(old_url) ||
(enabled_bindings_ & kWebUIBindingsPolicyMask);

10
patches/chromium/support_mixed_sandbox_with_zygote.patch
View File

@@ -22,10 +22,10 @@ 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 d3deb54a100b5ca63ffae2e38427f003263b14a0..26db3958ef5a7f475eefe07476690839b1f6224f 100644
index 92020f227578b25bb7eb0cd5555716e357905e8e..7b9c07b33a70ba95e8ec7b909fefd3c0cc8cee9d 100644
--- a/content/browser/renderer_host/render_process_host_impl.cc
+++ b/content/browser/renderer_host/render_process_host_impl.cc
@@ -390,10 +390,18 @@ class RendererSandboxedProcessLauncherDelegate
@@ -389,10 +389,18 @@ class RendererSandboxedProcessLauncherDelegate
public:
RendererSandboxedProcessLauncherDelegate() = default;
@@ -44,7 +44,7 @@ index d3deb54a100b5ca63ffae2e38427f003263b14a0..26db3958ef5a7f475eefe07476690839
const base::CommandLine& browser_command_line =
*base::CommandLine::ForCurrentProcess();
base::CommandLine::StringType renderer_prefix =
@@ -411,6 +419,11 @@ class RendererSandboxedProcessLauncherDelegate
@@ -410,6 +418,11 @@ class RendererSandboxedProcessLauncherDelegate
sandbox::policy::SandboxType GetSandboxType() override {
return sandbox::policy::SandboxType::kRenderer;
}
@@ -56,7 +56,7 @@ index d3deb54a100b5ca63ffae2e38427f003263b14a0..26db3958ef5a7f475eefe07476690839
};
#if defined(OS_WIN)
@@ -421,6 +434,9 @@ class RendererSandboxedProcessLauncherDelegateWin
@@ -420,6 +433,9 @@ class RendererSandboxedProcessLauncherDelegateWin
RendererSandboxedProcessLauncherDelegateWin(base::CommandLine* cmd_line)
: renderer_code_integrity_enabled_(
GetContentClient()->browser()->IsRendererCodeIntegrityEnabled()) {
@@ -66,7 +66,7 @@ index d3deb54a100b5ca63ffae2e38427f003263b14a0..26db3958ef5a7f475eefe07476690839
if (cmd_line->HasSwitch(switches::kJavaScriptFlags)) {
std::string js_flags =
cmd_line->GetSwitchValueASCII(switches::kJavaScriptFlags);
@@ -1828,9 +1844,15 @@ bool RenderProcessHostImpl::Init() {
@@ -1848,9 +1864,15 @@ bool RenderProcessHostImpl::Init() {
std::unique_ptr<SandboxedProcessLauncherDelegate> sandbox_delegate =
std::make_unique<RendererSandboxedProcessLauncherDelegateWin>(
cmd_line.get());

6
patches/chromium/ui_gtk_public_header.patch
View File

@@ -6,10 +6,10 @@ Subject: ui_gtk_public_header.patch
Allow electron to depend on //ui/gtk/gtk_util.h
diff --git a/ui/gtk/BUILD.gn b/ui/gtk/BUILD.gn
index b982ebc25ed25fe3013e4b1dd39607b7011dd0b6..ad629e388224c2e420a6329723540eed2d6fd2ab 100644
index 47ec07c887d4f10069f61bf897f95e925fc7c57a..7f541ede5605e0597884a514b8b368781bf8574a 100644
--- a/ui/gtk/BUILD.gn
+++ b/ui/gtk/BUILD.gn
@@ -55,7 +55,10 @@ component("gtk_ui_delegate") {
@@ -56,7 +56,10 @@ component("gtk_ui_delegate") {
}
component("gtk") {
@@ -21,7 +21,7 @@ index b982ebc25ed25fe3013e4b1dd39607b7011dd0b6..ad629e388224c2e420a6329723540eed
friend = [ ":gtk_unittests" ]
@@ -66,7 +69,6 @@ component("gtk") {
@@ -69,7 +72,6 @@ component("gtk") {
"gtk_key_bindings_handler.h",
"gtk_ui.cc",
"gtk_util.cc",

2
patches/chromium/unsandboxed_ppapi_processes_skip_zygote.patch
View File

@@ -6,7 +6,7 @@ Subject: unsandboxed_ppapi_processes_skip_zygote.patch
Unsandboxed ppapi processes should skip zygote.
diff --git a/content/browser/ppapi_plugin_process_host.cc b/content/browser/ppapi_plugin_process_host.cc
index 7e40de399a031edf1320358c3e6b94afdec53d4d..2c08b54de2e457754900100950845730c9493366 100644
index c10e41fd2cb6269e7a7bb79da14b2d1d2eb1f41f..87bb8697479eaaaa015ba2a9d25fab54fe526dab 100644
--- a/content/browser/ppapi_plugin_process_host.cc
+++ b/content/browser/ppapi_plugin_process_host.cc
@@ -111,6 +111,9 @@ class PpapiPluginSandboxedProcessLauncherDelegate

12
patches/chromium/web_contents.patch
View File

@@ -9,10 +9,10 @@ is needed for OSR.
Originally landed in https://github.com/electron/libchromiumcontent/pull/226.
diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser/web_contents/web_contents_impl.cc
index dfc5a8a612a9964f4f9b5697a23ca16d54a8a3fa..a9195bdbded68a967bbb16df3731ac0011c5dbff 100644
index e91e0f35fe3ec98d299da675acfad996a0801faf..b6f93e3b8b719d28d21984abf305c839755fda48 100644
--- a/content/browser/web_contents/web_contents_impl.cc
+++ b/content/browser/web_contents/web_contents_impl.cc
@@ -2727,6 +2727,12 @@ void WebContentsImpl::Init(const WebContents::CreateParams& params) {
@@ -2739,6 +2739,12 @@ void WebContentsImpl::Init(const WebContents::CreateParams& params) {
frame_tree_.Init(site_instance.get(), params.renderer_initiated_creation,
params.main_frame_name, type);
@@ -25,7 +25,7 @@ index dfc5a8a612a9964f4f9b5697a23ca16d54a8a3fa..a9195bdbded68a967bbb16df3731ac00
WebContentsViewDelegate* delegate =
GetContentClient()->browser()->GetWebContentsViewDelegate(this);
@@ -2737,6 +2743,7 @@ void WebContentsImpl::Init(const WebContents::CreateParams& params) {
@@ -2749,6 +2755,7 @@ void WebContentsImpl::Init(const WebContents::CreateParams& params) {
view_.reset(CreateWebContentsView(this, delegate,
&render_view_host_delegate_view_));
}
@@ -34,10 +34,10 @@ index dfc5a8a612a9964f4f9b5697a23ca16d54a8a3fa..a9195bdbded68a967bbb16df3731ac00
CHECK(view_.get());
diff --git a/content/public/browser/web_contents.h b/content/public/browser/web_contents.h
index 3789a4495f211560a9e667270c477c16166d9e9f..0310654f79f37d153aafc9f884c5a17a9b29e13e 100644
index fe5bc4ade5cdbe1332ae9134907f8c956529c48c..9d089057f886c7b6b10ded3c2b37f5580f3b67f7 100644
--- a/content/public/browser/web_contents.h
+++ b/content/public/browser/web_contents.h
@@ -87,8 +87,11 @@ class BrowserContext;
@@ -88,8 +88,11 @@ class BrowserContext;
class BrowserPluginGuestDelegate;
class RenderFrameHost;
class RenderViewHost;
@@ -49,7 +49,7 @@ index 3789a4495f211560a9e667270c477c16166d9e9f..0310654f79f37d153aafc9f884c5a17a
class WebUI;
struct DropData;
struct MHTMLGenerationParams;
@@ -228,6 +231,10 @@ class WebContents : public PageNavigator,
@@ -229,6 +232,10 @@ class WebContents : public PageNavigator,
// Sandboxing flags set on the new WebContents.
network::mojom::WebSandboxFlags starting_sandbox_flags;

2
patches/v8/add_realloc.patch
View File

@@ -30,7 +30,7 @@ index 6b672ca750cec5e93dad948007af9b062ed66beb..3fbba577edd160184fa431cb796025c9
* Free the memory block of size |length|, pointed to by |data|.
* That memory is guaranteed to be previously allocated by |Allocate|.
diff --git a/src/api/api.cc b/src/api/api.cc
index 09682d4dfb822ea3c752e69e428ff0b8a51d87d3..f9fe671721920901c7fda7eb2b0ed870416ad130 100644
index a5c658a799255f9fbc4a4030b5e16be324aac87f..50173de3f145b4febcc29c03080306c137918527 100644
--- a/src/api/api.cc
+++ b/src/api/api.cc
@@ -324,6 +324,10 @@ void V8::SetSnapshotDataBlob(StartupData* snapshot_blob) {

6
patches/v8/build_gn.patch
View File

@@ -9,7 +9,7 @@ necessary for native modules to load.
Also, some fixes relating to mksnapshot on ARM.
diff --git a/BUILD.gn b/BUILD.gn
index f67f3c93bcce611fc1f64422871937e2e9836b44..ccd8070a56d0fa8d9ebaa594419f54554dc8155c 100644
index c133a9d2b0daf6259b8a0b0f8f0b35426ff025e4..6e672503c82d8ff8469c0b00794e693d0489eec7 100644
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -471,7 +471,7 @@ config("internal_config") {
@@ -21,7 +21,7 @@ index f67f3c93bcce611fc1f64422871937e2e9836b44..ccd8070a56d0fa8d9ebaa594419f5455
defines += [ "BUILDING_V8_SHARED" ]
}
}
@@ -5100,7 +5100,7 @@ if (current_toolchain == v8_generator_toolchain) {
@@ -5098,7 +5098,7 @@ if (current_toolchain == v8_generator_toolchain) {
"src/interpreter/bytecodes.h",
]
@@ -30,7 +30,7 @@ index f67f3c93bcce611fc1f64422871937e2e9836b44..ccd8070a56d0fa8d9ebaa594419f5455
deps = [
":v8_libbase",
@@ -5138,6 +5138,8 @@ if (current_toolchain == v8_snapshot_toolchain) {
@@ -5136,6 +5136,8 @@ if (current_toolchain == v8_snapshot_toolchain) {
configs = [ ":internal_config" ]

4
patches/v8/dcheck.patch
View File

@@ -6,7 +6,7 @@ Subject: dcheck.patch
https://github.com/auchenberg/volkswagen
diff --git a/src/api/api.cc b/src/api/api.cc
index f9fe671721920901c7fda7eb2b0ed870416ad130..5dc9767f99e9e3977be7383eae802dc859b95b1e 100644
index 50173de3f145b4febcc29c03080306c137918527..1ac347ede7e51559917f09442ac4824f138075de 100644
--- a/src/api/api.cc
+++ b/src/api/api.cc
@@ -8629,7 +8629,7 @@ void Isolate::SetPromiseRejectCallback(PromiseRejectCallback callback) {
@@ -19,7 +19,7 @@ index f9fe671721920901c7fda7eb2b0ed870416ad130..5dc9767f99e9e3977be7383eae802dc8
isolate->default_microtask_queue()->PerformCheckpoint(this);
}
diff --git a/src/heap/heap.cc b/src/heap/heap.cc
index 9770f6aad2a4ffddf86df11207a34976c66a3ad1..a70207944d827c961f68b316e55a0e49ede0933d 100644
index 823d37fd02d0169f0cb2785f9aa3395c5970711e..db6c29b72dd45f625b9876dab0e68ee56c9fae66 100644
--- a/src/heap/heap.cc
+++ b/src/heap/heap.cc
@@ -5600,9 +5600,9 @@ void Heap::TearDown() {

2
patches/v8/do_not_export_private_v8_symbols_on_windows.patch
View File

@@ -12,7 +12,7 @@ This patch can be safely removed if, when it is removed, `node.lib` does not
contain any standard C++ library exports (e.g. `std::ostringstream`).
diff --git a/BUILD.gn b/BUILD.gn
index 7c09c54ffcbe87b54215cc0c533ddbe7fa6e6345..63c1fd1ba71ac1be2e704bcb7b19e3609fe0a529 100644
index 300e2ef4581451b2ca9fe3f857aea0c6360697c2..5414447f938b17db15e32cce1d27e1eb225e12c0 100644
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -471,6 +471,10 @@ config("internal_config") {

4
patches/v8/expose_mksnapshot.patch
View File

@@ -6,10 +6,10 @@ Subject: expose_mksnapshot.patch
Needed in order to target mksnapshot for mksnapshot zip.
diff --git a/BUILD.gn b/BUILD.gn
index ccd8070a56d0fa8d9ebaa594419f54554dc8155c..7c09c54ffcbe87b54215cc0c533ddbe7fa6e6345 100644
index 6e672503c82d8ff8469c0b00794e693d0489eec7..300e2ef4581451b2ca9fe3f857aea0c6360697c2 100644
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -5112,7 +5112,6 @@ if (current_toolchain == v8_generator_toolchain) {
@@ -5110,7 +5110,6 @@ if (current_toolchain == v8_generator_toolchain) {
if (current_toolchain == v8_snapshot_toolchain) {
v8_executable("mksnapshot") {