diff options
author | bors-servo <release+servo@mozilla.com> | 2014-03-20 06:34:32 -0400 |
---|---|---|
committer | bors-servo <release+servo@mozilla.com> | 2014-03-20 06:34:32 -0400 |
commit | 19a7c429a1eea7b80cefb4b72138fafecc9b924a (patch) | |
tree | c53b630c560ac2dccd2b85dba7895bb8d9d29aa7 /src/components/script/dom/bindings/codegen | |
parent | 371bea7d3b5c200243865153a0dad5acc4ff78ff (diff) | |
parent | 34b73837d3f5709d4a47b5119afe17f24cfb930c (diff) | |
download | servo-19a7c429a1eea7b80cefb4b72138fafecc9b924a.tar.gz servo-19a7c429a1eea7b80cefb4b72138fafecc9b924a.zip |
auto merge of #1944 : lpy/servo/issue1938, r=Ms2ger
see #1938
Diffstat (limited to 'src/components/script/dom/bindings/codegen')
-rw-r--r-- | src/components/script/dom/bindings/codegen/CodegenRust.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/components/script/dom/bindings/codegen/CodegenRust.py b/src/components/script/dom/bindings/codegen/CodegenRust.py index a14358d99c6..0a6b241a543 100644 --- a/src/components/script/dom/bindings/codegen/CodegenRust.py +++ b/src/components/script/dom/bindings/codegen/CodegenRust.py @@ -2065,7 +2065,7 @@ def CreateBindingJSObject(descriptor, parent=None): let handler = js_info.get().get_ref().dom_static.proxy_handlers.get(&(PrototypeList::id::%s as uint)); """ % descriptor.name create += handler + """ let obj = NewProxyObject(aCx, *handler, - &PrivateValue(squirrel_away_unboxed(aObject) as *libc::c_void), + &PrivateValue(squirrel_away_unique(aObject) as *libc::c_void), proto, %s, ptr::null(), ptr::null()); assert!(obj.is_not_null()); @@ -2079,7 +2079,7 @@ def CreateBindingJSObject(descriptor, parent=None): create += """ assert!(obj.is_not_null()); JS_SetReservedSlot(obj, DOM_OBJECT_SLOT as u32, - PrivateValue(squirrel_away_unboxed(aObject) as *libc::c_void)); + PrivateValue(squirrel_away_unique(aObject) as *libc::c_void)); """ return create @@ -4790,7 +4790,7 @@ class CGBindingRoot(CGThing): 'dom::bindings::utils::{NativePropertyHooks}', 'dom::bindings::utils::global_object_for_js_object', 'dom::bindings::utils::{Reflectable}', - 'dom::bindings::utils::{squirrel_away_unboxed}', + 'dom::bindings::utils::{squirrel_away_unique}', 'dom::bindings::utils::{ThrowingConstructor, unwrap, unwrap_jsmanaged}', 'dom::bindings::utils::{unwrap_object, VoidVal, with_gc_disabled}', 'dom::bindings::utils::{with_gc_enabled, XrayResolveProperty}', |