Auto merge of #13017 - nox:wrong-receiver, r=Ms2ger

Pass the receiver to get_property_on_prototype (fixes #11600)

<!-- Reviewable:start -->
This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/13017)
<!-- Reviewable:end -->

2 files changed, 60 insertions, 43 deletions

diff --git a/components/script/dom/bindings/codegen/CodegenRust.py b/components/script/dom/bindings/codegen/CodegenRust.py
index 8e04fc76a10..643262c0db2 100644
--- a/components/script/dom/bindings/codegen/CodegenRust.py
+++ b/components/script/dom/bindings/codegen/CodegenRust.py
@@ -4724,10 +4724,17 @@ class CGDOMJSProxyHandler_getOwnPropertyDescriptor(CGAbstractExternMethod):
             # Once we start supporting OverrideBuiltins we need to make
             # ResolveOwnProperty or EnumerateOwnProperties filter out named
             # properties that shadow prototype properties.
-            namedGet = ("\n" +
-                        "if RUST_JSID_IS_STRING(id) && !has_property_on_prototype(cx, proxy, id) {\n" +
-                        CGIndenter(CGProxyNamedGetter(self.descriptor, templateValues)).define() + "\n" +
-                        "}\n")
+            namedGet = """
+if RUST_JSID_IS_STRING(id) {
+    let mut has_on_proto = false;
+    if !has_property_on_prototype(cx, proxy, id, &mut has_on_proto) {
+        return false;
+    }
+    if !has_on_proto {
+        %s
+    }
+}
+""" % CGIndenter(CGProxyNamedGetter(self.descriptor, templateValues), 8).define()
         else:
             namedGet = ""
 
@@ -4952,12 +4959,20 @@ class CGDOMJSProxyHandler_hasOwn(CGAbstractExternMethod):
 
         namedGetter = self.descriptor.operations['NamedGetter']
         if namedGetter:
-            named = ("if RUST_JSID_IS_STRING(id) && !has_property_on_prototype(cx, proxy, id) {\n" +
-                     CGIndenter(CGProxyNamedGetter(self.descriptor)).define() + "\n" +
-                     "    *bp = found;\n"
-                     "    return true;\n"
-                     "}\n" +
-                     "\n")
+            named = """\
+if RUST_JSID_IS_STRING(id) {
+    let mut has_on_proto = false;
+    if !has_property_on_prototype(cx, proxy, id, &mut has_on_proto) {
+        return false;
+    }
+    if !has_on_proto {
+        %s
+        *bp = found;
+        return true;
+    }
+}
+
+""" % CGIndenter(CGProxyNamedGetter(self.descriptor), 8).define()
         else:
             named = ""
 
@@ -5035,7 +5050,7 @@ if !expando.is_null() {
 
 %s
 let mut found = false;
-if !get_property_on_prototype(cx, proxy, id, &mut found, vp) {
+if !get_property_on_prototype(cx, proxy, receiver, id, &mut found, vp) {
     return false;
 }
 
diff --git a/components/script/dom/bindings/utils.rs b/components/script/dom/bindings/utils.rs
index ac902a5d68c..030584c2755 100644
--- a/components/script/dom/bindings/utils.rs
+++ b/components/script/dom/bindings/utils.rs
@@ -29,7 +29,7 @@ use js::jsapi::{JS_GetProperty, JS_GetPrototype, JS_GetReservedSlot, JS_HasPrope
 use js::jsapi::{JS_HasPropertyById, JS_IsExceptionPending, JS_IsGlobalObject};
 use js::jsapi::{JS_ResolveStandardClass, JS_SetProperty, ToWindowProxyIfWindow};
 use js::jsapi::{JS_StringHasLatin1Chars, MutableHandleValue, ObjectOpResult};
-use js::jsval::{JSVal, ObjectValue, UndefinedValue};
+use js::jsval::{JSVal, UndefinedValue};
 use js::rust::{GCMethods, ToString};
 use libc;
 use std::ffi::CString;
@@ -127,32 +127,29 @@ pub type ProtoOrIfaceArray = [*mut JSObject; PROTO_OR_IFACE_LENGTH];
 /// set to true and `*vp` to the value, otherwise `*found` is set to false.
 ///
 /// Returns false on JSAPI failure.
-pub fn get_property_on_prototype(cx: *mut JSContext,
-                                 proxy: HandleObject,
-                                 id: HandleId,
-                                 found: *mut bool,
-                                 vp: MutableHandleValue)
-                                 -> bool {
-    unsafe {
-        // let proto = GetObjectProto(proxy);
-        rooted!(in(cx) let mut proto = ptr::null_mut());
-        if !JS_GetPrototype(cx, proxy, proto.handle_mut()) || proto.is_null() {
-            *found = false;
-            return true;
-        }
-        let mut has_property = false;
-        if !JS_HasPropertyById(cx, proto.handle(), id, &mut has_property) {
-            return false;
-        }
-        *found = has_property;
-        let no_output = vp.ptr.is_null();
-        if !has_property || no_output {
-            return true;
-        }
-
-        rooted!(in(cx) let receiver = ObjectValue(&*proxy.get()));
-        JS_ForwardGetPropertyTo(cx, proto.handle(), id, receiver.handle(), vp)
+pub unsafe fn get_property_on_prototype(cx: *mut JSContext,
+                                        proxy: HandleObject,
+                                        receiver: HandleValue,
+                                        id: HandleId,
+                                        found: *mut bool,
+                                        vp: MutableHandleValue)
+                                        -> bool {
+    rooted!(in(cx) let mut proto = ptr::null_mut());
+    if !JS_GetPrototype(cx, proxy, proto.handle_mut()) || proto.is_null() {
+        *found = false;
+        return true;
     }
+    let mut has_property = false;
+    if !JS_HasPropertyById(cx, proto.handle(), id, &mut has_property) {
+        return false;
+    }
+    *found = has_property;
+    let no_output = vp.ptr.is_null();
+    if !has_property || no_output {
+        return true;
+    }
+
+    JS_ForwardGetPropertyTo(cx, proto.handle(), id, receiver, vp)
 }
 
 /// Get an array index from the given `jsid`. Returns `None` if the given
@@ -285,12 +282,17 @@ pub fn set_dictionary_property(cx: *mut JSContext,
 }
 
 /// Returns whether `proxy` has a property `id` on its prototype.
-pub fn has_property_on_prototype(cx: *mut JSContext, proxy: HandleObject, id: HandleId) -> bool {
-    // MOZ_ASSERT(js::IsProxy(proxy) && js::GetProxyHandler(proxy) == handler);
-    let mut found = false;
-    !get_property_on_prototype(cx, proxy, id, &mut found, unsafe {
-        MutableHandleValue::from_marked_location(ptr::null_mut())
-    }) || found
+pub unsafe fn has_property_on_prototype(cx: *mut JSContext,
+                                        proxy: HandleObject,
+                                        id: HandleId,
+                                        found: &mut bool)
+                                        -> bool {
+    rooted!(in(cx) let mut proto = ptr::null_mut());
+    if !JS_GetPrototype(cx, proxy, proto.handle_mut()) {
+        return false;
+    }
+    assert!(!proto.is_null());
+    JS_HasPropertyById(cx, proto.handle(), id, found)
 }
 
 /// Drop the resources held by reserved slots of a global object