wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

No bug - Fix merge conflict on a CLOSED TREE

Browse Source
This commit is contained in:
Bill McCloskey 2014-01-16 18:17:02 -08:00
parent 430958c398
commit 86f8c70978
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
content/base/src/nsFrameMessageManager.cpp
View File

@ -923,7 +923,7 @@ nsFrameMessageManager::ReceiveMessage(nsISupports* aTarget,
// The parameter for the listener function.
JS::Rooted<JSObject*> param(cx,
JS_NewObject(cx, nullptr, nullptr, nullptr));
JS_NewObject(cx, nullptr, JS::NullPtr(), JS::NullPtr()));
NS_ENSURE_TRUE(param, NS_ERROR_OUT_OF_MEMORY);
JS::Rooted<JS::Value> targetv(cx);
@ -939,7 +939,7 @@ nsFrameMessageManager::ReceiveMessage(nsISupports* aTarget,
}
if (!cpows) {
cpows = JS_NewObject(cx, nullptr, nullptr, nullptr);
cpows = JS_NewObject(cx, nullptr, JS::NullPtr(), JS::NullPtr());
if (!cpows) {
return NS_ERROR_UNEXPECTED;
}
@ -976,7 +976,7 @@ nsFrameMessageManager::ReceiveMessage(nsISupports* aTarget,
// message.principal = { appId: <id>, origin: <origin>, isInBrowserElement: <something> }
else {
JS::Rooted<JSObject*> principalObj(cx,
JS_NewObject(cx, nullptr, nullptr, nullptr));
JS_NewObject(cx, nullptr, JS::NullPtr(), JS::NullPtr()));
uint32_t appId;
nsresult rv = aPrincipal->GetAppId(&appId);