mirror of
https://github.com/roytam1/palemoon27.git
synced 2026-05-26 14:30:27 +00:00
import changes from rmottola/Arctic-Fox:
- Goanna->Gecko: GoannaMediaPluginService & GoannaTouchDispatcher (1e10799bf) - Goanna->Gecko: GoannaProcess (dd671240a) - Goanna->Gecko: goannamediaplugin (2a9423ba6) - Goanna->Gecko: GoannaContentController (62e7c2f5f) - Goanna->Gecko: GoannaProfiler & GoannaTaskTracer (376c45a3c)
This commit is contained in:
@@ -1326,7 +1326,7 @@ nsScriptSecurityManager::~nsScriptSecurityManager(void)
|
||||
// ContentChild might hold a reference to the domain policy,
|
||||
// and it might release it only after the security manager is
|
||||
// gone. But we can still assert this for the main process.
|
||||
MOZ_ASSERT_IF(XRE_GetProcessType() == GoannaProcessType_Default,
|
||||
MOZ_ASSERT_IF(XRE_GetProcessType() == GeckoProcessType_Default,
|
||||
!mDomainPolicy);
|
||||
}
|
||||
|
||||
@@ -1543,7 +1543,7 @@ nsScriptSecurityManager::GetDomainPolicyActive(bool *aRv)
|
||||
NS_IMETHODIMP
|
||||
nsScriptSecurityManager::ActivateDomainPolicy(nsIDomainPolicy** aRv)
|
||||
{
|
||||
if (XRE_GetProcessType() != GoannaProcessType_Default) {
|
||||
if (XRE_GetProcessType() != GeckoProcessType_Default) {
|
||||
return NS_ERROR_SERVICE_NOT_AVAILABLE;
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user