From 5d4ef49dd46bbcf85644eecf5c156428517c8375 Mon Sep 17 00:00:00 2001
From: "reed@reedloden.com" <reed@reedloden.com>
Date: Mon, 25 Feb 2008 00:59:20 -0800
Subject: [PATCH] Bug 417710 - "Use JS_GET_CLASS, not JS_GetClass"
 [p=gyuyoung.kim@samsung.com (gyu-young kim) r=jorendorff r=jst
 sr+a1.9=brendan]

---
 caps/src/nsSecurityManagerFactory.cpp                  | 2 +-
 content/xbl/src/nsXBLBinding.cpp                       | 6 +++---
 dom/src/base/nsDOMClassInfo.h                          | 2 +-
 dom/src/base/nsJSEnvironment.cpp                       | 2 +-
 embedding/components/windowwatcher/src/nsWWJSUtils.cpp | 6 +-----
 js/src/liveconnect/jsj_JavaClass.c                     | 6 +-----
 xpinstall/src/nsXPITriggerInfo.cpp                     | 6 +-----
 7 files changed, 9 insertions(+), 21 deletions(-)

diff --git a/caps/src/nsSecurityManagerFactory.cpp b/caps/src/nsSecurityManagerFactory.cpp
index 982ce8ca74a5..6573773315e2 100644
--- a/caps/src/nsSecurityManagerFactory.cpp
+++ b/caps/src/nsSecurityManagerFactory.cpp
@@ -301,7 +301,7 @@ nsSecurityNameSet::InitializeNameSet(nsIScriptContext* aScriptContext)
     JSAutoRequest ar(cx);
     while ((proto = JS_GetPrototype(cx, obj)) != nsnull)
         obj = proto;
-    JSClass *objectClass = JS_GetClass(cx, obj);
+    JSClass *objectClass = JS_GET_CLASS(cx, obj);
 
     jsval v;
     if (!JS_GetProperty(cx, global, "netscape", &v))
diff --git a/content/xbl/src/nsXBLBinding.cpp b/content/xbl/src/nsXBLBinding.cpp
index b1d982980c9a..7a7ca8c5434b 100644
--- a/content/xbl/src/nsXBLBinding.cpp
+++ b/content/xbl/src/nsXBLBinding.cpp
@@ -120,7 +120,7 @@ XBLFinalize(JSContext *cx, JSObject *obj)
     static_cast<nsIXBLDocumentInfo*>(::JS_GetPrivate(cx, obj));
   NS_RELEASE(docInfo);
   
-  nsXBLJSClass* c = static_cast<nsXBLJSClass*>(::JS_GetClass(cx, obj));
+  nsXBLJSClass* c = static_cast<nsXBLJSClass*>(::JS_GET_CLASS(cx, obj));
   c->Drop();
 }
 
@@ -158,7 +158,7 @@ XBLResolve(JSContext *cx, JSObject *obj, jsval id, uintN flags,
   }
 
   // We have this field.  Time to install it.  Get our node.
-  JSClass* nodeClass = ::JS_GetClass(cx, origObj);
+  JSClass* nodeClass = ::JS_GET_CLASS(cx, origObj);
   if (!nodeClass) {
     return JS_FALSE;
   }
@@ -1085,7 +1085,7 @@ nsXBLBinding::ChangeDocument(nsIDocument* aOldDocument, nsIDocument* aNewDocumen
                 break;
               }
 
-              JSClass* clazz = ::JS_GetClass(cx, proto);
+              JSClass* clazz = ::JS_GET_CLASS(cx, proto);
               if (!clazz ||
                   (~clazz->flags &
                    (JSCLASS_HAS_PRIVATE | JSCLASS_PRIVATE_IS_NSISUPPORTS)) ||
diff --git a/dom/src/base/nsDOMClassInfo.h b/dom/src/base/nsDOMClassInfo.h
index 8e187ebbaee0..0d806061d767 100644
--- a/dom/src/base/nsDOMClassInfo.h
+++ b/dom/src/base/nsDOMClassInfo.h
@@ -169,7 +169,7 @@ public:
 #endif
 
     return sXPCNativeWrapperClass &&
-      ::JS_GetClass(cx, obj) == sXPCNativeWrapperClass;
+      ::JS_GET_CLASS(cx, obj) == sXPCNativeWrapperClass;
   }
 
   static nsresult PreserveNodeWrapper(nsIXPConnectWrappedNative *aWrapper);
