diff options
| author | Gaming4JC <g4jc@hyperbola.info> | 2019-06-08 23:28:04 -0400 |
|---|---|---|
| committer | Gaming4JC <g4jc@hyperbola.info> | 2019-07-18 22:38:25 -0400 |
| commit | 3a5176f4b25a2b90cefe14eb2c2de57113dc21ac (patch) | |
| tree | bc6f6b9a4830a764c825e0dd78a4367b9d0a46a4 /js/src/jsobj.cpp | |
| parent | 7757e03ccc550b030fb4d342f160ee30a940f23d (diff) | |
| download | UXP-3a5176f4b25a2b90cefe14eb2c2de57113dc21ac.tar UXP-3a5176f4b25a2b90cefe14eb2c2de57113dc21ac.tar.gz UXP-3a5176f4b25a2b90cefe14eb2c2de57113dc21ac.tar.lz UXP-3a5176f4b25a2b90cefe14eb2c2de57113dc21ac.tar.xz UXP-3a5176f4b25a2b90cefe14eb2c2de57113dc21ac.zip | |
1320408 - Part 14: Change some GlobalObject methods to static method.
Diffstat (limited to 'js/src/jsobj.cpp')
| -rw-r--r-- | js/src/jsobj.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/js/src/jsobj.cpp b/js/src/jsobj.cpp index 58be1a283..4957b4d39 100644 --- a/js/src/jsobj.cpp +++ b/js/src/jsobj.cpp @@ -1985,7 +1985,8 @@ js::GetObjectFromIncumbentGlobal(JSContext* cx, MutableHandleObject obj) { AutoCompartment ac(cx, globalObj); - obj.set(globalObj->as<GlobalObject>().getOrCreateObjectPrototype(cx)); + Handle<GlobalObject*> global = globalObj.as<GlobalObject>(); + obj.set(GlobalObject::getOrCreateObjectPrototype(cx, global)); if (!obj) return false; } @@ -2548,7 +2549,7 @@ js::SetPrototype(JSContext* cx, HandleObject obj, HandleObject proto, JS::Object // [[Prototype]] chain is always properly immutable, even in the presence // of lazy standard classes. if (obj->is<GlobalObject>()) { - Rooted<GlobalObject*> global(cx, &obj->as<GlobalObject>()); + Handle<GlobalObject*> global = obj.as<GlobalObject>(); if (!GlobalObject::ensureConstructor(cx, global, JSProto_Object)) return false; } |