mirror of
https://gitlab.winehq.org/wine/wine-gecko.git
synced 2024-09-13 09:24:08 -07:00
Bug 1189550 - In parent process, cpmm.initialProcessData should be same as ppmm.initialProcessData (r=smaug)
This commit is contained in:
parent
9db6074701
commit
c229b0c580
@ -1432,6 +1432,14 @@ nsFrameMessageManager::GetInitialProcessData(JSContext* aCx, JS::MutableHandleVa
|
||||
init.setObject(*obj);
|
||||
}
|
||||
|
||||
if (!mChrome && XRE_IsParentProcess()) {
|
||||
// This is the cpmm in the parent process. We should use the same object as the ppmm.
|
||||
nsCOMPtr<nsIGlobalProcessScriptLoader> ppmm =
|
||||
do_GetService("@mozilla.org/parentprocessmessagemanager;1");
|
||||
ppmm->GetInitialProcessData(aCx, &init);
|
||||
mInitialProcessData = init;
|
||||
}
|
||||
|
||||
if (!JS_WrapValue(aCx, &init)) {
|
||||
return NS_ERROR_OUT_OF_MEMORY;
|
||||
}
|
||||
@ -2164,7 +2172,6 @@ NS_NewChildProcessMessageManager(nsISyncMessageSender** aResult)
|
||||
NS_ENSURE_TRUE(global->Init(), NS_ERROR_UNEXPECTED);
|
||||
global.forget(aResult);
|
||||
return NS_OK;
|
||||
|
||||
}
|
||||
|
||||
static PLDHashOperator
|
||||
|
Loading…
Reference in New Issue
Block a user