Backed out changeset e30fa70bd781 (bug 871301) for suspicion of breaking B2G tests. a=backout
authorRyan VanderMeulen <ryanvm@gmail.com>
Tue, 23 Jul 2013 14:56:55 -0400
changeset 119797 b3190912589ea10753a12613d133bbeb831d3973
parent 119796 c7e0efd51559cc7636e4b7baf44b66a94d38d564
child 119798 ea8e6808127fd1a800fdbec351d0df8214fb5897
push id996
push userryanvm@gmail.com
push dateTue, 23 Jul 2013 18:57:33 +0000
reviewersbackout
bugs871301
milestone18.1
backs oute30fa70bd7815d03debc7c8d9066fb58db81557e
Backed out changeset e30fa70bd781 (bug 871301) for suspicion of breaking B2G tests. a=backout CLOSED TREE
security/manager/ssl/src/nsCrypto.cpp
xpfe/components/directory/nsDirectoryViewer.cpp
--- a/security/manager/ssl/src/nsCrypto.cpp
+++ b/security/manager/ssl/src/nsCrypto.cpp
@@ -1925,17 +1925,17 @@ nsCrypto::GenerateCRMFRequest(nsIDOMCRMF
     return NS_ERROR_FAILURE;
   }
   jsString = JS_ValueToString(cx, argv[4]);
   NS_ENSURE_TRUE(jsString, NS_ERROR_OUT_OF_MEMORY);
   argv[4] = STRING_TO_JSVAL(jsString);
   JSAutoByteString jsCallback(cx, jsString);
   NS_ENSURE_TRUE(!!jsCallback, NS_ERROR_OUT_OF_MEMORY);
 
-  nrv = xpc->WrapNative(cx, JS_GetGlobalForScopeChain(cx),
+  nrv = xpc->WrapNative(cx, ::JS_GetGlobalObject(cx),
                         static_cast<nsIDOMCrypto *>(this),
                         NS_GET_IID(nsIDOMCrypto), getter_AddRefs(holder));
   NS_ENSURE_SUCCESS(nrv, nrv);
 
   nrv = holder->GetJSObject(&script_obj);
   NS_ENSURE_SUCCESS(nrv, nrv);
 
   //Put up some UI warning that someone is trying to 
--- a/xpfe/components/directory/nsDirectoryViewer.cpp
+++ b/xpfe/components/directory/nsDirectoryViewer.cpp
@@ -154,17 +154,17 @@ nsHTTPIndex::OnFTPControlLog(bool server
     NS_ENSURE_TRUE(scriptGlobal, NS_OK);
 
     nsIScriptContext *context = scriptGlobal->GetContext();
     NS_ENSURE_TRUE(context, NS_OK);
 
     JSContext* cx = context->GetNativeContext();
     NS_ENSURE_TRUE(cx, NS_OK);
 
-    JSObject* global = JS_GetGlobalForScopeChain(cx);
+    JSObject* global = JS_GetGlobalObject(cx);
     NS_ENSURE_TRUE(global, NS_OK);
 
     jsval params[2];
 
     nsString unicodeMsg;
     unicodeMsg.AssignWithConversion(msg);
     JSAutoRequest ar(cx);
     JSString* jsMsgStr = JS_NewUCStringCopyZ(cx, (jschar*) unicodeMsg.get());
@@ -229,17 +229,17 @@ nsHTTPIndex::OnStartRequest(nsIRequest *
     // Now get the content viewer container's script object.
     nsCOMPtr<nsIScriptGlobalObject> scriptGlobal(do_GetInterface(mRequestor));
     NS_ENSURE_TRUE(scriptGlobal, NS_ERROR_FAILURE);
 
     nsIScriptContext *context = scriptGlobal->GetContext();
     NS_ENSURE_TRUE(context, NS_ERROR_FAILURE);
 
     JSContext* cx = context->GetNativeContext();
-    JSObject* global = JS_GetGlobalForScopeChain(cx);
+    JSObject* global = JS_GetGlobalObject(cx);
 
     // Using XPConnect, wrap the HTTP index object...
     static NS_DEFINE_CID(kXPConnectCID, NS_XPCONNECT_CID);
     nsCOMPtr<nsIXPConnect> xpc(do_GetService(kXPConnectCID, &rv));
     if (NS_FAILED(rv)) return rv;
 
     nsCOMPtr<nsIXPConnectJSObjectHolder> wrapper;
     rv = xpc->WrapNative(cx,