Bug 1121554 - Include receiver argument in setProperty hooks, r=jorendorff.

2015-02-14 08:50:48 -07:00
parent b73859c603
commit da8f353828
13 changed files with 209 additions and 62 deletions
--- a/js/src/jsobj.cpp
+++ b/js/src/jsobj.cpp
@@ -1675,9 +1675,7 @@ JSObject::nonNativeSetProperty(JSContext *cx, HandleObject obj, HandleObject rec
        if (wpmap && !wpmap->triggerWatchpoint(cx, obj, id, vp))
            return false;
    }
-    if (obj->is<ProxyObject>())
-        return Proxy::set(cx, obj, receiver, id, strict, vp);
-    return obj->getOps()->setProperty(cx, obj, id, vp, strict);
+    return obj->getOps()->setProperty(cx, obj, receiver, id, vp, strict);
 }

 /* static */ bool