summaryrefslogtreecommitdiff
path: root/dom
diff options
context:
space:
mode:
authorMoonchild <moonchild@palemoon.org>2022-01-11 15:34:17 +0000
committerMoonchild <moonchild@palemoon.org>2022-04-08 00:55:37 +0200
commit56d9003017a94e7619f98e76b04929115514d08c (patch)
tree952bd79e8cb7cfa2d071b6dbf13d95caed9d24fa /dom
parente49b80dba7393d5baff831251f7981bc21324d81 (diff)
downloaduxp-56d9003017a94e7619f98e76b04929115514d08c.tar.gz
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.
Diffstat (limited to 'dom')
-rw-r--r--dom/base/nsObjectLoadingContent.cpp13
-rw-r--r--dom/push/PushNotifier.cpp7
2 files changed, 1 insertions, 19 deletions
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<nsPluginHost> 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();
}