Bug 1044205 - Replace xpc::CompartmentPrivate::Get with GetCompartmentPrivate to fix bustage. a=bustage
authorRyan VanderMeulen <ryanvm@gmail.com>
Mon, 04 Aug 2014 13:05:12 -0400
changeset 208233 932afd80c5a0
parent 208232 e61371be0f38
child 208234 54fe10b3558d
push id3783
push userryanvm@gmail.com
push date2014-08-04 17:06 +0000
treeherdermozilla-beta@932afd80c5a0 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersbustage
bugs1044205
milestone32.0
Bug 1044205 - Replace xpc::CompartmentPrivate::Get with GetCompartmentPrivate to fix bustage. a=bustage
js/xpconnect/src/nsXPConnect.cpp
--- a/js/xpconnect/src/nsXPConnect.cpp
+++ b/js/xpconnect/src/nsXPConnect.cpp
@@ -332,17 +332,17 @@ void
 xpc::TraceXPCGlobal(JSTracer *trc, JSObject *obj)
 {
     if (js::GetObjectClass(obj)->flags & JSCLASS_DOM_GLOBAL)
         mozilla::dom::TraceProtoAndIfaceCache(trc, obj);
 
     // We might be called from a GC during the creation of a global, before we've
     // been able to set up the compartment private or the XPCWrappedNativeScope,
     // so we need to null-check those.
-    xpc::CompartmentPrivate* compartmentPrivate = xpc::CompartmentPrivate::Get(obj);
+    xpc::CompartmentPrivate* compartmentPrivate = GetCompartmentPrivate(obj);
     if (compartmentPrivate && compartmentPrivate->scope)
         compartmentPrivate->scope->TraceInside(trc);
 }
 
 namespace xpc {
 
 JSObject*
 CreateGlobalObject(JSContext *cx, const JSClass *clasp, nsIPrincipal *principal,