Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-06 06:00:15 +01:00
Code Issues Projects Releases Packages Wiki Activity

Implement dummy getOwnPropertyNames and enumerate traps.

Browse source
This commit is contained in:
Ms2ger 2014-12-24 16:55:38 +01:00
parent 57c520d8cf
commit 919f2217f0
12 changed files with 55 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

7
components/script/dom/bindings/codegen/CodegenRust.py
View file

@ -2094,15 +2094,15 @@ let traps = ProxyTraps {
getPropertyDescriptor: Some(getPropertyDescriptor),
getOwnPropertyDescriptor: Some(getOwnPropertyDescriptor),
defineProperty: Some(%s),
getOwnPropertyNames: ptr::null(),
getOwnPropertyNames: Some(getOwnPropertyNames_),
delete_: Some(delete_),
enumerate: ptr::null(),
enumerate: Some(enumerate_),
has: None,
hasOwn: Some(hasOwn),
get: Some(get),
set: None,
keys: ptr::null(),
keys: None,
iterate: None,
call: None,
@ -4532,6 +4532,7 @@ class CGBindingRoot(CGThing):
'dom::bindings::proxyhandler::{_obj_toString, defineProperty_}',
'dom::bindings::proxyhandler::{FillPropertyDescriptor, GetExpandoObject}',
'dom::bindings::proxyhandler::{delete_, getPropertyDescriptor}',
'dom::bindings::proxyhandler::{getOwnPropertyNames_, enumerate_}',
'dom::bindings::str::ByteString',
'page::JSPageInfo',
'libc',

12
components/script/dom/bindings/proxyhandler.rs
View file

@ -16,6 +16,7 @@ use js::glue::GetProxyExtra;
use js::glue::{GetObjectProto, GetObjectParent, SetProxyExtra, GetProxyHandler};
use js::glue::InvokeGetOwnPropertyDescriptor;
use js::glue::RUST_js_GetErrorMessage;
use js::glue::AutoIdVector;
use js::{JSPROP_GETTER, JSPROP_ENUMERATE, JSPROP_READONLY, JSRESOLVE_QUALIFIED};
use libc;
@ -130,3 +131,14 @@ pub fn FillPropertyDescriptor(desc: &mut JSPropertyDescriptor, obj: *mut JSObjec
desc.setter = None;
desc.shortid = 0;
}
pub unsafe extern fn getOwnPropertyNames_(_cx: *mut JSContext,
_obj: *mut JSObject,
_v: *mut AutoIdVector) -> bool {
true
}
pub unsafe extern fn enumerate_(_cx: *mut JSContext, _obj: *mut JSObject,
_v: *mut AutoIdVector) -> bool {
true
}

6
components/script/dom/browsercontext.rs
View file

@ -84,15 +84,15 @@ static PROXY_HANDLER: ProxyTraps = ProxyTraps {
getPropertyDescriptor: None,
getOwnPropertyDescriptor: None,
defineProperty: None,
getOwnPropertyNames: 0 as *const u8,
getOwnPropertyNames: None,
delete_: None,
enumerate: 0 as *const u8,
enumerate: None,
has: None,
hasOwn: None,
get: None,
set: None,
keys: 0 as *const u8,
keys: None,
iterate: None,
call: None,