From c1dc65c3efb14b9c3b6bdcbdd19c4b7f0028e756 Mon Sep 17 00:00:00 2001
From: Bobby Holley <bobbyholley@gmail.com>
Date: Wed, 22 May 2013 15:42:45 -0600
Subject: [PATCH] Bug 868110 - Remove JS_GetGlobalObject. r=luke

\o/
---
 js/ipc/ContextWrapperChild.h | 4 +++-
 js/src/jsapi.cpp             | 6 ------
 js/src/jsapi.h               | 8 ++------
 3 files changed, 5 insertions(+), 13 deletions(-)

diff --git a/js/ipc/ContextWrapperChild.h b/js/ipc/ContextWrapperChild.h
index d661253a443..34cd27e0296 100644
--- a/js/ipc/ContextWrapperChild.h
+++ b/js/ipc/ContextWrapperChild.h
@@ -55,7 +55,9 @@ protected:
     }
     
     PObjectWrapperChild* AllocPObjectWrapper(const bool&) {
-        return AllocPObjectWrapper(JS_GetGlobalObject(mContext));
+        // This stuff is unused and billm has a patch to delete it.
+        JSAutoRequest ar(mContext);
+        return AllocPObjectWrapper(JS_GetGlobalForScopeChain(mContext));
     }
 
     bool DeallocPObjectWrapper(PObjectWrapperChild* actor) {
diff --git a/js/src/jsapi.cpp b/js/src/jsapi.cpp
index 114b01de5a7..8c3dcd222a8 100644
--- a/js/src/jsapi.cpp
+++ b/js/src/jsapi.cpp
@@ -1764,12 +1764,6 @@ JS_RefreshCrossCompartmentWrappers(JSContext *cx, JSObject *objArg)
     return RemapAllWrappersForObject(cx, obj, obj);
 }
 
-JS_PUBLIC_API(JSObject *)
-JS_GetGlobalObject(JSContext *cx)
-{
-    return cx->maybeDefaultCompartmentObject();
-}
-
 JS_PUBLIC_API(void)
 JS_SetGlobalObject(JSContext *cx, JSObject *obj)
 {
diff --git a/js/src/jsapi.h b/js/src/jsapi.h
index ede3649b221..0c38f844334 100644
--- a/js/src/jsapi.h
+++ b/js/src/jsapi.h
@@ -1940,9 +1940,8 @@ JS_StringToVersion(const char *string);
                                                    will be passed to each call
                                                    to JS_ExecuteScript. */
 #define JSOPTION_UNROOTED_GLOBAL JS_BIT(13)     /* The GC will not root the
-                                                   contexts' global objects
-                                                   (see JS_GetGlobalObject),
-                                                   leaving that up to the
+                                                   contexts' default compartment
+                                                   object, leaving that up to the
                                                    embedding. */
 
 #define JSOPTION_BASELINE       JS_BIT(14)      /* Baseline compiler. */
@@ -2079,9 +2078,6 @@ extern JS_PUBLIC_API(void)
 JS_IterateCompartments(JSRuntime *rt, void *data,
                        JSIterateCompartmentCallback compartmentCallback);
 
-extern JS_PUBLIC_API(JSObject *)
-JS_GetGlobalObject(JSContext *cx);
-
 extern JS_PUBLIC_API(void)
 JS_SetGlobalObject(JSContext *cx, JSObject *obj);