From 6928fbfa31e0c48b080ce668c38597427ef8a5ca Mon Sep 17 00:00:00 2001 From: Ms2ger Date: Tue, 27 Sep 2016 10:29:47 +0200 Subject: [PATCH] Pass a MutableHandle to fill_property_descriptor. --- components/script/dom/bindings/codegen/CodegenRust.py | 6 +++--- components/script/dom/bindings/proxyhandler.rs | 2 +- components/script/dom/browsingcontext.rs | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/components/script/dom/bindings/codegen/CodegenRust.py b/components/script/dom/bindings/codegen/CodegenRust.py index 5609d12a6d6..defa55affea 100644 --- a/components/script/dom/bindings/codegen/CodegenRust.py +++ b/components/script/dom/bindings/codegen/CodegenRust.py @@ -4775,7 +4775,7 @@ class CGDOMJSProxyHandler_getOwnPropertyDescriptor(CGAbstractExternMethod): def __init__(self, descriptor): args = [Argument('*mut JSContext', 'cx'), Argument('HandleObject', 'proxy'), Argument('HandleId', 'id'), - Argument('MutableHandle', 'desc', mutable=True)] + Argument('MutableHandle', 'desc')] CGAbstractExternMethod.__init__(self, descriptor, "getOwnPropertyDescriptor", "bool", args) self.descriptor = descriptor @@ -4794,7 +4794,7 @@ class CGDOMJSProxyHandler_getOwnPropertyDescriptor(CGAbstractExternMethod): attrs += " | JSPROP_READONLY" # FIXME(#11868) Should assign to desc.value, desc.get() is a copy. fillDescriptor = ("desc.get().value = result_root.get();\n" - "fill_property_descriptor(&mut desc, proxy.get(), %s);\n" + "fill_property_descriptor(desc, proxy.get(), %s);\n" "return true;" % attrs) templateValues = { 'jsvalRef': 'result_root.handle_mut()', @@ -4820,7 +4820,7 @@ class CGDOMJSProxyHandler_getOwnPropertyDescriptor(CGAbstractExternMethod): attrs = "0" # FIXME(#11868) Should assign to desc.value, desc.get() is a copy. fillDescriptor = ("desc.get().value = result_root.get();\n" - "fill_property_descriptor(&mut desc, proxy.get(), %s);\n" + "fill_property_descriptor(desc, proxy.get(), %s);\n" "return true;" % attrs) templateValues = { 'jsvalRef': 'result_root.handle_mut()', diff --git a/components/script/dom/bindings/proxyhandler.rs b/components/script/dom/bindings/proxyhandler.rs index cacac064376..b5230b1b81a 100644 --- a/components/script/dom/bindings/proxyhandler.rs +++ b/components/script/dom/bindings/proxyhandler.rs @@ -186,7 +186,7 @@ pub fn ensure_expando_object(cx: *mut JSContext, obj: HandleObject) -> *mut JSOb /// Set the property descriptor's object to `obj` and set it to enumerable, /// and writable if `readonly` is true. -pub fn fill_property_descriptor(desc: &mut PropertyDescriptor, +pub fn fill_property_descriptor(mut desc: MutableHandle, obj: *mut JSObject, attrs: u32) { desc.obj = obj; diff --git a/components/script/dom/browsingcontext.rs b/components/script/dom/browsingcontext.rs index 02d153296ae..36179279967 100644 --- a/components/script/dom/browsingcontext.rs +++ b/components/script/dom/browsingcontext.rs @@ -256,7 +256,7 @@ unsafe extern "C" fn getOwnPropertyDescriptor(cx: *mut JSContext, rooted!(in(cx) let mut val = UndefinedValue()); window.to_jsval(cx, val.handle_mut()); desc.value = val.get(); - fill_property_descriptor(&mut desc, proxy.get(), JSPROP_READONLY); + fill_property_descriptor(desc, proxy.get(), JSPROP_READONLY); return true; }