mirrors/electron
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

chore: bump chromium to 107.0.5286.0 (main) (#35590)

Browse source 
* chore: bump chromium in DEPS to 107.0.5286.0

* 3866335: media: Rename KeySystemProperties to KeySystemInfo - file renaming

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

* 3864686: [PA] Introduce *Scan buildflag

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

* chore: fixup patch indices

* 3849359: Remove unused PrefValueStore::Delegate

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

* 3873005: [CodeHealth] Modernising extensions Tab utils

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

* 3846595: Auto-select PipeWire target once selection is made

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

* 3826169: [json-schema-compiler] Support abs::optional<bool>

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

* fixup! Remove unused PrefValueStore::Delegate

Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com>
Co-authored-by: Shelley Vohr <shelley.vohr@gmail.com>
Co-authored-by: deepak1556 <hop2deep@gmail.com>
This commit is contained in:
electron-roller[bot] 2022-09-08 16:23:08 -07:00 committed by GitHub
parent a0dbae72c8
commit b0036ea43a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
62 changed files with 164 additions and 265 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
DEPS
View file

@ -2,7 +2,7 @@ gclient_gn_args_from = 'src'
vars = {
'chromium_version':
'107.0.5274.0',
'107.0.5286.0',
'node_version':
'v16.17.0',
'nan_version':

2
filenames.gni
View file

@ -463,8 +463,6 @@ filenames = {
"shell/browser/notifications/platform_notification_service.h",
"shell/browser/plugins/plugin_utils.cc",
"shell/browser/plugins/plugin_utils.h",
"shell/browser/pref_store_delegate.cc",
"shell/browser/pref_store_delegate.h",
"shell/browser/protocol_registry.cc",
"shell/browser/protocol_registry.h",
"shell/browser/relauncher.cc",

16
patches/chromium/add_didinstallconditionalfeatures.patch
View file

@ -10,7 +10,7 @@ DidCreateScriptContext is called, not all JS APIs are available in the
context, which can cause some preload scripts to trip.
diff --git a/content/public/renderer/render_frame_observer.h b/content/public/renderer/render_frame_observer.h
index 7d169540590b83924766b1d423dc1bc46ab35250..f5bbb6ab26bd714d667236071a2eb0a5794a5631 100644
index 9bdb516d44cf69fa438f99a7bdb0df9c989465a7..fa235f8993cfdb7dce2da0b505ebe2461334a9b9 100644
--- a/content/public/renderer/render_frame_observer.h
+++ b/content/public/renderer/render_frame_observer.h
@@ -136,6 +136,8 @@ class CONTENT_EXPORT RenderFrameObserver : public IPC::Listener,
@ -23,10 +23,10 @@ index 7d169540590b83924766b1d423dc1bc46ab35250..f5bbb6ab26bd714d667236071a2eb0a5
int32_t world_id) {}
virtual void DidClearWindowObject() {}
diff --git a/content/renderer/render_frame_impl.cc b/content/renderer/render_frame_impl.cc
index 13b2065d59f829e4ff2635bb33e9606c1a6a1b6e..8b682a9d0096a67eb0aac6bff9b4f3a7372d8283 100644
index 36b3f9d6d535e1fde2cf3496dabcac07c372b892..41913e27f955e81397b08c1690579c25d6704498 100644
--- a/content/renderer/render_frame_impl.cc
+++ b/content/renderer/render_frame_impl.cc
@@ -4364,6 +4364,12 @@ void RenderFrameImpl::DidCreateScriptContext(v8::Local<v8::Context> context,
@@ -4351,6 +4351,12 @@ void RenderFrameImpl::DidCreateScriptContext(v8::Local<v8::Context> context,
observer.DidCreateScriptContext(context, world_id);
}
@ -40,10 +40,10 @@ index 13b2065d59f829e4ff2635bb33e9606c1a6a1b6e..8b682a9d0096a67eb0aac6bff9b4f3a7
int world_id) {
for (auto& observer : observers_)
diff --git a/content/renderer/render_frame_impl.h b/content/renderer/render_frame_impl.h
index 1e001268c7e619334655294938ff3ba8a5ee94de..4163848625cd418c8814bd0e3d406e19ab42c217 100644
index eea01ab95a033b5fb537db004dc0b63724192a93..d72b75f1dbccc4aa7bf9f4abb080b0692c4b9d04 100644
--- a/content/renderer/render_frame_impl.h
+++ b/content/renderer/render_frame_impl.h
@@ -590,6 +590,8 @@ class CONTENT_EXPORT RenderFrameImpl
@@ -589,6 +589,8 @@ class CONTENT_EXPORT RenderFrameImpl
uint32_t ng_call_count) override;
void DidCreateScriptContext(v8::Local<v8::Context> context,
int world_id) override;
@ -53,10 +53,10 @@ index 1e001268c7e619334655294938ff3ba8a5ee94de..4163848625cd418c8814bd0e3d406e19
int world_id) override;
void DidChangeScrollOffset() override;
diff --git a/third_party/blink/public/web/web_local_frame_client.h b/third_party/blink/public/web/web_local_frame_client.h
index 4ef7353157272a623cea6b086b84da72ca795fca..548f6afd429695088bd83743fa6f6c1cd4197276 100644
index 103989bc5a74f6adc79734f97e517056596aa913..ccf2ba4cbdf382164db9f6951a00a11434d4f661 100644
--- a/third_party/blink/public/web/web_local_frame_client.h
+++ b/third_party/blink/public/web/web_local_frame_client.h
@@ -584,6 +584,9 @@ class BLINK_EXPORT WebLocalFrameClient {
@@ -579,6 +579,9 @@ class BLINK_EXPORT WebLocalFrameClient {
virtual void DidCreateScriptContext(v8::Local<v8::Context>,
int32_t world_id) {}
@ -92,7 +92,7 @@ index 83a62e23b1d395b0aa545de5b828c24196cccc6d..0ca8163eb9ab87aead27bc8b2ee9e614
int32_t world_id) = 0;
virtual bool AllowScriptExtensions() = 0;
diff --git a/third_party/blink/renderer/core/frame/local_frame_client_impl.cc b/third_party/blink/renderer/core/frame/local_frame_client_impl.cc
index 2ac22a0410eea7f67cc7eb066879da649f7c6a0e..53ec3d177afbd75b4e67c6ab847094994c291dcb 100644
index 90e53a2dc78c1be9e03d3b80b4d0938a43128fa0..a428af1c219522aa8a08ebfdb10abd2f8a34a44e 100644
--- a/third_party/blink/renderer/core/frame/local_frame_client_impl.cc
+++ b/third_party/blink/renderer/core/frame/local_frame_client_impl.cc
@@ -273,6 +273,13 @@ void LocalFrameClientImpl::DidCreateScriptContext(

2
patches/chromium/blink_local_frame.patch
View file

@ -49,7 +49,7 @@ index 0e50579d9b1c989beee4113d6762d32b8074efb4..bbcd21ddc38a799fe4226447f9b3447f
// 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 fd2b76efaf3edd15ab0e9a7bb7f3f27e1abde58e..f67b4f09d2986511da6d0916223992374046844c 100644
index b19001d3f24edc2f979c0585614897a404890994..baba2925889605ab997a1ceb1f4acd1b809bcf58 100644
--- a/third_party/blink/renderer/core/frame/local_frame.cc
+++ b/third_party/blink/renderer/core/frame/local_frame.cc
@@ -547,10 +547,6 @@ bool LocalFrame::DetachImpl(FrameDetachType type) {

2
patches/chromium/build_add_electron_tracing_category.patch
View file

@ -8,7 +8,7 @@ categories in use are known / declared. This patch is required for us
to introduce a new Electron category for Electron-specific tracing.
diff --git a/base/trace_event/builtin_categories.h b/base/trace_event/builtin_categories.h
index 784fb0293187f746c1e7b849df239132d3e81c37..b63be8a0ff6eaf00b2ceafaa1308924b27e09cab 100644
index 2c2cde3260fb1d104d01fcc0fb7b160dc29fc4c0..61a55b7f837c6881efe277d9a4653eee9d650206 100644
--- a/base/trace_event/builtin_categories.h
+++ b/base/trace_event/builtin_categories.h
@@ -80,6 +80,7 @@

2
patches/chromium/build_disable_partition_alloc_on_mac.patch
View file

@ -9,7 +9,7 @@ and can be removed when the crash in fork is resolved.
Related issue: https://github.com/electron/electron/issues/32718
diff --git a/build_overrides/partition_alloc.gni b/build_overrides/partition_alloc.gni
index 0e929071b34d1f29cfb8ae81f6a530c4880e0271..de1dca8fc5aa1fb2791d6e104d8f49588d49504b 100644
index 7ce71f04ed4c5c0da7dd6f26c35f01ddda490484..0c39dc9c08c1c29e842f8f924134609472b5a156 100644
--- a/build_overrides/partition_alloc.gni
+++ b/build_overrides/partition_alloc.gni
@@ -40,7 +40,7 @@ _disable_partition_alloc = is_component_build || (is_win && is_debug)

14
patches/chromium/build_do_not_depend_on_packed_resource_integrity.patch
View file

@ -33,10 +33,10 @@ index 0223183c4e869e835429a52ad7d9eb381a2d21f5..47162ccaa75ea637b7ce5ed0fed97686
"//base",
"//build:branding_buildflags",
diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
index 990498798a5668fb0c52cc45a0208eaaf6dfc5de..959c34912acfaba9af4350fbf2dc4852e8c44c0e 100644
index e1274ce21a8d794b7753c0017b0558cfd92f9530..ba723ec8f05e03981a273a3890a775c151aaed99 100644
--- a/chrome/browser/BUILD.gn
+++ b/chrome/browser/BUILD.gn
@@ -4630,7 +4630,7 @@ static_library("browser") {
@@ -4639,7 +4639,7 @@ static_library("browser") {
# On Windows, the hashes are embedded in //chrome:chrome_initial rather
# than here in :chrome_dll.
@ -46,10 +46,10 @@ index 990498798a5668fb0c52cc45a0208eaaf6dfc5de..959c34912acfaba9af4350fbf2dc4852
sources += [ "certificate_viewer_stub.cc" ]
}
diff --git a/chrome/test/BUILD.gn b/chrome/test/BUILD.gn
index 7035b4ef874512fbc55f8f817c09f18e6b432895..a4a9aa15d4027161e84a71dd41fd031897d16219 100644
index 9e848b82105112f95a77ad87f23d9ffc762bd88b..4f10f85a7a4a9951b0a11fef0419f5301564e378 100644
--- a/chrome/test/BUILD.gn
+++ b/chrome/test/BUILD.gn
@@ -6051,7 +6051,6 @@ test("unit_tests") {
@@ -6065,7 +6065,6 @@ test("unit_tests") {
deps += [
"//chrome:other_version",
@ -57,7 +57,7 @@ index 7035b4ef874512fbc55f8f817c09f18e6b432895..a4a9aa15d4027161e84a71dd41fd0318
"//chrome//services/util_win:unit_tests",
"//chrome/app:chrome_dll_resources",
"//chrome/app:crash_reporter_client_win_unit_tests",
@@ -6076,6 +6075,10 @@ test("unit_tests") {
@@ -6090,6 +6089,10 @@ test("unit_tests") {
"//ui/resources",
]
@ -68,7 +68,7 @@ index 7035b4ef874512fbc55f8f817c09f18e6b432895..a4a9aa15d4027161e84a71dd41fd0318
ldflags = [
"/DELAYLOAD:api-ms-win-core-winrt-error-l1-1-0.dll",
"/DELAYLOAD:api-ms-win-core-winrt-l1-1-0.dll",
@@ -7003,7 +7006,7 @@ test("unit_tests") {
@@ -7018,7 +7021,7 @@ test("unit_tests") {
}
deps += [
@ -77,7 +77,7 @@ index 7035b4ef874512fbc55f8f817c09f18e6b432895..a4a9aa15d4027161e84a71dd41fd0318
"//chrome/browser/autofill_assistant/password_change/vector_icons:vector_icons",
"//chrome/browser/enterprise/connectors/analysis:features",
"//chrome/browser/media/router:test_support",
@@ -7123,6 +7126,10 @@ test("unit_tests") {
@@ -7140,6 +7143,10 @@ test("unit_tests") {
}
}

2
patches/chromium/build_libc_as_static_library.patch
View file

@ -7,7 +7,7 @@ Build libc++ as static library to compile and pass
nan tests
diff --git a/buildtools/third_party/libc++/BUILD.gn b/buildtools/third_party/libc++/BUILD.gn
index b743e36d49771d304ee0ed41cc7b743dcc1d7d2f..5f9b18d12d8c7194da5eb0005ef3a5227563424d 100644
index 6f904094e6c9bf23f7a7a69a14e28196327074b0..d70fd8f616e0022860128861c5b8d484a3e2bd3e 100644
--- a/buildtools/third_party/libc++/BUILD.gn
+++ b/buildtools/third_party/libc++/BUILD.gn
@@ -44,7 +44,11 @@ config("winver") {

2
patches/chromium/build_make_libcxx_abi_unstable_false_for_electron.patch
View file

@ -6,7 +6,7 @@ Subject: build: make libcxx_abi_unstable false for electron
https://nornagon.medium.com/a-libc-odyssey-973e51649063
diff --git a/buildtools/third_party/libc++/__config_site b/buildtools/third_party/libc++/__config_site
index 4bf26e66eade80a43b6de0aeb645695c9e610487..6025a02e05da227c56f770628e364e7504772c7d 100644
index c9f885120cdcafbdd021a3d2afa3d7f29bf56367..a26efc71bed9c672528431fa8969e60d0aac3c42 100644
--- a/buildtools/third_party/libc++/__config_site
+++ b/buildtools/third_party/libc++/__config_site
@@ -12,7 +12,6 @@

20
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 39446b941e975502601f72e37637c103c65c69b0..dd466e61b47c2bdf9652b5155b9c84ff2cd7352d 100644
index 1c652afe8b002635b34d6718c8c69cdd86dd9f8b..21eb439646c16aa72e78e9436006a29cbd8c5bf4 100644
--- a/content/browser/renderer_host/render_frame_host_impl.cc
+++ b/content/browser/renderer_host/render_frame_host_impl.cc
@@ -7336,6 +7336,7 @@ void RenderFrameHostImpl::CreateNewWindow(
@@ -7344,6 +7344,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 39446b941e975502601f72e37637c103c65c69b0..dd466e61b47c2bdf9652b5155b9c84ff
&no_javascript_access);
diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser/web_contents/web_contents_impl.cc
index 29e19a8989b6ba74e02a1ba7e6e547c52fb0c61b..62387a653bf7fc38eff14fa383d6cbb7b13bfe39 100644
index abb91fd00245fddf49ee8d28be081a041aa9fce9..707d9a116c8ea119977b54d3a3365d96fef05a5a 100644
--- a/content/browser/web_contents/web_contents_impl.cc
+++ b/content/browser/web_contents/web_contents_impl.cc
@@ -4017,6 +4017,14 @@ FrameTree* WebContentsImpl::CreateNewWindow(
@@ -4005,6 +4005,14 @@ FrameTree* WebContentsImpl::CreateNewWindow(
}
auto* new_contents_impl = new_contents.get();
@ -39,7 +39,7 @@ index 29e19a8989b6ba74e02a1ba7e6e547c52fb0c61b..62387a653bf7fc38eff14fa383d6cbb7
new_contents_impl->GetController().SetSessionStorageNamespace(
partition_config, session_storage_namespace);
@@ -4061,12 +4069,6 @@ FrameTree* WebContentsImpl::CreateNewWindow(
@@ -4049,12 +4057,6 @@ FrameTree* WebContentsImpl::CreateNewWindow(
AddWebContentsDestructionObserver(new_contents_impl);
}
@ -68,7 +68,7 @@ index 4eee5f6c069c83039bf0acee71056d8ed4ea92eb..9212926fba9d06296c9c46a95519b6ed
// 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 1bf024d1a46eeca099b2464e8e3006f96c1dd12a..979bc46b7db51191cfd8920d6752488bbc0b44e0 100644
index 1e6bbfd6e7d79d1d75bd590fd2040ce51d330f16..3154a7ea00daa120279c34bdb5799b278e73ac62 100644
--- a/content/public/browser/content_browser_client.cc
+++ b/content/public/browser/content_browser_client.cc
@@ -617,6 +617,8 @@ bool ContentBrowserClient::CanCreateWindow(
@ -81,7 +81,7 @@ index 1bf024d1a46eeca099b2464e8e3006f96c1dd12a..979bc46b7db51191cfd8920d6752488b
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 cf95c5d59127c25a12c89c934ae673a4bee2a8e8..3c6465c4954b9b63d8cf5ead3dc7047be1537d37 100644
index b4d22a849e067bb942825449e649a4a00fc4947a..67a8cbf589693a0a347f6604a36ed2a39d4ef2da 100644
--- a/content/public/browser/content_browser_client.h
+++ b/content/public/browser/content_browser_client.h
@@ -163,6 +163,7 @@ class NetworkService;
@ -92,7 +92,7 @@ index cf95c5d59127c25a12c89c934ae673a4bee2a8e8..3c6465c4954b9b63d8cf5ead3dc7047b
} // namespace network
namespace sandbox {
@@ -1000,6 +1001,8 @@ class CONTENT_EXPORT ContentBrowserClient {
@@ -1003,6 +1004,8 @@ class CONTENT_EXPORT ContentBrowserClient {
const std::string& frame_name,
WindowOpenDisposition disposition,
const blink::mojom::WindowFeatures& features,
@ -150,10 +150,10 @@ index 815bee280776026f477c695d31cff8e040e25a49..04eff05d01eb94e5020cdd6e1cc25550
// typically happens when popups are created.
virtual void WebContentsCreated(WebContents* source_contents,
diff --git a/content/renderer/render_frame_impl.cc b/content/renderer/render_frame_impl.cc
index 51ce1b73d3953aa04599ef909859234456d376a4..13b2065d59f829e4ff2635bb33e9606c1a6a1b6e 100644
index 34a64f22b7e6f834409e3afdb243943af370b21d..36b3f9d6d535e1fde2cf3496dabcac07c372b892 100644
--- a/content/renderer/render_frame_impl.cc
+++ b/content/renderer/render_frame_impl.cc
@@ -6215,6 +6215,10 @@ WebView* RenderFrameImpl::CreateNewWindow(
@@ -6201,6 +6201,10 @@ WebView* RenderFrameImpl::CreateNewWindow(
/*openee_can_access_opener_origin=*/true,
!GetWebFrame()->IsAllowedToDownload(), GetWebFrame()->IsAdFrame());

4
patches/chromium/chore_add_electron_deps_to_gitignores.patch
View file

@ -18,7 +18,7 @@ index 651d8ec7d8e98e7588f8f182018188ab234d5c5a..1fc645a7f748d3cad8ca2f4fa9897454
/google_apis/internal
/googleurl
diff --git a/third_party/.gitignore b/third_party/.gitignore
index 6ea6a6def894cbf38122df15fa94d16ffcadbd84..2101a67e00fd366f3c453b3ef313e15d9e3ee5b1 100644
index e83145bd5b7301167ece2fc96a0710e9419638d4..4bbd7bac9dcc1b925a33bd4a675d065d073df502 100644
--- a/third_party/.gitignore
+++ b/third_party/.gitignore
@@ -84,6 +84,7 @@
@ -37,7 +37,7 @@ index 6ea6a6def894cbf38122df15fa94d16ffcadbd84..2101a67e00fd366f3c453b3ef313e15d
/nasm
/nearby/src
/neon_2_sse/src
@@ -243,6 +245,7 @@
@@ -244,6 +246,7 @@
/speex
/sqlite/src
/sqlite4java/lib/

12
patches/chromium/chore_provide_iswebcontentscreationoverridden_with_full_params.patch
View file

@ -108,7 +108,7 @@ index 1318d5e04d5448d2b357454c3ce4207264288760..3b0324c35d5b18ed2e29264aae860c48
}
diff --git a/chrome/browser/ui/browser.cc b/chrome/browser/ui/browser.cc
index 298cff90c9e082fa833bd60624892b7a9e29d1d0..b34eaef2a1337ba042c82aa57ddacf397e3cb769 100644
index fc0083d2dcdf72a92cef4e1e830015341df4d65e..d8a82c7d06b58038f8b6a13fbdb31f96599f9e28 100644
--- a/chrome/browser/ui/browser.cc
+++ b/chrome/browser/ui/browser.cc
@@ -1812,12 +1812,11 @@ bool Browser::IsWebContentsCreationOverridden(
@ -183,10 +183,10 @@ index ed23267cd9f28f4e02d8374177f0bb697547cc2a..a979719f75ab4c9b49775ec3df5eff13
}
content::WebContents* CreateCustomWebContents(
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 1a6bbeea689901e23717d660e67f8d1abb21f799..85f7b42e7aadce3abcae9f9596403f9856771993 100644
index 9d5265c5774c5e1196af3d0a66b796896676469c..40b9842bed30fd79252aa0fd19daa78e1c9baa5c 100644
--- a/components/embedder_support/android/delegate/web_contents_delegate_android.cc
+++ b/components/embedder_support/android/delegate/web_contents_delegate_android.cc
@@ -170,14 +170,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,
@ -246,10 +246,10 @@ index 58c032fe666591be0a72c350b752ad07326253f0..23c8aa67c698ee6208a89b36c38a5fd3
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 35264a5da11fb224d6cdf0b55e8b3b53d152aed6..a4eb64823fbc2fe3c381e850235f5a447194dfc5 100644
index b48f62fb5ba99e7399e739d9d23346c48218c247..84b48011e5a9d5b890a26debce68d0efd3c013c4 100644
--- a/content/browser/web_contents/web_contents_impl.cc
+++ b/content/browser/web_contents/web_contents_impl.cc
@@ -3944,8 +3944,7 @@ FrameTree* WebContentsImpl::CreateNewWindow(
@@ -3932,8 +3932,7 @@ FrameTree* WebContentsImpl::CreateNewWindow(
if (delegate_ && delegate_->IsWebContentsCreationOverridden(
source_site_instance, params.window_container_type,
@ -344,7 +344,7 @@ index 26dc86a7534d9296f1b1f772ec95f5313c61061c..925152a6c1fb645dfff5bd7238b620a8
content::RenderFrameHost* opener,
content::SiteInstance* source_site_instance,
diff --git a/fuchsia_web/webengine/browser/frame_impl.cc b/fuchsia_web/webengine/browser/frame_impl.cc
index 2856966bbf411b0ec600107a374d79beec7bf821..c820a0a7d212959d74f2f0abc2839938ca47d9f0 100644
index fbbd630fcc3c684c5f79a526e53e8240897d6f6b..ba0c18a6f6430cafefa21bf73717cd3f3b0fde94 100644
--- a/fuchsia_web/webengine/browser/frame_impl.cc
+++ b/fuchsia_web/webengine/browser/frame_impl.cc
@@ -413,8 +413,7 @@ bool FrameImpl::IsWebContentsCreationOverridden(

6
patches/chromium/chrome_key_systems.patch
View file

@ -7,7 +7,7 @@ Disable persiste licence support check for widevine cdm,
as its not supported in the current version of chrome.
diff --git a/chrome/renderer/media/chrome_key_systems.cc b/chrome/renderer/media/chrome_key_systems.cc
index 30da015cffeb945973d0045ce297467ab16d7db6..53e7bd0f7dbff8c620a5827abb3ba871703a4f06 100644
index ae4b6d6ea7b16367096ac91c6c8550819ae4769b..bfe03fa38536caa7aec625c89a90a74dcc05809d 100644
--- a/chrome/renderer/media/chrome_key_systems.cc
+++ b/chrome/renderer/media/chrome_key_systems.cc
@@ -17,7 +17,9 @@
@ -17,8 +17,8 @@ index 30da015cffeb945973d0045ce297467ab16d7db6..53e7bd0f7dbff8c620a5827abb3ba871
+#if 0
#include "chrome/renderer/chrome_render_thread_observer.h"
+#endif
#include "components/cdm/renderer/external_clear_key_key_system_properties.h"
#include "components/cdm/renderer/widevine_key_system_properties.h"
#include "components/cdm/renderer/external_clear_key_key_system_info.h"
#include "components/cdm/renderer/widevine_key_system_info.h"
#include "content/public/renderer/render_thread.h"
@@ -235,12 +237,14 @@ SupportedCodecs GetSupportedCodecs(const media::CdmCapability& capability) {

20
patches/chromium/desktop_media_list.patch
View file

@ -8,7 +8,7 @@ Subject: desktop_media_list.patch
* Ensure "OnRefreshComplete()" even if there are no items in the list
diff --git a/chrome/browser/media/webrtc/desktop_media_list.h b/chrome/browser/media/webrtc/desktop_media_list.h
index d93450a76e675a317cc6d681768acf8f7f76a92a..589f4bbe6f9d79c8d584edcc4bd1d4936e4b446a 100644
index f16b2dae4dc5c6c0377400a51302bbb34ec5e485..8aba5333fb046e3f2650ce3a63479bd6afc931aa 100644
--- a/chrome/browser/media/webrtc/desktop_media_list.h
+++ b/chrome/browser/media/webrtc/desktop_media_list.h
@@ -107,7 +107,8 @@ class DesktopMediaList {
@ -22,10 +22,10 @@ index d93450a76e675a317cc6d681768acf8f7f76a92a..589f4bbe6f9d79c8d584edcc4bd1d493
virtual int GetSourceCount() const = 0;
virtual const Source& GetSource(int index) const = 0;
diff --git a/chrome/browser/media/webrtc/desktop_media_list_base.cc b/chrome/browser/media/webrtc/desktop_media_list_base.cc
index ac1e7854dc9ae629a499fac7626ec456e18c7867..087da9bbfb9081b94ca8ea8d245871dc3601b1a7 100644
index 62156d9c7fe3908d330807a0642a9e9e04e2cae0..736cf6dfe45046d0a177a915dd599e6163137389 100644
--- a/chrome/browser/media/webrtc/desktop_media_list_base.cc
+++ b/chrome/browser/media/webrtc/desktop_media_list_base.cc
@@ -65,12 +65,12 @@ void DesktopMediaListBase::StartUpdating(DesktopMediaListObserver* observer) {
@@ -69,12 +69,12 @@ void DesktopMediaListBase::StartUpdating(DesktopMediaListObserver* observer) {
Refresh(true);
}
@ -41,7 +41,7 @@ index ac1e7854dc9ae629a499fac7626ec456e18c7867..087da9bbfb9081b94ca8ea8d245871dc
int DesktopMediaListBase::GetSourceCount() const {
diff --git a/chrome/browser/media/webrtc/desktop_media_list_base.h b/chrome/browser/media/webrtc/desktop_media_list_base.h
index 1150cf5fd95cb19d926a9af6d65472b680f53859..0fc3455f4966dd2047329adc308526dadcc64f1b 100644
index 7d8f137be2d337a0069b0fbf890ef04741d986ec..e8de4f72d819ab55a78a1b1a86f522dac6b5a7a6 100644
--- a/chrome/browser/media/webrtc/desktop_media_list_base.h
+++ b/chrome/browser/media/webrtc/desktop_media_list_base.h
@@ -39,7 +39,7 @@ class DesktopMediaListBase : public DesktopMediaList {
@ -54,7 +54,7 @@ index 1150cf5fd95cb19d926a9af6d65472b680f53859..0fc3455f4966dd2047329adc308526da
const Source& GetSource(int index) const override;
DesktopMediaList::Type GetMediaListType() const override;
diff --git a/chrome/browser/media/webrtc/fake_desktop_media_list.cc b/chrome/browser/media/webrtc/fake_desktop_media_list.cc
index 2bf801156b93305705914d3dcb7dcbbebd03c096..6ea87e4471ab64c838b705c64be6bc10d74b213e 100644
index 196a49e70a2aaae4e3dc456e9bc00e878d577750..f1ea9ee497d538f2802103d8cc58dd102e088676 100644
--- a/chrome/browser/media/webrtc/fake_desktop_media_list.cc
+++ b/chrome/browser/media/webrtc/fake_desktop_media_list.cc
@@ -77,7 +77,8 @@ void FakeDesktopMediaList::StartUpdating(DesktopMediaListObserver* observer) {
@ -68,7 +68,7 @@ index 2bf801156b93305705914d3dcb7dcbbebd03c096..6ea87e4471ab64c838b705c64be6bc10
}
diff --git a/chrome/browser/media/webrtc/fake_desktop_media_list.h b/chrome/browser/media/webrtc/fake_desktop_media_list.h
index 1e4a652634fbde2ca9a256baca840bbc5a0e001f..546f5bc3a2f79035f0eec196d9e704b849992a6f 100644
index 0f3bc1477387ea24f20647dc668ed82ce7e609b0..a791ff38795392b32e7cfcacd646bb68fe4cf9e5 100644
--- a/chrome/browser/media/webrtc/fake_desktop_media_list.h
+++ b/chrome/browser/media/webrtc/fake_desktop_media_list.h
@@ -32,7 +32,8 @@ class FakeDesktopMediaList : public DesktopMediaList {
@ -82,10 +82,10 @@ index 1e4a652634fbde2ca9a256baca840bbc5a0e001f..546f5bc3a2f79035f0eec196d9e704b8
const Source& GetSource(int index) const override;
DesktopMediaList::Type GetMediaListType() const override;
diff --git a/chrome/browser/media/webrtc/native_desktop_media_list.cc b/chrome/browser/media/webrtc/native_desktop_media_list.cc
index d2297c082f482219f35c3acf5bcc8dadf18bbafb..97b1589793962b2b601a78ef5118256903ee65f9 100644
index 9cc555065bde14bbbed57112ce09a02768bfc38c..67fe851eb2cf014e6a4e7d4b99499ca4d943291e 100644
--- a/chrome/browser/media/webrtc/native_desktop_media_list.cc
+++ b/chrome/browser/media/webrtc/native_desktop_media_list.cc
@@ -139,8 +139,9 @@ BOOL CALLBACK AllHwndCollector(HWND hwnd, LPARAM param) {
@@ -141,8 +141,9 @@ BOOL CALLBACK AllHwndCollector(HWND hwnd, LPARAM param) {
#endif // BUILDFLAG(IS_WIN)
#if BUILDFLAG(IS_MAC)
@ -96,7 +96,7 @@ index d2297c082f482219f35c3acf5bcc8dadf18bbafb..97b1589793962b2b601a78ef51182569
#endif
} // namespace
@@ -427,6 +428,9 @@ void NativeDesktopMediaList::Worker::RefreshNextThumbnail() {
@@ -440,6 +441,9 @@ void NativeDesktopMediaList::Worker::RefreshNextThumbnail() {
FROM_HERE,
base::BindOnce(&NativeDesktopMediaList::UpdateNativeThumbnailsFinished,
media_list_));
@ -106,7 +106,7 @@ index d2297c082f482219f35c3acf5bcc8dadf18bbafb..97b1589793962b2b601a78ef51182569
}
void NativeDesktopMediaList::Worker::OnCaptureResult(
@@ -642,6 +646,11 @@ void NativeDesktopMediaList::RefreshForVizFrameSinkWindows(
@@ -748,6 +752,11 @@ void NativeDesktopMediaList::RefreshForVizFrameSinkWindows(
FROM_HERE, base::BindOnce(&Worker::RefreshThumbnails,
base::Unretained(worker_.get()),
std::move(native_ids), thumbnail_size_));

4
patches/chromium/disable_color_correct_rendering.patch
View file

@ -81,10 +81,10 @@ index 9d34ced366026eb7cdd00ce40a4eb1af56180d39..abf67f8246bfa37df08cd2216c388dd3
!command_line->HasSwitch(switches::kUIDisablePartialSwap);
diff --git a/content/browser/gpu/gpu_process_host.cc b/content/browser/gpu/gpu_process_host.cc
index 81cd08b72e56dd2893f252bba5a2291983e3d06c..4c90b6d5780cfda9ffdc0623fe856f2ad651314a 100644
index 510c2bb4c8a859a36605eb4dbfc5b5ce11a9334d..b685b682ee12861b8e9de0bfa83d2ad054a11898 100644
--- a/content/browser/gpu/gpu_process_host.cc
+++ b/content/browser/gpu/gpu_process_host.cc
@@ -228,6 +228,7 @@ GpuTerminationStatus ConvertToGpuTerminationStatus(
@@ -224,6 +224,7 @@ GpuTerminationStatus ConvertToGpuTerminationStatus(
// Command-line switches to propagate to the GPU process.
static const char* const kSwitchNames[] = {

4
patches/chromium/disable_compositor_recycling.patch
View file

@ -6,10 +6,10 @@ Subject: fix: disabling compositor recycling
Compositor recycling is useful for Chrome because there can be many tabs and spinning up a compositor for each one would be costly. In practice, Chrome uses the parent compositor code path of browser_compositor_view_mac.mm; the NSView of each tab is detached when it's hidden and attached when it's shown. For Electron, there is no parent compositor, so we're forced into the "own compositor" code path, which seems to be non-optimal and pretty ruthless in terms of the release of resources. Electron has no real concept of multiple tabs per window, so it should be okay to disable this ruthless recycling altogether in Electron.
diff --git a/content/browser/renderer_host/render_widget_host_view_mac.mm b/content/browser/renderer_host/render_widget_host_view_mac.mm
index 72486b22a2ae6bfcfea4e552c80170ab63cf1cfe..5f2e2cd8ad12687bcf4a8232c56ee1ceac03da11 100644
index e0168e7cf64a783a96aa4e43fa3a80bfbbe1fbac..5812734dbc86831e4c7611319647225732b483ea 100644
--- a/content/browser/renderer_host/render_widget_host_view_mac.mm
+++ b/content/browser/renderer_host/render_widget_host_view_mac.mm
@@ -517,7 +517,11 @@
@@ -524,7 +524,11 @@
return;
host()->WasHidden();

4
patches/chromium/disable_freezing_flags_after_init_in_node.patch
View file

@ -15,10 +15,10 @@ at some point be an API to "unfreeze" the flags, or we may be able to refactor
node initialization to not update flags after V8 initialization.
diff --git a/content/renderer/render_process_impl.cc b/content/renderer/render_process_impl.cc
index 7e2661bcd6a4cc34aa7e6fc8960b6e4070492232..fcf632a8f85119ef825b14f5e5ce87469a92c9e1 100644
index c00f1b3d1bde2c1bcc201e6580b8f6151e09af0c..bc33814fb82632c0956f057a4e91fd29c45c9d40 100644
--- a/content/renderer/render_process_impl.cc
+++ b/content/renderer/render_process_impl.cc
@@ -223,6 +223,9 @@ RenderProcessImpl::RenderProcessImpl()
@@ -226,6 +226,9 @@ RenderProcessImpl::RenderProcessImpl()
SetV8FlagIfNotFeature(features::kWebAssemblyDynamicTiering,
"--no-wasm-dynamic-tiering");

4
patches/chromium/disable_hidden.patch
View file

@ -34,10 +34,10 @@ index 1301db91b45b5cde376835f2d4caaea92a26556e..31f37242c8a833065fd5e11b7b25e090
// |routing_id| must not be MSG_ROUTING_NONE.
// If this object outlives |delegate|, DetachDelegate() must be called when
diff --git a/content/browser/renderer_host/render_widget_host_view_aura.cc b/content/browser/renderer_host/render_widget_host_view_aura.cc
index 24a1e12da93f497e963c1455c22e876d1d0e744c..72ab43bf80a1bbf376a7392d92b01077d325424b 100644
index b9a9aefe1eb1acaf0aeedda2e1945c5ab0219684..06501c3703c68e15d127609a34c4026d10964e31 100644
--- a/content/browser/renderer_host/render_widget_host_view_aura.cc
+++ b/content/browser/renderer_host/render_widget_host_view_aura.cc
@@ -595,7 +595,7 @@ void RenderWidgetHostViewAura::HideImpl() {
@@ -602,7 +602,7 @@ void RenderWidgetHostViewAura::HideImpl() {
DCHECK(visibility_ == Visibility::HIDDEN ||
visibility_ == Visibility::OCCLUDED);

6
patches/chromium/don_t_run_pcscan_notifythreadcreated_if_pcscan_is_disabled.patch
View file

@ -7,14 +7,14 @@ PCScan should not be invoked if PCScan is disabled.
Upstreamed at https://chromium-review.googlesource.com/c/chromium/src/+/2965109.
diff --git a/base/allocator/partition_allocator/memory_reclaimer.cc b/base/allocator/partition_allocator/memory_reclaimer.cc
index 1e54559bd5f9a2ee889b921379d70c51e902502d..6797a076b612ad4ed6d5ce7d9868d944fae3694f 100644
index 0d480d11d5d51fa72639d346448ec22f2f6b9621..d6ea0053cee3dcd5ba1ef79c52b82c858876e337 100644
--- a/base/allocator/partition_allocator/memory_reclaimer.cc
+++ b/base/allocator/partition_allocator/memory_reclaimer.cc
@@ -66,7 +66,7 @@ void MemoryReclaimer::Reclaim(int flags) {
@@ -70,7 +70,7 @@ void MemoryReclaimer::Reclaim(int flags) {
//
// Lastly decommit empty slot spans and lastly try to discard unused pages at
// the end of the remaining active slots.
-#if PA_STARSCAN_ENABLE_STARSCAN_ON_RECLAIM
-#if PA_STARSCAN_ENABLE_STARSCAN_ON_RECLAIM && BUILDFLAG(STARSCAN)
+#if PA_STARSCAN_ENABLE_STARSCAN_ON_RECLAIM && defined(PA_ALLOW_PCSCAN)
{
using PCScan = internal::PCScan;

4
patches/chromium/expose_setuseragent_on_networkcontext.patch
View file

@ -33,7 +33,7 @@ index 14c71cc69388da46f62d9835e2a06fef0870da02..9481ea08401ae29ae9c1d960491b05b3
} // namespace net
diff --git a/services/network/network_context.cc b/services/network/network_context.cc
index a5e45a071608d77afabf5e1270a8785f0ea87f41..ec2f1211e4aac3bc65c21ab1aedba7332e37b8b7 100644
index 8c29d366ec2c3cc61ec121163e3549472964653c..3363d15a38cb1849a0ccd11077f2e7b4ef9c8865 100644
--- a/services/network/network_context.cc
+++ b/services/network/network_context.cc
@@ -1412,6 +1412,13 @@ void NetworkContext::SetNetworkConditions(
@ -51,7 +51,7 @@ index a5e45a071608d77afabf5e1270a8785f0ea87f41..ec2f1211e4aac3bc65c21ab1aedba733
// This may only be called on NetworkContexts created with the constructor
// that calls MakeURLRequestContext().
diff --git a/services/network/network_context.h b/services/network/network_context.h
index d51b39a29e39de77018339bf665a6e70984d762f..ea10e87f10e365bc0adf6fa592a13fda3930aa6c 100644
index 572f555b32eb4e38bdcd23b4725c3b4df38316ad..56d27025f215910c40f5dabc41ac61e0b46df784 100644
--- a/services/network/network_context.h
+++ b/services/network/network_context.h
@@ -300,6 +300,7 @@ class COMPONENT_EXPORT(NETWORK_SERVICE) NetworkContext

2
patches/chromium/feat_add_data_parameter_to_processsingleton.patch
View file

@ -65,7 +65,7 @@ index 9de82e5422428d6419a24401e0479fbd19a15147..a30b3aae436bbe762ada1bdae69ef831
#if BUILDFLAG(IS_WIN)
bool EscapeVirtualization(const base::FilePath& user_data_dir);
diff --git a/chrome/browser/process_singleton_posix.cc b/chrome/browser/process_singleton_posix.cc
index b1721c7034cd082edd2d155b172b8f3aa8d67566..e9419a0b4de2f39730f9478914b307b3bdb45459 100644
index 99b42b0e8f81c6a5696d56fede3e168cfc282cc3..c205a14239eb9aa2b422a45755d3b07935f379c8 100644
--- a/chrome/browser/process_singleton_posix.cc
+++ b/chrome/browser/process_singleton_posix.cc
@@ -607,6 +607,7 @@ class ProcessSingleton::LinuxWatcher

2
patches/chromium/feat_add_onclose_to_messageport.patch
View file

@ -10,7 +10,7 @@ get this standardised, but in lieu of that, this makes MessagePort a
whole bunch more useful!
diff --git a/third_party/blink/renderer/core/messaging/message_port.cc b/third_party/blink/renderer/core/messaging/message_port.cc
index 747ce956e2622e1bb881cf281365419743ef933f..43196369af48b7393919d2624451aa3528ed1c0a 100644
index bea9ad4d66ad154d349d6d3165a55636b705733d..c4df8c86d474880eb01fe12db3cedd23d93b4b67 100644
--- a/third_party/blink/renderer/core/messaging/message_port.cc
+++ b/third_party/blink/renderer/core/messaging/message_port.cc
@@ -167,6 +167,7 @@ void MessagePort::close() {

2
patches/chromium/feat_allow_embedders_to_add_observers_on_created_hunspell.patch
View file

@ -7,7 +7,7 @@ Subject: feat: allow embedders to add observers on created hunspell
This patch is used by Electron to implement spellchecker events.
diff --git a/chrome/browser/spellchecker/spellcheck_service.cc b/chrome/browser/spellchecker/spellcheck_service.cc
index bbc3ea681bfe0db0e122635db5442c447a30d387..26bc4ccfcc7583fd76cd290132b0729c1f01bae3 100644
index 10568da304f7f618ae8003d9722b999ae2bd4c45..60a9b42f02cc07d685be825d5c3d3fcd68f31045 100644
--- a/chrome/browser/spellchecker/spellcheck_service.cc
+++ b/chrome/browser/spellchecker/spellcheck_service.cc
@@ -467,6 +467,9 @@ void SpellcheckService::LoadDictionaries() {

2
patches/chromium/feat_filter_out_non-shareable_windows_in_the_current_application_in.patch
View file

@ -7,7 +7,7 @@ Subject: feat: filter out non-shareable windows in the current application in
This patch ensures that windows protected via win.setContentProtection(true) do not appear in full display captures via desktopCapturer. This patch could be upstreamed but as the check is limited to in-process windows it doesn't make a lot of sense for Chromium itself. This patch currently has a limitation that it only function for windows created / protected BEFORE the stream is started. There is theoretical future work we can do via polling / observers to automatically update the SCContentFilter when new windows are made but for now this will solve 99+% of the problem and folks can re-order their logic a bit to get it working for their use cases.
diff --git a/content/browser/media/capture/screen_capture_kit_device_mac.mm b/content/browser/media/capture/screen_capture_kit_device_mac.mm
index 50a779be2e7d3a95496e2791187a6b56266786eb..5876babb99b5e98b151e13e4091305763a417a9e 100644
index 35cb1bb72a462c91d21bd1c99c35d90478c9442c..2bbb3fe1b1b747770da466c33633489830a42afe 100644
--- a/content/browser/media/capture/screen_capture_kit_device_mac.mm
+++ b/content/browser/media/capture/screen_capture_kit_device_mac.mm
@@ -100,7 +100,15 @@ void OnShareableContentCreated(

10
patches/chromium/fix_adapt_exclusive_access_for_electron_needs.patch
View file

@ -16,7 +16,7 @@ Linux or Windows to un-fullscreen in some circumstances without this
change.
diff --git a/chrome/browser/ui/exclusive_access/fullscreen_controller.cc b/chrome/browser/ui/exclusive_access/fullscreen_controller.cc
index e05527c70cfaf3254a7318734b3947902b5b39de..328391453dda2125e172940947d6a88794141e66 100644
index 31f9403bf89095f8694aecc855c24d81be9261e7..1e82eaa7b45e1a1b04b132d752ae8252ee55ad1f 100644
--- a/chrome/browser/ui/exclusive_access/fullscreen_controller.cc
+++ b/chrome/browser/ui/exclusive_access/fullscreen_controller.cc
@@ -17,12 +17,16 @@
@ -66,7 +66,7 @@ index e05527c70cfaf3254a7318734b3947902b5b39de..328391453dda2125e172940947d6a887
if (MaybeToggleFullscreenWithinTab(web_contents, false)) {
// During tab capture of fullscreen-within-tab views, the browser window
@@ -296,11 +304,13 @@ void FullscreenController::ExitFullscreenModeForTab(WebContents* web_contents) {
@@ -299,11 +307,13 @@ void FullscreenController::ExitFullscreenModeForTab(WebContents* web_contents) {
void FullscreenController::FullscreenTabOpeningPopup(
content::WebContents* opener,
content::WebContents* popup) {
@ -80,7 +80,7 @@ index e05527c70cfaf3254a7318734b3947902b5b39de..328391453dda2125e172940947d6a887
}
void FullscreenController::OnTabDeactivated(
@@ -469,18 +479,17 @@ void FullscreenController::EnterFullscreenModeInternal(
@@ -472,18 +482,17 @@ void FullscreenController::EnterFullscreenModeInternal(
// Do not enter fullscreen mode if disallowed by pref. This prevents the user
// from manually entering fullscreen mode and also disables kiosk mode on
// desktop platforms.
@ -104,7 +104,7 @@ index e05527c70cfaf3254a7318734b3947902b5b39de..328391453dda2125e172940947d6a887
if (option == TAB) {
url = GetRequestingOrigin();
tab_fullscreen_ = true;
@@ -513,6 +522,7 @@ void FullscreenController::EnterFullscreenModeInternal(
@@ -516,6 +525,7 @@ void FullscreenController::EnterFullscreenModeInternal(
if (!extension_caused_fullscreen_.is_empty())
url = extension_caused_fullscreen_;
}
@ -112,7 +112,7 @@ index e05527c70cfaf3254a7318734b3947902b5b39de..328391453dda2125e172940947d6a887
if (option == BROWSER)
base::RecordAction(base::UserMetricsAction("ToggleFullscreen"));
@@ -540,12 +550,12 @@ void FullscreenController::ExitFullscreenModeInternal() {
@@ -543,12 +553,12 @@ void FullscreenController::ExitFullscreenModeInternal() {
RecordExitingUMA();
toggled_into_fullscreen_ = false;
started_fullscreen_transition_ = true;

4
patches/chromium/fix_allow_guest_webcontents_to_enter_fullscreen.patch
View file

@ -6,10 +6,10 @@ Subject: fix: allow guest webcontents to enter fullscreen
This can be upstreamed, a guest webcontents can't technically become the focused webContents. This DCHECK should allow all guest webContents to request fullscreen entrance.
diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser/web_contents/web_contents_impl.cc
index 78dd6ba073bffbf1bd64824c3f297e0608abdf18..db4e0329878375caf0a475c85a295fc6a25c1ac1 100644
index d5af52091f201cc51c3525798d99e2e42f623979..dfb2ac1c515176c12f7f39d08b671321f6a931b4 100644
--- a/content/browser/web_contents/web_contents_impl.cc
+++ b/content/browser/web_contents/web_contents_impl.cc
@@ -3472,7 +3472,7 @@ void WebContentsImpl::EnterFullscreenMode(
@@ -3460,7 +3460,7 @@ void WebContentsImpl::EnterFullscreenMode(
OPTIONAL_TRACE_EVENT0("content", "WebContentsImpl::EnterFullscreenMode");
DCHECK(CanEnterFullscreenMode(requesting_frame, options));
DCHECK(requesting_frame->IsActive());

8
patches/chromium/fix_crash_loading_non-standard_schemes_in_iframes.patch
View file

@ -17,10 +17,10 @@ policy->CanCommitOriginAndUrl.
Upstreamed at https://chromium-review.googlesource.com/c/chromium/src/+/3856266.
diff --git a/content/browser/renderer_host/navigation_request.cc b/content/browser/renderer_host/navigation_request.cc
index d35e801d583addd4e1df5de2764705116a644b6b..eed886c08cdba65e96f3b009ad792c13e6338c85 100644
index 60990c07ce73b461f56c8eb042506fde297e043c..e85d5244644a2fd7c92283781aaed7bbd7c71cbc 100644
--- a/content/browser/renderer_host/navigation_request.cc
+++ b/content/browser/renderer_host/navigation_request.cc
@@ -6554,10 +6554,11 @@ std::pair<url::Origin, std::string> NavigationRequest::
@@ -6560,10 +6560,11 @@ std::pair<url::Origin, std::string> NavigationRequest::
if (IsForMhtmlSubframe())
return origin_with_debug_info;
@ -37,10 +37,10 @@ index d35e801d583addd4e1df5de2764705116a644b6b..eed886c08cdba65e96f3b009ad792c13
}
diff --git a/content/browser/renderer_host/render_frame_host_impl.h b/content/browser/renderer_host/render_frame_host_impl.h
index 27116b461d0397f36f7895d54684af758730e5f5..23c9e1a8dd9fafbbecc48238cf971d3e68f44506 100644
index f9be00fbdcae3099fd94e90a274300aed1c6a8ee..565d11af17a88c0cc7d273f27a1ef87504ae20a7 100644
--- a/content/browser/renderer_host/render_frame_host_impl.h
+++ b/content/browser/renderer_host/render_frame_host_impl.h
@@ -2544,6 +2544,17 @@ class CONTENT_EXPORT RenderFrameHostImpl
@@ -2545,6 +2545,17 @@ class CONTENT_EXPORT RenderFrameHostImpl
HandleAXEvents(tree_id, std::move(updates_and_events), reset_token);
}

2
patches/chromium/fix_crash_when_saving_edited_pdf_files.patch
View file

@ -13,7 +13,7 @@ This patch can be removed should we choose to support chrome.fileSystem
or support it enough to fix the crash.
diff --git a/chrome/browser/resources/pdf/pdf_viewer.ts b/chrome/browser/resources/pdf/pdf_viewer.ts
index 940a00b9b9f992d4254fc74922c3d8b31772fa4e..b3373265a65a6b50276a09bfb54065521ad6eac4 100644
index 025b6bf032ced3a5dc34498dcbca05528fbe447b..2a635cfe8da7bf0c7aa6192e7123292fc64e73d9 100644
--- a/chrome/browser/resources/pdf/pdf_viewer.ts
+++ b/chrome/browser/resources/pdf/pdf_viewer.ts
@@ -860,26 +860,12 @@ export class PDFViewerElement extends PDFViewerBaseElement {

4
patches/chromium/fix_expose_decrementcapturercount_in_web_contents_impl.patch
View file

@ -8,10 +8,10 @@ we invoke it in order to expose contents.decrementCapturerCount([stayHidden, sta
to users. We should try to upstream this.
diff --git a/content/browser/web_contents/web_contents_impl.h b/content/browser/web_contents/web_contents_impl.h
index 2439b0f25a1a1ce646d21c1aaefec6b59aac99be..bc094576d5796bdac7859a9dfcc5890744f48388 100644
index 1b10f7f79cf784409fd63ffefa191e0eaf5c34c8..919027b9233ef1f568263a3d61ed1479b72aea2c 100644
--- a/content/browser/web_contents/web_contents_impl.h
+++ b/content/browser/web_contents/web_contents_impl.h
@@ -1860,7 +1860,7 @@ class CONTENT_EXPORT WebContentsImpl : public WebContents,
@@ -1866,7 +1866,7 @@ class CONTENT_EXPORT WebContentsImpl : public WebContents,
// IncrementCapturerCount() is destructed.
void DecrementCapturerCount(bool stay_hidden,
bool stay_awake,

18
patches/chromium/fix_return_v8_value_from_localframe_requestexecutescript.patch
View file

@ -64,10 +64,10 @@ index b3cf48eb7c6581605997e31b55d7f3ff95dd7b27..cb700cd45c02b718c7b21bf6579eba10
#endif // THIRD_PARTY_BLINK_PUBLIC_WEB_WEB_SCRIPT_EXECUTION_CALLBACK_H_
diff --git a/third_party/blink/renderer/core/frame/local_frame.cc b/third_party/blink/renderer/core/frame/local_frame.cc
index f67b4f09d2986511da6d0916223992374046844c..6d471553d244aa4b35b0a120cb8c955a2fb895ba 100644
index baba2925889605ab997a1ceb1f4acd1b809bcf58..646ad196cdd800d29312717cc3d07e052407fa6b 100644
--- a/third_party/blink/renderer/core/frame/local_frame.cc
+++ b/third_party/blink/renderer/core/frame/local_frame.cc
@@ -2563,6 +2563,7 @@ void LocalFrame::RequestExecuteScript(
@@ -2561,6 +2561,7 @@ void LocalFrame::RequestExecuteScript(
mojom::blink::EvaluationTiming evaluation_timing,
mojom::blink::LoadEventBlockingOption blocking_option,
WebScriptExecutionCallback callback,
@ -75,7 +75,7 @@ index f67b4f09d2986511da6d0916223992374046844c..6d471553d244aa4b35b0a120cb8c955a
BackForwardCacheAware back_forward_cache_aware,
mojom::blink::WantResultOption want_result_option,
mojom::blink::PromiseResultOption promise_behavior) {
@@ -2593,7 +2594,8 @@ void LocalFrame::RequestExecuteScript(
@@ -2591,7 +2592,8 @@ void LocalFrame::RequestExecuteScript(
PausableScriptExecutor::CreateAndRun(
ToScriptState(DomWindow(), *world), std::move(script_sources),
execute_script_policy, user_gesture, evaluation_timing, blocking_option,
@ -86,7 +86,7 @@ index f67b4f09d2986511da6d0916223992374046844c..6d471553d244aa4b35b0a120cb8c955a
void LocalFrame::SetEvictCachedSessionStorageOnFreezeOrUnload() {
diff --git a/third_party/blink/renderer/core/frame/local_frame.h b/third_party/blink/renderer/core/frame/local_frame.h
index e1d6f20a56dc615ea6473053a6306ec036ec3926..580475769150738c76d8e13f743dc0bf8166c21e 100644
index 57bf122146a70a74acf38dc1748825f712519455..91cdecfd28d0e4fc16a6e1c4dfc70e7c600adad2 100644
--- a/third_party/blink/renderer/core/frame/local_frame.h
+++ b/third_party/blink/renderer/core/frame/local_frame.h
@@ -750,6 +750,7 @@ class CORE_EXPORT LocalFrame final
@ -98,7 +98,7 @@ index e1d6f20a56dc615ea6473053a6306ec036ec3926..580475769150738c76d8e13f743dc0bf
mojom::blink::WantResultOption,
mojom::blink::PromiseResultOption);
diff --git a/third_party/blink/renderer/core/frame/local_frame_mojo_handler.cc b/third_party/blink/renderer/core/frame/local_frame_mojo_handler.cc
index 39056ba90f6579f8d3c19b7cc0b341736eae7363..e73a1da750d34cadaecf9c524c7f247e2175117f 100644
index 7a354cceb208bfb950ed6f5661d97dbede36b73b..6aeee90b382d6438c6003d837819c91f21a2a922 100644
--- a/third_party/blink/renderer/core/frame/local_frame_mojo_handler.cc
+++ b/third_party/blink/renderer/core/frame/local_frame_mojo_handler.cc
@@ -1034,6 +1034,7 @@ void LocalFrameMojoHandler::JavaScriptExecuteRequestInIsolatedWorld(
@ -205,10 +205,10 @@ index a73ad2a1dd7f4b89a167512a852e28294a99cc51..b41f811f82cb8eb19994f790c07bd807
const mojom::blink::UserActivationOption user_activation_option_;
const mojom::blink::LoadEventBlockingOption blocking_option_;
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 92b9e87a2ce7fae53f5a0858ae28b472bb12dc20..0cd9882bbea4403399742c77b6c7b57916ad7959 100644
index 0263b59002af9947c182cb6876a790660850adc4..5e301fa46d130bfd4323f84d15dd338b425607ed 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
@@ -1102,14 +1102,15 @@ void WebLocalFrameImpl::RequestExecuteScript(
@@ -1101,14 +1101,15 @@ void WebLocalFrameImpl::RequestExecuteScript(
mojom::blink::EvaluationTiming evaluation_timing,
mojom::blink::LoadEventBlockingOption blocking_option,
WebScriptExecutionCallback callback,
@ -227,10 +227,10 @@ index 92b9e87a2ce7fae53f5a0858ae28b472bb12dc20..0cd9882bbea4403399742c77b6c7b579
v8::MaybeLocal<v8::Value> WebLocalFrameImpl::CallFunctionEvenIfScriptDisabled(
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 4a9ddf5d7d3e7fa0887c9c74bf2173deb364fe77..cab4511c9b1e76fdd6099e6ba16019583d21ed58 100644
index 6dffe8a49e95af372524c0cfd9aaea802a09b6c7..31785d69b99c867a3a73b7ea5b09aba007c3f2a7 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
@@ -190,6 +190,7 @@ class CORE_EXPORT WebLocalFrameImpl final
@@ -192,6 +192,7 @@ class CORE_EXPORT WebLocalFrameImpl final
mojom::blink::EvaluationTiming,
mojom::blink::LoadEventBlockingOption,
WebScriptExecutionCallback,

6
patches/chromium/frame_host_manager.patch
View file

@ -6,7 +6,7 @@ Subject: frame_host_manager.patch
Allows embedder to intercept site instances created by chromium.
diff --git a/content/browser/renderer_host/render_frame_host_manager.cc b/content/browser/renderer_host/render_frame_host_manager.cc
index 29f89b511650c6921b817ba3be559be8fb71ed82..e455ac4fc3c689e6bc11977e07ad747cbf9a8122 100644
index de6b2e7f68b013501421d30c315c8254f622a395..8bf4cca30dfe4c916753e1c3db76628b0338e18f 100644
--- a/content/browser/renderer_host/render_frame_host_manager.cc
+++ b/content/browser/renderer_host/render_frame_host_manager.cc
@@ -3265,6 +3265,9 @@ RenderFrameHostManager::GetSiteInstanceForNavigationRequest(
@ -20,10 +20,10 @@ index 29f89b511650c6921b817ba3be559be8fb71ed82..e455ac4fc3c689e6bc11977e07ad747c
}
diff --git a/content/public/browser/content_browser_client.h b/content/public/browser/content_browser_client.h
index 3c6465c4954b9b63d8cf5ead3dc7047be1537d37..aeabae91f5cb268255a90a9d39666c1e73a81e5a 100644
index 67a8cbf589693a0a347f6604a36ed2a39d4ef2da..8ee5503e252bb8dffebbee358c76ef51ada6b41d 100644
--- a/content/public/browser/content_browser_client.h
+++ b/content/public/browser/content_browser_client.h
@@ -271,6 +271,11 @@ class CONTENT_EXPORT ContentBrowserClient {
@@ -272,6 +272,11 @@ class CONTENT_EXPORT ContentBrowserClient {
virtual ~ContentBrowserClient() = default;

4
patches/chromium/gpu_notify_when_dxdiag_request_fails.patch
View file

@ -40,10 +40,10 @@ index 1fc56c055d423ab074f8f4f90415e34593a04a18..c637247f003e1c6bfe073a43a0985168
void UpdateDawnInfo(const std::vector<std::string>& dawn_info_list);
diff --git a/content/browser/gpu/gpu_data_manager_impl_private.cc b/content/browser/gpu/gpu_data_manager_impl_private.cc
index ae3b50661e10625d5c137e25341a7147b1943318..4e34d8dcbf4e910420edc759f8199d3cae05f7dc 100644
index 91d8c7cc2b8105a4f7ef9aa314b3b4e92b94d6dd..45ba80fc280499ae48921f428eb2c6915d1cf528 100644
--- a/content/browser/gpu/gpu_data_manager_impl_private.cc
+++ b/content/browser/gpu/gpu_data_manager_impl_private.cc
@@ -1199,6 +1199,12 @@ void GpuDataManagerImplPrivate::TerminateInfoCollectionGpuProcess() {
@@ -1198,6 +1198,12 @@ void GpuDataManagerImplPrivate::TerminateInfoCollectionGpuProcess() {
if (host)
host->ForceShutdown();
}

4
patches/chromium/gritsettings_resource_ids.patch
View file

@ -6,10 +6,10 @@ Subject: gritsettings_resource_ids.patch
Add electron resources file to the list of resource ids generation.
diff --git a/tools/gritsettings/resource_ids.spec b/tools/gritsettings/resource_ids.spec
index 5d87051035d3fe7d3c1cd3dcb26fa0def2eaf60f..ca535271d5f2204bb56a9fa49246463d48d4893c 100644
index f5bb5e97796d7671efb934af872e8573f1588b9b..75103073ce550ace4846459450d07eb8f8056324 100644
--- a/tools/gritsettings/resource_ids.spec
+++ b/tools/gritsettings/resource_ids.spec
@@ -1001,6 +1001,11 @@
@@ -1019,6 +1019,11 @@
"includes": [4960],
},

2
patches/chromium/hack_to_allow_gclient_sync_with_host_os_mac_on_linux_in_ci.patch
View file

@ -11,7 +11,7 @@ If removing this patch causes no sync failures, it's safe to delete :+1:
Ref https://chromium-review.googlesource.com/c/chromium/src/+/2953903
diff --git a/tools/clang/scripts/update.py b/tools/clang/scripts/update.py
index fe897b968977307896e6a8b8f25dedfa22ad496b..fa4b1b761d2c4e8a8dcf719525d6178bcd26a8e3 100755
index 0685b244c405b8680cfceeb077d499d4d01cd2d2..9f5f77cc5147e4822b02ba426e1d25524c49fd4c 100755
--- a/tools/clang/scripts/update.py
+++ b/tools/clang/scripts/update.py
@@ -302,6 +302,8 @@ def GetDefaultHostOs():

2
patches/chromium/logging_win32_only_create_a_console_if_logging_to_stderr.patch
View file

@ -9,7 +9,7 @@ be created for each child process, despite logs being redirected to a
file.
diff --git a/content/app/content_main.cc b/content/app/content_main.cc
index bd93b27bf8107735056023a12ca2a9bc59a2ba50..78cd3fa0032ff8dccd1c9c0b9a3cb15bea49e684 100644
index 7ba896e8e0d77fd2b4c9e3cf7cb5660dc38865ac..62b84767b8a11e1a92933c337cd9f9453b238a42 100644
--- a/content/app/content_main.cc
+++ b/content/app/content_main.cc
@@ -413,8 +413,12 @@ RunContentProcess(ContentMainParams params,

10
patches/chromium/mas_disable_remote_accessibility.patch
View file

@ -44,7 +44,7 @@ index 306db835fe203f663b1d84dd3490b619eb3f60b2..7a41d7afe6197e0a78934206782b1063
} // namespace
diff --git a/components/remote_cocoa/app_shim/native_widget_ns_window_bridge.mm b/components/remote_cocoa/app_shim/native_widget_ns_window_bridge.mm
index 85a3c64f9808a8809f7bb65e1460b8fb4c015c30..10ebb40b66781df70e1c93a3c108883a56f924a8 100644
index 4719512943b8c3930bca35a226fc3e635021c109..55292d12f486cd9b954398fcf407c9b88ca5fd47 100644
--- a/components/remote_cocoa/app_shim/native_widget_ns_window_bridge.mm
+++ b/components/remote_cocoa/app_shim/native_widget_ns_window_bridge.mm
@@ -565,10 +565,12 @@ NSUInteger CountBridgedWindows(NSArray* child_windows) {
@ -144,7 +144,7 @@ index 0549e3b400cb42e1a3491a2de9739c275ae006df..ab59ea7211b425e36d3d0fa673d8c09b
// Used to force the NSApplication's focused accessibility element to be the
// content::BrowserAccessibilityCocoa accessibility tree when the NSView for
diff --git a/content/browser/renderer_host/render_widget_host_view_mac.mm b/content/browser/renderer_host/render_widget_host_view_mac.mm
index 1773eb621964618e85359d4240eeb7c4dfc640f5..72486b22a2ae6bfcfea4e552c80170ab63cf1cfe 100644
index 2d106cbcfd6fd63b95c0f322dda3dc926ebcc118..e0168e7cf64a783a96aa4e43fa3a80bfbbe1fbac 100644
--- a/content/browser/renderer_host/render_widget_host_view_mac.mm
+++ b/content/browser/renderer_host/render_widget_host_view_mac.mm
@@ -259,8 +259,10 @@
@ -158,7 +158,7 @@ index 1773eb621964618e85359d4240eeb7c4dfc640f5..72486b22a2ae6bfcfea4e552c80170ab
// Disconnect from the previous bridge (this will have the effect of
// destroying the associated bridge), and close the receiver (to allow it
@@ -1561,8 +1563,10 @@ void CombineTextNodesAndMakeCallback(SpeechCallback callback,
@@ -1566,8 +1568,10 @@ void CombineTextNodesAndMakeCallback(SpeechCallback callback,
gfx::NativeViewAccessible
RenderWidgetHostViewMac::AccessibilityGetNativeViewAccessibleForWindow() {
@ -169,7 +169,7 @@ index 1773eb621964618e85359d4240eeb7c4dfc640f5..72486b22a2ae6bfcfea4e552c80170ab
return [GetInProcessNSView() window];
}
@@ -1606,9 +1610,11 @@ void CombineTextNodesAndMakeCallback(SpeechCallback callback,
@@ -1611,9 +1615,11 @@ void CombineTextNodesAndMakeCallback(SpeechCallback callback,
}
void RenderWidgetHostViewMac::SetAccessibilityWindow(NSWindow* window) {
@ -181,7 +181,7 @@ index 1773eb621964618e85359d4240eeb7c4dfc640f5..72486b22a2ae6bfcfea4e552c80170ab
}
bool RenderWidgetHostViewMac::SyncIsWidgetForMainFrame(
@@ -2103,12 +2109,14 @@ void CombineTextNodesAndMakeCallback(SpeechCallback callback,
@@ -2108,12 +2114,14 @@ void CombineTextNodesAndMakeCallback(SpeechCallback callback,
void RenderWidgetHostViewMac::SetRemoteAccessibilityWindowToken(
const std::vector<uint8_t>& window_token) {

2
patches/chromium/mas_no_private_api.patch
View file

@ -183,7 +183,7 @@ index d872796dee0dee4aa14c238f788b962b3f1c9311..4d5f74c18d773755d5d8f7223bc0d5c9
"AudioToolbox.framework",
"AudioUnit.framework",
diff --git a/media/audio/mac/audio_manager_mac.cc b/media/audio/mac/audio_manager_mac.cc
index eb0aff29b2f4fd2b035ef96186fd58d976876b05..8a68a8885ec42715c9b9dab0f04d1b90eb9baa6e 100644
index cbd8d46f180ae85f26ecdee634bcd604e5078800..aa2d83e84188facd1185791555b949e99788f9f4 100644
--- a/media/audio/mac/audio_manager_mac.cc
+++ b/media/audio/mac/audio_manager_mac.cc
@@ -885,7 +885,7 @@ AudioParameters AudioManagerMac::GetPreferredOutputStreamParameters(

4
patches/chromium/network_service_allow_remote_certificate_verification_logic.patch
View file

@ -7,7 +7,7 @@ This adds a callback from the network service that's used to implement
session.setCertificateVerifyCallback.
diff --git a/services/network/network_context.cc b/services/network/network_context.cc
index f94a0b6a22df82a89fa356edfec72d27ae164c63..a5e45a071608d77afabf5e1270a8785f0ea87f41 100644
index 5c1bfe41c6eb67960b5a326681d37ad64a9bd337..8c29d366ec2c3cc61ec121163e3549472964653c 100644
--- a/services/network/network_context.cc
+++ b/services/network/network_context.cc
@@ -130,6 +130,11 @@
@ -139,7 +139,7 @@ index f94a0b6a22df82a89fa356edfec72d27ae164c63..a5e45a071608d77afabf5e1270a8785f
builder.SetCertVerifier(IgnoreErrorsCertVerifier::MaybeWrapCertVerifier(
diff --git a/services/network/network_context.h b/services/network/network_context.h
index 5fe6fd5b54f28cdb504bf56e88f26f54c219ce6f..d51b39a29e39de77018339bf665a6e70984d762f 100644
index 9b6e6c7dfdbbbde3157f8b743ba406b5156d8bd1..572f555b32eb4e38bdcd23b4725c3b4df38316ad 100644
--- a/services/network/network_context.h
+++ b/services/network/network_context.h
@@ -104,6 +104,7 @@ class URLMatcher;

2
patches/chromium/pepper_plugin_support.patch
View file

@ -7,7 +7,7 @@ This tweaks Chrome's pepper flash and PDF plugin support to make it
usable from Electron.
diff --git a/chrome/browser/renderer_host/pepper/pepper_isolated_file_system_message_filter.cc b/chrome/browser/renderer_host/pepper/pepper_isolated_file_system_message_filter.cc
index 2425ccd480f4b0f3ac3b9dddb5dbf90639fe515b..6f20e2edd880e34149668ece6e80e79b3da8dc66 100644
index ca55966a41bfa455febb67b315cb308807036795..c9ca9aa56a9e4c66c4e7fd6c085e58299555a043 100644
--- a/chrome/browser/renderer_host/pepper/pepper_isolated_file_system_message_filter.cc
+++ b/chrome/browser/renderer_host/pepper/pepper_isolated_file_system_message_filter.cc
@@ -6,17 +6,21 @@

4
patches/chromium/picture-in-picture.patch
View file

@ -113,7 +113,7 @@ index b2b178ccadce82f8d4ec8e5a6dafe1c67bcecd74..603d82a461c4c443ac26c85a46fbd866
// OverlayWindowViews
bool ControlsHitTestContainsPoint(const gfx::Point& point) override;
diff --git a/chrome/browser/ui/views/overlay/overlay_window_views.cc b/chrome/browser/ui/views/overlay/overlay_window_views.cc
index 590d247e1136b9ac5f766a613e8d91916eb0dda4..453c358d210d48d21a237654143439f2065e98fe 100644
index 691df6efd7703cfd41c6468697f291f021758c2c..ad31fc53bdac6667ca9f1a15cc3390e3713136fd 100644
--- a/chrome/browser/ui/views/overlay/overlay_window_views.cc
+++ b/chrome/browser/ui/views/overlay/overlay_window_views.cc
@@ -14,9 +14,11 @@
@ -128,7 +128,7 @@ index 590d247e1136b9ac5f766a613e8d91916eb0dda4..453c358d210d48d21a237654143439f2
#include "chrome/grit/generated_resources.h"
#include "chromeos/ui/base/chromeos_ui_constants.h"
#include "components/vector_icons/vector_icons.h"
@@ -37,7 +39,7 @@
@@ -35,7 +37,7 @@
#include "ui/aura/window.h"
#endif

6
patches/chromium/printing.patch
View file

@ -11,7 +11,7 @@ majority of changes originally come from these PRs:
This patch also fixes callback for manual user cancellation and success.
diff --git a/BUILD.gn b/BUILD.gn
index 90f92c53aea415aec1fd997d99d17ffc911811e4..c299bc4a8b2f483ff8607e5e89895158aef120dd 100644
index 5396a2163add191edcd9d54da7974a5e75ee792e..77a6c439fdbf2444e4532579a0e97f5d8cce214a 100644
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -984,7 +984,6 @@ if (is_win) {
@ -796,10 +796,10 @@ index 66026548181a897c161d7202646f33fd8847ccb8..113a8165b5db6294087773e5a4b2f003
#if BUILDFLAG(ENABLE_PRINT_PREVIEW)
// Set options for print preset from source PDF document.
diff --git a/content/browser/BUILD.gn b/content/browser/BUILD.gn
index 77deaa26319118b937d6b0c394c33e72c94232e3..70585fbf9d40581725f48d9d73a350ab0d3d4421 100644
index ba3e4bc8a46d8936435a015cc8bbd7e83be08943..5c2979a98fa0b05067801a6dd3109f375681868d 100644
--- a/content/browser/BUILD.gn
+++ b/content/browser/BUILD.gn
@@ -2808,8 +2808,9 @@ source_set("browser") {
@@ -2812,8 +2812,9 @@ source_set("browser") {
"//ppapi/shared_impl",
]

2
patches/chromium/process_singleton.patch
View file

@ -51,7 +51,7 @@ index 7cd82d27a741f194da5d0b3fcfd9c15c8ea1fa5c..9de82e5422428d6419a24401e0479fbd
base::win::MessageWindow window_; // The message-only window.
bool is_virtualized_; // Stuck inside Microsoft Softricity VM environment.
diff --git a/chrome/browser/process_singleton_posix.cc b/chrome/browser/process_singleton_posix.cc
index 7e4cc9cdd350e814c20feccdcc8d70b1080e60a1..b1721c7034cd082edd2d155b172b8f3aa8d67566 100644
index a7647b1f3a9d8421dae277ad1d5c35e3c8147942..99b42b0e8f81c6a5696d56fede3e168cfc282cc3 100644
--- a/chrome/browser/process_singleton_posix.cc
+++ b/chrome/browser/process_singleton_posix.cc
@@ -54,6 +54,7 @@

6
patches/chromium/refactor_expose_cursor_changes_to_the_webcontentsobserver.patch
View file

@ -43,10 +43,10 @@ index 47c25cf13a76de1c04624fff5e3773c05809b0a1..41c8d3beaef9a4fac41f2e7021f231a7
void RenderWidgetHostImpl::ShowContextMenuAtPoint(
diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser/web_contents/web_contents_impl.cc
index 62387a653bf7fc38eff14fa383d6cbb7b13bfe39..35264a5da11fb224d6cdf0b55e8b3b53d152aed6 100644
index 707d9a116c8ea119977b54d3a3365d96fef05a5a..b48f62fb5ba99e7399e739d9d23346c48218c247 100644
--- a/content/browser/web_contents/web_contents_impl.cc
+++ b/content/browser/web_contents/web_contents_impl.cc
@@ -4603,6 +4603,11 @@ TextInputManager* WebContentsImpl::GetTextInputManager() {
@@ -4591,6 +4591,11 @@ TextInputManager* WebContentsImpl::GetTextInputManager() {
return text_input_manager_.get();
}
@ -59,7 +59,7 @@ index 62387a653bf7fc38eff14fa383d6cbb7b13bfe39..35264a5da11fb224d6cdf0b55e8b3b53
RenderWidgetHostImpl* render_widget_host) {
return render_widget_host == GetPrimaryMainFrame()->GetRenderWidgetHost();
diff --git a/content/browser/web_contents/web_contents_impl.h b/content/browser/web_contents/web_contents_impl.h
index 335ed04c3409651ac0a1fe5915f5aaae8884ab36..2439b0f25a1a1ce646d21c1aaefec6b59aac99be 100644
index b6669772c51c8888f23afa03193333aed9bbbf46..1b10f7f79cf784409fd63ffefa191e0eaf5c34c8 100644
--- a/content/browser/web_contents/web_contents_impl.h
+++ b/content/browser/web_contents/web_contents_impl.h
@@ -977,6 +977,7 @@ class CONTENT_EXPORT WebContentsImpl : public WebContents,

6
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 a4eb64823fbc2fe3c381e850235f5a447194dfc5..78dd6ba073bffbf1bd64824c3f297e0608abdf18 100644
index 84b48011e5a9d5b890a26debce68d0efd3c013c4..d5af52091f201cc51c3525798d99e2e42f623979 100644
--- a/content/browser/web_contents/web_contents_impl.cc
+++ b/content/browser/web_contents/web_contents_impl.cc
@@ -3094,6 +3094,13 @@ void WebContentsImpl::Init(const WebContents::CreateParams& params,
@@ -3083,6 +3083,13 @@ void WebContentsImpl::Init(const WebContents::CreateParams& params,
site_instance.get(), params.renderer_initiated_creation,
params.main_frame_name, GetOpener(), primary_main_frame_policy);
@ -26,7 +26,7 @@ index a4eb64823fbc2fe3c381e850235f5a447194dfc5..78dd6ba073bffbf1bd64824c3f297e06
std::unique_ptr<WebContentsViewDelegate> delegate =
GetContentClient()->browser()->GetWebContentsViewDelegate(this);
@@ -3104,6 +3111,7 @@ void WebContentsImpl::Init(const WebContents::CreateParams& params,
@@ -3093,6 +3100,7 @@ void WebContentsImpl::Init(const WebContents::CreateParams& params,
view_ = CreateWebContentsView(this, std::move(delegate),
&render_view_host_delegate_view_);
}

4
patches/chromium/webview_fullscreen.patch
View file

@ -14,10 +14,10 @@ Note that we also need to manually update embedder's
`api::WebContents::IsFullscreenForTabOrPending` value.
diff --git a/content/browser/renderer_host/render_frame_host_impl.cc b/content/browser/renderer_host/render_frame_host_impl.cc
index dd466e61b47c2bdf9652b5155b9c84ff2cd7352d..969b2eab8b6319d345a8b61082fba97bbd3c2fdf 100644
index 21eb439646c16aa72e78e9436006a29cbd8c5bf4..596710609cfc0071534855e321a894845cfac645 100644
--- a/content/browser/renderer_host/render_frame_host_impl.cc
+++ b/content/browser/renderer_host/render_frame_host_impl.cc
@@ -6591,6 +6591,17 @@ void RenderFrameHostImpl::EnterFullscreen(
@@ -6602,6 +6602,17 @@ void RenderFrameHostImpl::EnterFullscreen(
}
}

6
patches/chromium/worker_context_will_destroy.patch
View file

@ -10,7 +10,7 @@ An attempt to upstream this was made, but rejected:
https://chromium-review.googlesource.com/c/chromium/src/+/1954347
diff --git a/content/public/renderer/content_renderer_client.h b/content/public/renderer/content_renderer_client.h
index a9146ec6c85b3dfa854d764e8010124f76cd3fc7..e0b308051be9b34ce26b65f6cd582beb7743662d 100644
index 8f711800e92192a8b4205ab38467807a87e5d5a6..4801b3abafb156d561d8bbc4526b91822de72143 100644
--- a/content/public/renderer/content_renderer_client.h
+++ b/content/public/renderer/content_renderer_client.h
@@ -365,6 +365,11 @@ class CONTENT_EXPORT ContentRendererClient {
@ -55,10 +55,10 @@ index 9718602c31f866b668cd211ff4fd72f69de1cd42..8f80fb04990c3e2820dcbc9b89dc0255
const blink::WebSecurityOrigin& script_origin) override;
blink::ProtocolHandlerSecurityLevel GetProtocolHandlerSecurityLevel()
diff --git a/third_party/blink/public/platform/platform.h b/third_party/blink/public/platform/platform.h
index ad34b6230f57ad906bae515aa73ea2aaf1bfeede..b5cff1fee2d14c02f2d67cf012b7ba24fc3a7a06 100644
index 18008b93d906637bada69e6fe66adf94f50690f4..a4c6696c35c6d6560c725f818eec8c25dc714736 100644
--- a/third_party/blink/public/platform/platform.h
+++ b/third_party/blink/public/platform/platform.h
@@ -625,6 +625,7 @@ class BLINK_PLATFORM_EXPORT Platform {
@@ -626,6 +626,7 @@ class BLINK_PLATFORM_EXPORT Platform {
virtual void DidStartWorkerThread() {}
virtual void WillStopWorkerThread() {}
virtual void WorkerContextCreated(const v8::Local<v8::Context>& worker) {}

6
patches/chromium/worker_feat_add_hook_to_notify_script_ready.patch
View file

@ -19,7 +19,7 @@ that clearly establishes the worker script is ready for evaluation with the scop
initialized.
diff --git a/content/public/renderer/content_renderer_client.h b/content/public/renderer/content_renderer_client.h
index e0b308051be9b34ce26b65f6cd582beb7743662d..857d5eb211890b10e143f54662636f2ba522b698 100644
index 4801b3abafb156d561d8bbc4526b91822de72143..2ff6e4232180ea6620d3d9b65f511b391c64f435 100644
--- a/content/public/renderer/content_renderer_client.h
+++ b/content/public/renderer/content_renderer_client.h
@@ -365,6 +365,11 @@ class CONTENT_EXPORT ContentRendererClient {
@ -65,10 +65,10 @@ index 8f80fb04990c3e2820dcbc9b89dc0255c9c49d30..f16af9a3e4027066cddbd5082998adc8
bool AllowScriptExtensionForServiceWorker(
const blink::WebSecurityOrigin& script_origin) override;
diff --git a/third_party/blink/public/platform/platform.h b/third_party/blink/public/platform/platform.h
index b5cff1fee2d14c02f2d67cf012b7ba24fc3a7a06..765c0882406fa0ab7ae3d0460ff9a9814f60db0a 100644
index a4c6696c35c6d6560c725f818eec8c25dc714736..305b7873ee67c3dfb03c83b62cdd2b3759b963de 100644
--- a/third_party/blink/public/platform/platform.h
+++ b/third_party/blink/public/platform/platform.h
@@ -625,6 +625,8 @@ class BLINK_PLATFORM_EXPORT Platform {
@@ -626,6 +626,8 @@ class BLINK_PLATFORM_EXPORT Platform {
virtual void DidStartWorkerThread() {}
virtual void WillStopWorkerThread() {}
virtual void WorkerContextCreated(const v8::Local<v8::Context>& worker) {}

4
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 338fa2c32c6d6ad00c2dd0bae33a78342547814a..42d6e15a7e729c1605b4057b1f811c95b0beb95f 100644
index afa37f0124f1a7d9e5b61a1b1261f0cdeb538617..e2121d78513d20338fc322558d9cdece4c962421 100644
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -650,7 +650,7 @@ config("internal_config") {
@ -21,7 +21,7 @@ index 338fa2c32c6d6ad00c2dd0bae33a78342547814a..42d6e15a7e729c1605b4057b1f811c95
defines += [ "BUILDING_V8_SHARED" ]
}
@@ -6148,7 +6148,7 @@ if (current_toolchain == v8_generator_toolchain) {
@@ -6155,7 +6155,7 @@ if (current_toolchain == v8_generator_toolchain) {
"src/interpreter/bytecodes.h",
]

4
patches/v8/dcheck.patch
View file

@ -6,10 +6,10 @@ Subject: dcheck.patch
https://github.com/auchenberg/volkswagen
diff --git a/src/api/api.cc b/src/api/api.cc
index 76bce7d8c8a31a56d62d55e2ff429eee3a5b4393..f21a0320dd635aa8cc0b52b9055a693bad825632 100644
index 3ee474d9b9b36a070ccfcf04e82125f2d696ae45..fc685d7460c93c74e769fe7086559052ae9be035 100644
--- a/src/api/api.cc
+++ b/src/api/api.cc
@@ -9117,7 +9117,7 @@ void Isolate::SetPromiseRejectCallback(PromiseRejectCallback callback) {
@@ -9115,7 +9115,7 @@ void Isolate::SetPromiseRejectCallback(PromiseRejectCallback callback) {
}
void Isolate::PerformMicrotaskCheckpoint() {

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 e8e089934cc5130d1fc08929da173e45229a70b0..bf0894541a19390fd2b2bb56ba441574bfe75976 100644
index 49da0a718df8c4ec34123eec2c63feaf680e2791..9fcc4d08f2f2d3aa097ddca596ee332729a7836c 100644
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -650,6 +650,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 42d6e15a7e729c1605b4057b1f811c95b0beb95f..e8e089934cc5130d1fc08929da173e45229a70b0 100644
index e2121d78513d20338fc322558d9cdece4c962421..49da0a718df8c4ec34123eec2c63feaf680e2791 100644
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -6160,7 +6160,6 @@ if (current_toolchain == v8_generator_toolchain) {
@@ -6167,7 +6167,6 @@ if (current_toolchain == v8_generator_toolchain) {
if (current_toolchain == v8_snapshot_toolchain) {
v8_executable("mksnapshot") {

2
patches/v8/fix_disable_implies_dcheck_for_node_stream_array_buffers.patch
View file

@ -18,7 +18,7 @@ This patch can be removed when streams support rab/gsab, or
when support is synchronized across both v8 and node.
diff --git a/src/objects/js-array-buffer.cc b/src/objects/js-array-buffer.cc
index dd59d5d6afc7c8e0b309d4e8928cd2bb7e682884..f3445a71aa02683dc40221b2eee1a80071629fef 100644
index c5b45087f0afd1a025cb816f0d6a5e6ff3231826..4b01d18d385bf6f2c4762b7b8086cbc2c535dbc8 100644
--- a/src/objects/js-array-buffer.cc
+++ b/src/objects/js-array-buffer.cc
@@ -72,9 +72,9 @@ void JSArrayBuffer::Attach(std::shared_ptr<BackingStore> backing_store) {

8
patches/v8/revert_runtime_dhceck_terminating_exception_in_microtasks.patch
View file

@ -18,10 +18,10 @@ index f58636fee555d782e18b7521c0c4f28ed60b3a52..6b0c63b34ff09f70cb9a4fe419f3b9bb
StoreRoot(RootIndex::kCurrentMicrotask, microtask);
TNode<IntPtrT> saved_entered_context_count = GetEnteredContextCount();
diff --git a/src/codegen/code-stub-assembler.cc b/src/codegen/code-stub-assembler.cc
index 4d2b42a112c88ed163de3671b41fffb163583262..6616932710ce34446d82ef44294ff57d667375a8 100644
index 550025ec72cb3ef580035845d1f43063ef347b6d..1f6d0cdd835cb4f46f3985788f41e0b594441b89 100644
--- a/src/codegen/code-stub-assembler.cc
+++ b/src/codegen/code-stub-assembler.cc
@@ -6139,12 +6139,6 @@ void CodeStubAssembler::SetPendingMessage(TNode<HeapObject> message) {
@@ -6151,12 +6151,6 @@ void CodeStubAssembler::SetPendingMessage(TNode<HeapObject> message) {
StoreFullTaggedNoWriteBarrier(pending_message, message);
}
@ -35,10 +35,10 @@ index 4d2b42a112c88ed163de3671b41fffb163583262..6616932710ce34446d82ef44294ff57d
int type) {
return Word32Equal(instance_type, Int32Constant(type));
diff --git a/src/codegen/code-stub-assembler.h b/src/codegen/code-stub-assembler.h
index 9c7e4f4eda805044c2787840f98ecc76862e9de9..cb00bf8d37a935bbef488eabeb958c414751a904 100644
index 324e6a43a773515fe23add5e30a90fc1175f220a..fd92af8cf594108911533e6babcf76f40def15a2 100644
--- a/src/codegen/code-stub-assembler.h
+++ b/src/codegen/code-stub-assembler.h
@@ -2538,7 +2538,6 @@ class V8_EXPORT_PRIVATE CodeStubAssembler
@@ -2542,7 +2542,6 @@ class V8_EXPORT_PRIVATE CodeStubAssembler
TNode<HeapObject> GetPendingMessage();
void SetPendingMessage(TNode<HeapObject> message);

10
patches/v8/workaround_an_undefined_symbol_error.patch
View file

@ -12,10 +12,10 @@ By moving some functions out of the the arm64-assembler header file,
this error no longer seems to happen.
diff --git a/src/codegen/arm64/assembler-arm64.cc b/src/codegen/arm64/assembler-arm64.cc
index a0d25b77bfe8ef4f945efa82fd53feeefb48ab20..025c07703269a3c235757bb2ac9508bd4c3c2910 100644
index 754c79815ab06fe1ed1bdce9f40d62ee78d1e564..221452fb3e80639fe28ee65840b865a36610246d 100644
--- a/src/codegen/arm64/assembler-arm64.cc
+++ b/src/codegen/arm64/assembler-arm64.cc
@@ -3606,6 +3606,22 @@ void Assembler::MoveWide(const Register& rd, uint64_t imm, int shift,
@@ -3607,6 +3607,22 @@ void Assembler::MoveWide(const Register& rd, uint64_t imm, int shift,
ImmMoveWide(static_cast<int>(imm)) | ShiftMoveWide(shift));
}
@ -39,10 +39,10 @@ index a0d25b77bfe8ef4f945efa82fd53feeefb48ab20..025c07703269a3c235757bb2ac9508bd
const Operand& operand, FlagsUpdate S, AddSubOp op) {
DCHECK_EQ(rd.SizeInBits(), rn.SizeInBits());
diff --git a/src/codegen/arm64/assembler-arm64.h b/src/codegen/arm64/assembler-arm64.h
index c1f082c1b0b650bc7bf89d23e173f92b4a36e228..740c50630e41d4f5c5efe5cebe80aaef645fdc39 100644
index e079e87a205b10306c209b2e25143503efe6501e..412bf6df4d6a95a31a50206fa84a3b2c745c1ac1 100644
--- a/src/codegen/arm64/assembler-arm64.h
+++ b/src/codegen/arm64/assembler-arm64.h
@@ -2119,11 +2119,7 @@ class V8_EXPORT_PRIVATE Assembler : public AssemblerBase {
@@ -2124,11 +2124,7 @@ class V8_EXPORT_PRIVATE Assembler : public AssemblerBase {
return rm.code() << Rm_offset;
}
@ -55,7 +55,7 @@ index c1f082c1b0b650bc7bf89d23e173f92b4a36e228..740c50630e41d4f5c5efe5cebe80aaef
static Instr Ra(CPURegister ra) {
DCHECK_NE(ra.code(), kSPRegInternalCode);
@@ -2147,15 +2143,8 @@ class V8_EXPORT_PRIVATE Assembler : public AssemblerBase {
@@ -2152,15 +2148,8 @@ class V8_EXPORT_PRIVATE Assembler : public AssemblerBase {
// These encoding functions allow the stack pointer to be encoded, and
// disallow the zero register.

1
shell/browser/api/electron_api_desktop_capturer.h
View file

@ -58,6 +58,7 @@ class DesktopCapturer : public gin::Wrappable<DesktopCapturer>,
void OnSourceNameChanged(int index) override {}
void OnSourceThumbnailChanged(int index) override {}
void OnSourcePreviewChanged(size_t index) override {}
void OnDelegatedSourceListSelection() override {}
private:
void UpdateSourcesList(DesktopMediaList* list);

10
shell/browser/electron_browser_context.cc
View file

@ -45,7 +45,6 @@
#include "shell/browser/electron_download_manager_delegate.h"
#include "shell/browser/electron_permission_manager.h"
#include "shell/browser/net/resolve_proxy_helper.h"
#include "shell/browser/pref_store_delegate.h"
#include "shell/browser/protocol_registry.h"
#include "shell/browser/special_storage_policy.h"
#include "shell/browser/ui/inspectable_web_contents.h"
@ -110,7 +109,8 @@ ElectronBrowserContext::browser_context_map() {
ElectronBrowserContext::ElectronBrowserContext(const std::string& partition,
bool in_memory,
base::Value::Dict options)
: storage_policy_(base::MakeRefCounted<SpecialStoragePolicy>()),
: in_memory_pref_store_(new ValueMapPrefStore),
storage_policy_(base::MakeRefCounted<SpecialStoragePolicy>()),
protocol_registry_(base::WrapUnique(new ProtocolRegistry)),
in_memory_(in_memory),
ssl_config_(network::mojom::SSLConfig::New()) {
@ -170,6 +170,7 @@ void ElectronBrowserContext::InitPrefs() {
base::MakeRefCounted<JsonPrefStore>(prefs_path);
pref_store->ReadPrefs(); // Synchronous.
prefs_factory.set_user_prefs(pref_store);
prefs_factory.set_command_line_prefs(in_memory_pref_store());
#if BUILDFLAG(ENABLE_ELECTRON_EXTENSIONS)
if (!in_memory_) {
@ -210,10 +211,7 @@ void ElectronBrowserContext::InitPrefs() {
language::LanguagePrefs::RegisterProfilePrefs(registry.get());
#endif
prefs_ = prefs_factory.Create(
registry.get(),
std::make_unique<PrefStoreDelegate>(weak_factory_.GetWeakPtr()));
prefs_->UpdateCommandLinePrefStore(new ValueMapPrefStore);
prefs_ = prefs_factory.Create(registry.get());
#if BUILDFLAG(ENABLE_ELECTRON_EXTENSIONS) || \
BUILDFLAG(ENABLE_BUILTIN_SPELLCHECKER)
user_prefs::UserPrefs::Set(this, prefs_.get());

8
shell/browser/electron_browser_context.h
View file

@ -140,11 +140,8 @@ class ElectronBrowserContext : public content::BrowserContext {
return cookie_change_notifier_.get();
}
PrefService* prefs() const { return prefs_.get(); }
void set_in_memory_pref_store(ValueMapPrefStore* pref_store) {
in_memory_pref_store_ = pref_store;
}
ValueMapPrefStore* in_memory_pref_store() const {
return in_memory_pref_store_;
return in_memory_pref_store_.get();
}
base::WeakPtr<ElectronBrowserContext> GetWeakPtr() {
return weak_factory_.GetWeakPtr();
@ -209,8 +206,7 @@ class ElectronBrowserContext : public content::BrowserContext {
const base::Value* device_to_compare,
blink::PermissionType permission_type);
ValueMapPrefStore* in_memory_pref_store_ = nullptr;
scoped_refptr<ValueMapPrefStore> in_memory_pref_store_;
std::unique_ptr<content::ResourceContext> resource_context_;
std::unique_ptr<CookieChangeNotifier> cookie_change_notifier_;
std::unique_ptr<PrefService> prefs_;

8
shell/browser/extensions/api/tabs/tabs_api.cc
View file

@ -221,8 +221,7 @@ ExtensionFunction::ResponseAction TabsGetFunction::Run() {
// TODO(nornagon): in Chrome, the tab URL is only available to extensions
// that have the "tabs" (or "activeTab") permission. We should do the same
// permission check here.
tab.url = std::make_unique<std::string>(
contents->web_contents()->GetLastCommittedURL().spec());
tab.url = contents->web_contents()->GetLastCommittedURL().spec();
tab.active = contents->IsFocused();
@ -438,7 +437,7 @@ ExtensionFunction::ResponseAction TabsUpdateFunction::Run() {
// Navigate the tab to a new location if the url is different.
std::string error;
if (params->update_properties.url.get()) {
if (params->update_properties.url) {
std::string updated_url = *params->update_properties.url;
if (!UpdateURL(updated_url, tab_id, &error))
return RespondNow(Error(std::move(error)));
@ -506,8 +505,7 @@ ExtensionFunction::ResponseValue TabsUpdateFunction::GetResult() {
// TODO(nornagon): in Chrome, the tab URL is only available to extensions
// that have the "tabs" (or "activeTab") permission. We should do the same
// permission check here.
tab.url = std::make_unique<std::string>(
web_contents_->GetLastCommittedURL().spec());
tab.url = web_contents_->GetLastCommittedURL().spec();
return ArgumentList(tabs::Get::Results::Create(std::move(tab)));
}

13
shell/browser/extensions/electron_messaging_delegate.cc
View file

@ -40,21 +40,20 @@ ElectronMessagingDelegate::IsNativeMessagingHostAllowed(
return PolicyPermission::DISALLOW;
}
std::unique_ptr<base::DictionaryValue>
ElectronMessagingDelegate::MaybeGetTabInfo(content::WebContents* web_contents) {
absl::optional<base::Value::Dict> ElectronMessagingDelegate::MaybeGetTabInfo(
content::WebContents* web_contents) {
if (web_contents) {
auto* api_contents = electron::api::WebContents::From(web_contents);
if (api_contents) {
api::tabs::Tab tab;
tab.id = api_contents->ID();
tab.url = std::make_unique<std::string>(api_contents->GetURL().spec());
tab.title = std::make_unique<std::string>(
base::UTF16ToUTF8(api_contents->GetTitle()));
tab.url = api_contents->GetURL().spec();
tab.title = base::UTF16ToUTF8(api_contents->GetTitle());
tab.audible = api_contents->IsCurrentlyAudible();
return tab.ToValue();
return std::move(tab.ToValue()->GetDict());
}
}
return nullptr;
return absl::nullopt;
}
content::WebContents* ElectronMessagingDelegate::GetWebContentsByTabId(

2
shell/browser/extensions/electron_messaging_delegate.h
View file

@ -27,7 +27,7 @@ class ElectronMessagingDelegate : public MessagingDelegate {
PolicyPermission IsNativeMessagingHostAllowed(
content::BrowserContext* browser_context,
const std::string& native_host_name) override;
std::unique_ptr<base::DictionaryValue> MaybeGetTabInfo(
absl::optional<base::Value::Dict> MaybeGetTabInfo(
content::WebContents* web_contents) override;
content::WebContents* GetWebContentsByTabId(
content::BrowserContext* browser_context,

32
shell/browser/pref_store_delegate.cc
View file

@ -1,32 +0,0 @@
// Copyright (c) 2018 GitHub, Inc.
// Use of this source code is governed by the MIT license that can be
// found in the LICENSE file.
#include "shell/browser/pref_store_delegate.h"
#include <utility>
#include "components/prefs/persistent_pref_store.h"
#include "components/prefs/pref_store.h"
#include "components/prefs/value_map_pref_store.h"
#include "shell/browser/electron_browser_context.h"
namespace electron {
PrefStoreDelegate::PrefStoreDelegate(
base::WeakPtr<ElectronBrowserContext> browser_context)
: browser_context_(std::move(browser_context)) {}
PrefStoreDelegate::~PrefStoreDelegate() {
if (browser_context_)
browser_context_->set_in_memory_pref_store(nullptr);
}
void PrefStoreDelegate::UpdateCommandLinePrefStore(
PrefStore* command_line_prefs) {
if (browser_context_)
browser_context_->set_in_memory_pref_store(
static_cast<ValueMapPrefStore*>(command_line_prefs));
}
} // namespace electron

59
shell/browser/pref_store_delegate.h
View file

@ -1,59 +0,0 @@
// Copyright (c) 2018 GitHub, Inc.
// Use of this source code is governed by the MIT license that can be
// found in the LICENSE file.
#ifndef ELECTRON_SHELL_BROWSER_PREF_STORE_DELEGATE_H_
#define ELECTRON_SHELL_BROWSER_PREF_STORE_DELEGATE_H_
#include <vector>
#include "base/memory/weak_ptr.h"
#include "components/prefs/pref_value_store.h"
class PersistentPrefStore;
class PrefNotifier;
class PrefRegistry;
class PrefStore;
namespace electron {
class ElectronBrowserContext;
// Retrieves handle to the in memory pref store that gets
// initialized with the pref service.
class PrefStoreDelegate : public PrefValueStore::Delegate {
public:
explicit PrefStoreDelegate(
base::WeakPtr<ElectronBrowserContext> browser_context);
~PrefStoreDelegate() override;
// disable copy
PrefStoreDelegate(const PrefStoreDelegate&) = delete;
PrefStoreDelegate& operator=(const PrefStoreDelegate&) = delete;
void Init(PrefStore* managed_prefs,
PrefStore* supervised_user_prefs,
PrefStore* extension_prefs,
PrefStore* standalone_browser_prefs,
PrefStore* command_line_prefs,
PrefStore* user_prefs,
PrefStore* recommended_prefs,
PrefStore* default_prefs,
PrefNotifier* pref_notifier) override {}
void InitIncognitoUserPrefs(
scoped_refptr<PersistentPrefStore> incognito_user_prefs_overlay,
scoped_refptr<PersistentPrefStore> incognito_user_prefs_underlay,
const std::vector<const char*>& overlay_pref_names) override {}
void InitPrefRegistry(PrefRegistry* pref_registry) override {}
void UpdateCommandLinePrefStore(PrefStore* command_line_prefs) override;
private:
base::WeakPtr<ElectronBrowserContext> browser_context_;
};
} // namespace electron
#endif // ELECTRON_SHELL_BROWSER_PREF_STORE_DELEGATE_H_