diff --git a/dom/src/base/nsJSEnvironment.cpp b/dom/src/base/nsJSEnvironment.cpp
index c4073ef97c30..22f4cb44716a 100644
--- a/dom/src/base/nsJSEnvironment.cpp
+++ b/dom/src/base/nsJSEnvironment.cpp
@@ -2824,7 +2824,7 @@ nsJSContext::FindXPCNativeWrapperClass(nsIXPConnectJSObjectHolder *aHolder)
   NS_ASSERTION(JSVAL_IS_OBJECT(wrapper), "This should be an object!");
 
   NS_DOMClassInfo_SetXPCNativeWrapperClass(
-    ::JS_GetClass(mContext, JSVAL_TO_OBJECT(wrapper)));
+    ::JS_GET_CLASS(mContext, JSVAL_TO_OBJECT(wrapper)));
   return NS_OK;
 }
 
diff --git a/embedding/components/windowwatcher/src/nsWWJSUtils.cpp b/embedding/components/windowwatcher/src/nsWWJSUtils.cpp
index 630836089861..866423fad635 100644
--- a/embedding/components/windowwatcher/src/nsWWJSUtils.cpp
+++ b/embedding/components/windowwatcher/src/nsWWJSUtils.cpp
@@ -60,11 +60,7 @@ nsWWJSUtils::GetStaticScriptGlobal(JSContext* aContext, JSObject* aObj)
   while (nsnull != (parent = JS_GetParent(aContext, glob)))
     glob = parent;
 
-#ifdef JS_THREADSAFE
-  clazz = JS_GetClass(aContext, glob);
-#else
-  clazz = JS_GetClass(glob);
-#endif
+  clazz = JS_GET_CLASS(aContext, glob);
 
   if (!clazz ||
       !(clazz->flags & JSCLASS_HAS_PRIVATE) ||
diff --git a/js/src/liveconnect/jsj_JavaClass.c b/js/src/liveconnect/jsj_JavaClass.c
index 715b95291f11..8ce3ce889676 100644
--- a/js/src/liveconnect/jsj_JavaClass.c
+++ b/js/src/liveconnect/jsj_JavaClass.c
@@ -512,11 +512,7 @@ JavaClass_hasInstance(JSContext *cx, JSObject *obj, jsval candidate_jsval,
     if (!JSVAL_IS_OBJECT(candidate_jsval))
         goto done;
     candidate_obj = JSVAL_TO_OBJECT(candidate_jsval);
-#ifdef JS_THREADSAFE
-    js_class = JS_GetClass(cx, candidate_obj);
-#else
-    js_class = JS_GetClass(candidate_obj);
-#endif
+    js_class = JS_GET_CLASS(cx, candidate_obj);
     if ((js_class != &JavaObject_class) && (js_class != &JavaArray_class))
         goto done;
 
diff --git a/xpinstall/src/nsXPITriggerInfo.cpp b/xpinstall/src/nsXPITriggerInfo.cpp
index 54232fc314a8..e5183a8c3afb 100644
--- a/xpinstall/src/nsXPITriggerInfo.cpp
+++ b/xpinstall/src/nsXPITriggerInfo.cpp
@@ -211,11 +211,7 @@ void nsXPITriggerInfo::SaveCallback( JSContext *aCx, jsval aVal )
 
     JSClass* clazz;
 
-#ifdef JS_THREADSAFE
-    clazz = ::JS_GetClass(aCx, obj);
-#else
-    clazz = ::JS_GetClass(obj);
-#endif
+    clazz = ::JS_GET_CLASS(aCx, obj);
 
     if (clazz &&
         (clazz->flags & JSCLASS_HAS_PRIVATE) &&