Bug 1125423 part 1 - Attach WindowProxies to globals instead of using innerObject/outerObject hooks. r=bz,luke

2015-11-06 19:03:51 +01:00
parent 6497f92315
commit af31342c5b
27 changed files with 225 additions and 177 deletions
--- a/js/ipc/JavaScriptShared.cpp
+++ b/js/ipc/JavaScriptShared.cpp
@@ -537,9 +537,8 @@ JavaScriptShared::findObjectById(JSContext* cx, const ObjectId& objId)
    if (objId.hasXrayWaiver()) {
        {
            JSAutoCompartment ac2(cx, obj);
-            obj = JS_ObjectToOuterObject(cx, obj);
-            if (!obj)
-                return nullptr;
+            obj = js::ToWindowProxyIfWindow(obj);
+            MOZ_ASSERT(obj);
        }
        if (!xpc::WrapperFactory::WaiveXrayAndWrap(cx, &obj))
            return nullptr;