Bug 1059662 - Disallow OOP app to embed in-proc apps. r=fabrice

Some mochitest that use embed-apps in an oop context is disabled.
This commit is contained in:
Kan-Ru Chen (陳侃如)
2014-11-11 10:25:36 +08:00
parent aa08921f3c
commit e9f4ef7ac9
11 changed files with 103 additions and 1 deletions

View File

@@ -7,6 +7,7 @@
#include "nsGenericHTMLFrameElement.h"
#include "mozilla/dom/ContentChild.h"
#include "mozilla/Preferences.h"
#include "mozilla/ErrorResult.h"
#include "GeckoProfiler.h"
@@ -437,6 +438,11 @@ nsGenericHTMLFrameElement::GetAppManifestURL(nsAString& aOut)
return NS_OK;
}
if (XRE_GetProcessType() != GeckoProcessType_Default) {
NS_WARNING("Can't embed-apps. Embed-apps is restricted to in-proc apps, see bug 1059662");
return NS_OK;
}
nsAutoString appManifestURL;
nsAutoString widgetManifestURL;