dc72f74020
* chore: bump chromium in DEPS to 5ce64b91b4d6a78c97480059f15ff6469fc0918e * chore: bump chromium in DEPS to e74c73d0000f81b3f40a513176c8d024bba57d28 * chore: bump chromium in DEPS to 501640e650d4657ba63db65fa257e4a899168de7 * chore: bump chromium in DEPS to 00db20e1bc3d77706723a87ada3c1c647a1c37b7 * chore: update patches * refactor: AddNewContents now takes a target_url Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2167732 * chore: SetHostCleanupFinalizationGroupCallback has been removed from V8 * refactor: use WebInputEvent::Namespace types directly Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2160523 * refactor: FollowRedirect takes in cors exempt headers now Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2129787 * refactor: printing::DuplexMode moved to mojo Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2162388 * refactor: use MessagePortDescriptor instead of raw mojo::MessagePipeHandles Refs: https://chromium-review.googlesource.com/c/chromium/src/+/1952124 * chore: update patches * chore: bump chromium in DEPS to f1537676d613f3567cfb43adf577b3847fba4bc3 * chore: update patches * refactor: service_manager::BinderMapWithContext merged into mojo::BinderMap Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2174654 * chore: unused argument removed from ReadAvailableTypes in ui::Clipboard Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2173666 * chore: bump chromium in DEPS to 949888433ab935dd6125c107226a4c9d6da9bf48 * chore: update patches * update patches * chore: update sysroots * chore: bump chromium in DEPS to eaac5b5035fe189b6706e1637122e37134206059 * chore: bump chromium in DEPS to 258b54b903d33dab963adf59016691e6537f8b70 * build: update patches * refactor: cursor.mojom and cursor_types.mojom moved to //ui/base/cursor/mojom Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2172874 * chore: DesktopWindowTreeHostLinux becomes DesktopWindowTreeHostPlatform Refs: * refactor: LogErrorEventDescription moved from ui to x11 Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2164245 * chore: update patches * chore: bump chromium in DEPS to bd06abcfe807d4461683479237cdd920dafa52ca * chore: bump chromium in DEPS to 1afb0891e56f1e79d204db43ca053a46d0974511 * chore: bump chromium in DEPS to 5cb0f794bf7f155bf8c0a241b94e01c9d90c2744 * chore: bump chromium in DEPS to 37327ba3303234e1a3cd3310ca11a68e81b95123 * update patches * remove ClientSideDetectionService from browser_process Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2175320 * refactor: shuttle cursor changed event to WebContentsObserver Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2172779 * chore: bump chromium in DEPS to 1d97904bb6936e106df13705208b73e47367c2b9 * avoid IPC crash introduced earlier in the roll Refs:b67334e781 (diff-607f4e8f7c5686aa09af98c783925babR128)
* remove WebContentsView::SizeContents Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2188931 * chore: bump chromium in DEPS to 87066d1db0546a9de33952ba964e1e42f76f1dae * update patches * adapt to //content creating NetworkContexts https://chromium-review.googlesource.com/c/chromium/src/+/2195196 * WIP temporarily ignore mojo-ified PrintHostMsg_PrintPreviewFailed Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2195343 * add checkout_pgo_profiles to DEPS * chore: bump chromium in DEPS to a095318bec1dedf580d676f408eaeefdbd9956b1 * add blink's execution_context to electron_lib deps Refs:b67334e781
#, https://chromium-review.googlesource.com/c/chromium/src/+/1952124 * update patches * update patches * refactor: use newly mojo-ified PrintPreviewFailed Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2195343 Co-authored-by: Shelley Vohr <shelley.vohr@gmail.com> * chore: update patches * chore: remove NOTIFICATION_EXTENSIONS_READY_DEPRECATED Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2199874 * avoid a call to Profile::FromBrowserContext in printing Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2195757 * chore: bump chromium in DEPS to 8f5c6a46861a991e12ffd80554b6bd41a11b0b65 * chore: bump chromium in DEPS to ab66134739ff3b6bdb8de53bbc58a97d1b7b5d8a * chore: bump chromium in DEPS to dd08df9f6c8d6198f0a7b931ca9e845e27dae033 * chore: update patches * [printing] Mojofy PrintHostMsg_PrintPreviewCancelled https://chromium-review.googlesource.com/c/chromium/src/+/2198331 * [printing] Mojofy PrintHostMsg_PrintPreviewInvalidPrinterSettings https://chromium-review.googlesource.com/c/chromium/src/+/2200556 * [printing] Mojofy PrintHostMsg_DidPrepareDocumentForPreview https://chromium-review.googlesource.com/c/chromium/src/+/2201496 * fix: inherit base network context params * fix: use message handle api specific to embedders * update patches * chore: update v8 headers * fixup! avoid a call to Profile::FromBrowserContext in printing * chore: bump chromium in DEPS to f198bc3276828d992b6202d75a9da6a8363164ea * chore: update patches * Remove cors_exempt_headers.h https://chromium-review.googlesource.com/c/chromium/src/+/2203759 * Supply speech recognition sandbox from service_sandbox_type.h https://chromium-review.googlesource.com/c/chromium/src/+/2206918 * [content] Remove unused methods from WebContents https://chromium-review.googlesource.com/c/chromium/src/+/2199113 * [XProto] Replace XAtom with x11::Atom https://chromium-review.googlesource.com/c/chromium/src/+/2202789 * chore: bump chromium in DEPS to 5df37fabaaed09f3ea511f4ef49203d8ebee7b68 * [UI] Support secondary labels in dropdown menus https://chromium-review.googlesource.com/c/chromium/src/+/2208976 * chore: update patches * refactor: GetSublabelAt => GetSecondaryLabelAt * Revert "[printing] Mojofy PrintHostMsg_DidPrepareDocumentForPreview" This reverts commit 44ed0892a0c81716229638f17253bbb2cf8f037d. https://chromium-review.googlesource.com/c/chromium/src/+/2208778 * Unnest CanonicalCookie::CookieInclusionStatus https://chromium-review.googlesource.com/c/chromium/src/+/2203171 * update print-to-pdf.html with latest html data https://bugs.chromium.org/p/chromium/issues/detail?id=1085667 * chore: bump chromium in DEPS to 5dfa8d5f706580fe983e138952553cd6af11ee8b * fix crash in x server when setting window icon * chore: update patches * Use a normal return value for WebContentsView::GetContainerBounds. https://chromium-review.googlesource.com/c/chromium/src/+/2212481 * fix build on windows * chore: bump chromium in DEPS to 9d15054f4cba060901e43deecf74002f11f47be3 * chore: update patches * [printing] Mojofy PrintHostMsg_CheckForCancel https://chromium-review.googlesource.com/c/chromium/src/+/2212181 Co-authored-by: Samuel Attard <samuel.r.attard@gmail.com> Co-authored-by: Electron Bot <anonymous@electronjs.org> Co-authored-by: Andy Locascio <andy@slack-corp.com> Co-authored-by: Shelley Vohr <shelley.vohr@gmail.com> Co-authored-by: deepak1556 <hop2deep@gmail.com>
109 lines
5.3 KiB
Diff
109 lines
5.3 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Andy Locascio <andy@slack-corp.com>
|
|
Date: Tue, 18 Feb 2020 14:35:04 -0800
|
|
Subject: content: allow embedder to prevent locking scheme registry
|
|
|
|
The //content layer requires all schemes to be registered during startup,
|
|
because Add*Scheme aren't threadsafe. However, Electron exposes the option to
|
|
register additional schemes via JavaScript in the main process before the app
|
|
is ready, but after the //content layer has already locked the registry.
|
|
|
|
This allows embedders to optionally keep the scheme registry unlocked, and it
|
|
is their responsibility to ensure that it is not accessed in a way that would
|
|
cause potential thread-safety issues.
|
|
|
|
Previously upstreamed patch: https://chromium-review.googlesource.com/c/chromium/src/+/1637040
|
|
|
|
This change was lost during upstream refactor in
|
|
https://chromium-review.googlesource.com/c/chromium/src/+/1901591, we should try
|
|
re-submitting the patch.
|
|
|
|
diff --git a/content/app/content_main_runner_impl.cc b/content/app/content_main_runner_impl.cc
|
|
index 474f742a909b0a425c6b1f3e93da211b4bcee919..16b9f816d56dbb6b6943cca6d6b3610afa322f4e 100644
|
|
--- a/content/app/content_main_runner_impl.cc
|
|
+++ b/content/app/content_main_runner_impl.cc
|
|
@@ -634,7 +634,7 @@ int ContentMainRunnerImpl::Initialize(const ContentMainParams& params) {
|
|
}
|
|
#endif
|
|
|
|
- RegisterContentSchemes();
|
|
+ RegisterContentSchemes(delegate_->ShouldLockSchemeRegistry());
|
|
ContentClientInitializer::Set(process_type, delegate_);
|
|
|
|
#if !defined(OS_ANDROID)
|
|
diff --git a/content/common/url_schemes.cc b/content/common/url_schemes.cc
|
|
index c00901a2a4ef59a63033c6669171ec9e3ffd2686..d637b79d9df82ad44b1eed8529024a21e0b3555b 100644
|
|
--- a/content/common/url_schemes.cc
|
|
+++ b/content/common/url_schemes.cc
|
|
@@ -49,7 +49,7 @@ std::vector<std::string>& GetMutableServiceWorkerSchemes() {
|
|
|
|
} // namespace
|
|
|
|
-void RegisterContentSchemes() {
|
|
+void RegisterContentSchemes(bool should_lock_registry) {
|
|
// On Android and in tests, schemes may have been registered already.
|
|
if (g_registered_url_schemes)
|
|
return;
|
|
@@ -105,7 +105,8 @@ void RegisterContentSchemes() {
|
|
// threadsafe so must be called when GURL isn't used on any other thread. This
|
|
// is really easy to mess up, so we say that all calls to Add*Scheme in Chrome
|
|
// must be inside this function.
|
|
- url::LockSchemeRegistries();
|
|
+ if (should_lock_registry)
|
|
+ url::LockSchemeRegistries();
|
|
|
|
// Combine the default savable schemes with the additional ones given.
|
|
GetMutableSavableSchemes().assign(std::begin(kDefaultSavableSchemes),
|
|
diff --git a/content/common/url_schemes.h b/content/common/url_schemes.h
|
|
index 3038f9d25798f36811b6398f8cc0e7d83ecc41b0..68189c36c47ef85b345b0ccc40c456f889977bee 100644
|
|
--- a/content/common/url_schemes.h
|
|
+++ b/content/common/url_schemes.h
|
|
@@ -16,7 +16,7 @@ namespace content {
|
|
// parsed as "standard" or "referrer" with the src/url/ library, then locks the
|
|
// sets of schemes down. The embedder can add additional schemes by
|
|
// overriding the ContentClient::AddAdditionalSchemes method.
|
|
-CONTENT_EXPORT void RegisterContentSchemes();
|
|
+CONTENT_EXPORT void RegisterContentSchemes(bool should_lock_registry = true);
|
|
|
|
// Re-initializes schemes for tests.
|
|
CONTENT_EXPORT void ReRegisterContentSchemesForTests();
|
|
diff --git a/content/public/app/content_main_delegate.cc b/content/public/app/content_main_delegate.cc
|
|
index ed5b0e2c0b4d453560ee9e2e4a55780b409eeea9..46e29dca5d13691bcf9494c0f90b68d6219a75ef 100644
|
|
--- a/content/public/app/content_main_delegate.cc
|
|
+++ b/content/public/app/content_main_delegate.cc
|
|
@@ -37,6 +37,10 @@ int ContentMainDelegate::TerminateForFatalInitializationError() {
|
|
return 0;
|
|
}
|
|
|
|
+bool ContentMainDelegate::ShouldLockSchemeRegistry() {
|
|
+ return true;
|
|
+}
|
|
+
|
|
service_manager::ProcessType ContentMainDelegate::OverrideProcessType() {
|
|
return service_manager::ProcessType::kDefault;
|
|
}
|
|
diff --git a/content/public/app/content_main_delegate.h b/content/public/app/content_main_delegate.h
|
|
index 2d9ee9fa20a9aba1de168cc86bfeea5eab71e6d3..4b163c3fa2ddd258b5527e0ccaf9fc9d2621ef75 100644
|
|
--- a/content/public/app/content_main_delegate.h
|
|
+++ b/content/public/app/content_main_delegate.h
|
|
@@ -77,6 +77,20 @@ class CONTENT_EXPORT ContentMainDelegate {
|
|
// returning initialization error code. Default behavior is CHECK(false).
|
|
virtual int TerminateForFatalInitializationError();
|
|
|
|
+ // Allows the embedder to prevent locking the scheme registry. The scheme
|
|
+ // registry is the list of URL schemes we recognize, with some additional
|
|
+ // information about each scheme such as whether it expects a host. The
|
|
+ // scheme registry is not thread-safe, so by default it is locked before any
|
|
+ // threads are created to ensure single-threaded access. An embedder can
|
|
+ // override this to prevent the scheme registry from being locked during
|
|
+ // startup, but if they do so then they are responsible for making sure that
|
|
+ // the registry is only accessed in a thread-safe way, and for calling
|
|
+ // url::LockSchemeRegistries() when initialization is complete. If possible,
|
|
+ // prefer registering additional schemes through
|
|
+ // ContentClient::AddAdditionalSchemes over preventing the scheme registry
|
|
+ // from being locked.
|
|
+ virtual bool ShouldLockSchemeRegistry();
|
|
+
|
|
// Overrides the Service Manager process type to use for the currently running
|
|
// process.
|
|
virtual service_manager::ProcessType OverrideProcessType();
|