Implement the delete proxy trap (fixes #2213).

servo · Jul 29, 2014 · 6b44f92 · 6b44f92
1 parent 1f04ce8
commit 6b44f92
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 4 deletions.
diff --git a/src/components/script/dom/bindings/codegen/CodegenRust.py b/src/components/script/dom/bindings/codegen/CodegenRust.py
@@ -2061,7 +2061,7 @@ def definition_body(self):
   getOwnPropertyDescriptor: Some(getOwnPropertyDescriptor),
   defineProperty: Some(defineProperty),
   getOwnPropertyNames: ptr::null(),
-  delete_: None,
+  delete_: Some(delete_),
   enumerate: ptr::null(),
 
   has: None,
@@ -4541,7 +4541,7 @@ def __init__(self, config, prefix, webIDLFile):
             'dom::bindings::proxyhandler',
             'dom::bindings::proxyhandler::{_obj_toString, defineProperty}',
             'dom::bindings::proxyhandler::{FillPropertyDescriptor, GetExpandoObject}',
-            'dom::bindings::proxyhandler::{getPropertyDescriptor}',
+            'dom::bindings::proxyhandler::{delete_, getPropertyDescriptor}',
             'dom::bindings::str::ByteString',
             'page::JSPageInfo',
             'libc',

diff --git a/src/components/script/dom/bindings/proxyhandler.rs b/src/components/script/dom/bindings/proxyhandler.rs
@@ -10,7 +10,8 @@ use js::jsapi::{JS_GetPropertyDescriptorById, JS_NewUCString, JS_malloc, JS_free
 use js::jsapi::{JSBool, JS_DefinePropertyById, JS_NewObjectWithGivenProto};
 use js::jsapi::{JS_ReportErrorFlagsAndNumber, JS_StrictPropertyStub};
 use js::jsapi::{JSREPORT_WARNING, JSREPORT_STRICT, JSREPORT_STRICT_MODE_ERROR};
-use js::jsval::ObjectValue;
+use js::jsapi::JS_DeletePropertyById2;
+use js::jsval::{UndefinedValue, ObjectValue};
 use js::glue::GetProxyExtra;
 use js::glue::{GetObjectProto, GetObjectParent, SetProxyExtra, GetProxyHandler};
 use js::glue::InvokeGetOwnPropertyDescriptor;
@@ -78,6 +79,24 @@ pub extern fn defineProperty(cx: *mut JSContext, proxy: *mut JSObject, id: jsid,
     defineProperty_(cx, proxy, id, desc)
 }
 
+pub extern fn delete_(cx: *mut JSContext, proxy: *mut JSObject, id: jsid,
+                      bp: *mut bool) -> JSBool {
+    unsafe {
+        let expando = EnsureExpandoObject(cx, proxy);
+        if expando.is_null() {
+            return 0;
+        }
+
+        let mut value = UndefinedValue();
+        if JS_DeletePropertyById2(cx, expando, id, &mut value) == 0 {
+            return 0;
+        }
+
+        *bp = value.to_boolean();
+        return 1;
+    }
+}
+
 pub fn _obj_toString(cx: *mut JSContext, className: *libc::c_char) -> *mut JSString {
   unsafe {
     let name = str::raw::from_c_str(className);

diff --git a/src/support/spidermonkey/rust-mozjs b/src/support/spidermonkey/rust-mozjs