No bug - Fix merge conflict on a CLOSED TREE
authorBill McCloskey <wmccloskey@mozilla.com>
Thu, 16 Jan 2014 18:17:02 -0800
changeset 163911 9bcc52594322d06609796f8b8af8778f6e34360a
parent 163910 3fe78618846b02f641a4aa035d858e7cc6085444
child 163912 deeb227a03de8356e85278b0841d735b27113ced
child 163997 43f495b7ee462328cff42f631eba1328ffe68170
push id38584
push usercbook@mozilla.com
push dateFri, 17 Jan 2014 10:04:30 +0000
treeherdermozilla-inbound@28a9d7e2416f [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
milestone29.0a1
first release with
nightly linux32
9bcc52594322 / 29.0a1 / 20140117030207 / files
nightly linux64
9bcc52594322 / 29.0a1 / 20140117030207 / files
nightly mac
9bcc52594322 / 29.0a1 / 20140117030207 / files
nightly win32
9bcc52594322 / 29.0a1 / 20140117030207 / files
nightly win64
9bcc52594322 / 29.0a1 / 20140117030207 / files
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
releases
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
No bug - Fix merge conflict on a CLOSED TREE
content/base/src/nsFrameMessageManager.cpp
--- a/content/base/src/nsFrameMessageManager.cpp
+++ b/content/base/src/nsFrameMessageManager.cpp
@@ -918,33 +918,33 @@ nsFrameMessageManager::ReceiveMessage(ns
       JS::Rooted<JSObject*> object(cx, wrappedJS->GetJSObject());
       if (!object) {
         continue;
       }
       JSAutoCompartment ac(cx, object);
 
       // 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);
       JS::Rooted<JSObject*> global(cx, JS_GetGlobalForObject(cx, object));
       nsresult rv = nsContentUtils::WrapNative(cx, global, aTarget, &targetv, true);
       NS_ENSURE_SUCCESS(rv, rv);
 
       JS::Rooted<JSObject*> cpows(cx);
       if (aCpows) {
         if (!aCpows->ToObject(cx, &cpows)) {
           return NS_ERROR_UNEXPECTED;
         }
       }
 
       if (!cpows) {
-        cpows = JS_NewObject(cx, nullptr, nullptr, nullptr);
+        cpows = JS_NewObject(cx, nullptr, JS::NullPtr(), JS::NullPtr());
         if (!cpows) {
           return NS_ERROR_UNEXPECTED;
         }
       }
 
       JS::Rooted<JS::Value> cpowsv(cx, JS::ObjectValue(*cpows));
 
       JS::Rooted<JS::Value> json(cx, JS::NullValue());
@@ -971,17 +971,17 @@ nsFrameMessageManager::ReceiveMessage(ns
       if (!aPrincipal) {
         JS::Rooted<JS::Value> nullValue(cx);
         JS_DefineProperty(cx, param, "principal", nullValue, nullptr, nullptr, JSPROP_ENUMERATE);
       }
 
       // 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);
         NS_ENSURE_SUCCESS(rv, rv);
 
         JS::Rooted<JS::Value> appIdValue(cx, INT_TO_JSVAL(appId));
         JS_DefineProperty(cx, principalObj, "appId", appIdValue, nullptr, nullptr, JSPROP_ENUMERATE);