From 56d9003017a94e7619f98e76b04929115514d08c Mon Sep 17 00:00:00 2001 From: Moonchild Date: Tue, 11 Jan 2022 15:34:17 +0000 Subject: Issue #953 - Neuter the user-facing controls for e10s This should prevent people using a massive footgun that would blow off their entire legs. Requires appropriate FE changes. --- dom/base/nsObjectLoadingContent.cpp | 13 ------------- dom/push/PushNotifier.cpp | 7 +------ 2 files changed, 1 insertion(+), 19 deletions(-) (limited to 'dom') diff --git a/dom/base/nsObjectLoadingContent.cpp b/dom/base/nsObjectLoadingContent.cpp index 128ec2a95d..f8541c61ba 100644 --- a/dom/base/nsObjectLoadingContent.cpp +++ b/dom/base/nsObjectLoadingContent.cpp @@ -3363,19 +3363,6 @@ nsObjectLoadingContent::ShouldPlay(FallbackType &aReason, bool aIgnoreCurrentTyp initializeObjectLoadingContentPrefs(); } - if (BrowserTabsRemoteAutostart()) { - bool shouldLoadInParent = nsPluginHost::ShouldLoadTypeInParent(mContentType); - bool inParent = XRE_IsParentProcess(); - - if (shouldLoadInParent != inParent) { - // Plugins need to be locked to either the parent process or the content - // process. If a plugin is locked to one process type, it can't be used in - // the other. Otherwise we'll get hangs. - aReason = eFallbackDisabled; - return false; - } - } - RefPtr pluginHost = nsPluginHost::GetInst(); // at this point if it's not a plugin, we let it play/fallback diff --git a/dom/push/PushNotifier.cpp b/dom/push/PushNotifier.cpp index e60db2d975..5e2a637500 100644 --- a/dom/push/PushNotifier.cpp +++ b/dom/push/PushNotifier.cpp @@ -113,12 +113,7 @@ PushNotifier::Dispatch(PushDispatcher& aDispatcher) return NS_OK; } - if (BrowserTabsRemoteAutostart()) { - // e10s is enabled, but no content processes are active. - return aDispatcher.HandleNoChildProcesses(); - } - - // e10s is disabled; notify workers in the parent. + // Notify workers in the parent. return aDispatcher.NotifyWorkers(); } -- cgit v1.2.3