Bug 1158270 - Plugins can't run if e10s is force-disabled. r=jmathies

This commit is contained in:
Felipe Gomes 2015-04-26 20:55:39 -03:00
parent 512bc0cb99
commit 11669e7eee

View File

@ -38,6 +38,7 @@
#include "nsIBlocklistService.h"
#include "nsIAsyncVerifyRedirectCallback.h"
#include "nsIAppShell.h"
#include "nsIXULRuntime.h"
#include "nsError.h"
@ -3196,9 +3197,7 @@ nsObjectLoadingContent::ShouldPlay(FallbackType &aReason, bool aIgnoreCurrentTyp
}
if (XRE_GetProcessType() == GeckoProcessType_Default &&
(Preferences::GetBool("browser.tabs.remote.autostart", false) ||
Preferences::GetBool("browser.tabs.remote.autostart.1", false) ||
Preferences::GetBool("browser.tabs.remote.autostart.2", false))) {
BrowserTabsRemoteAutostart()) {
// Plugins running OOP from the chrome process along with plugins running
// OOP from the content process will hang. Let's prevent that situation.
aReason = eFallbackDisabled;