diff --git a/components/script/dom/bindings/codegen/CodegenRust.py b/components/script/dom/bindings/codegen/CodegenRust.py index aab81fa2ca3..1ef3cc0b810 100644 --- a/components/script/dom/bindings/codegen/CodegenRust.py +++ b/components/script/dom/bindings/codegen/CodegenRust.py @@ -2616,7 +2616,11 @@ class CGAbstractStaticBindingMethod(CGAbstractMethod): CGAbstractMethod.__init__(self, descriptor, name, "JSBool", args, extern=True) def definition_body(self): - return self.generate_code() + preamble = CGGeneric("""\ +let global = global_object_for_js_object(JS_CALLEE(cx, vp).to_object()); +let global = global.root(); +""") + return CGList([preamble, self.generate_code()]) def generate_code(self): assert False # Override me @@ -2674,7 +2678,7 @@ class CGStaticMethod(CGAbstractStaticBindingMethod): def generate_code(self): nativeName = CGSpecializedMethod.makeNativeName(self.descriptor, self.method) - return CGMethodCall([], nativeName, True, self.descriptor, self.method) + return CGMethodCall(["global.r()"], nativeName, True, self.descriptor, self.method) class CGGenericGetter(CGAbstractBindingMethod): @@ -2748,7 +2752,7 @@ class CGStaticGetter(CGAbstractStaticBindingMethod): def generate_code(self): nativeName = CGSpecializedGetter.makeNativeName(self.descriptor, self.attr) - return CGGetterCall([], self.attr.type, nativeName, self.descriptor, + return CGGetterCall(["global.r()"], self.attr.type, nativeName, self.descriptor, self.attr) @@ -2827,7 +2831,7 @@ class CGStaticSetter(CGAbstractStaticBindingMethod): " throw_type_error(cx, \"Not enough arguments to %s setter.\");\n" " return 0;\n" "}" % self.attr.identifier.name) - call = CGSetterCall([], self.attr.type, nativeName, self.descriptor, + call = CGSetterCall(["global.r()"], self.attr.type, nativeName, self.descriptor, self.attr) return CGList([checkForArg, call]) diff --git a/components/script/dom/css.rs b/components/script/dom/css.rs new file mode 100644 index 00000000000..5f4bce94d28 --- /dev/null +++ b/components/script/dom/css.rs @@ -0,0 +1,27 @@ +/* This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ + +use dom::bindings::error::{Error, Fallible}; +use dom::bindings::global::GlobalRef; +use dom::bindings::utils::Reflector; +use util::str::DOMString; + +use cssparser::serialize_identifier; + +#[dom_struct] +pub struct CSS { + reflector_: Reflector, +} + +impl CSS { + // http://dev.w3.org/csswg/cssom/#serialize-an-identifier + pub fn Escape(_: GlobalRef, ident: DOMString) -> Fallible { + if ident.bytes().any(|b| b == b'\0') { + return Err(Error::InvalidCharacter); + } + let mut escaped = DOMString::new(); + serialize_identifier(&ident, &mut escaped).unwrap(); + Ok(escaped) + } +} diff --git a/components/script/dom/mod.rs b/components/script/dom/mod.rs index 9f33d5ec195..00b7a05d348 100644 --- a/components/script/dom/mod.rs +++ b/components/script/dom/mod.rs @@ -201,6 +201,7 @@ pub mod canvasgradient; pub mod canvaspattern; pub mod canvasrenderingcontext2d; pub mod characterdata; +pub mod css; pub mod cssstyledeclaration; pub mod domrect; pub mod domrectlist; diff --git a/components/script/dom/testbinding.rs b/components/script/dom/testbinding.rs index a4bda4eb817..20451f64648 100644 --- a/components/script/dom/testbinding.rs +++ b/components/script/dom/testbinding.rs @@ -12,7 +12,7 @@ use dom::bindings::codegen::UnionTypes::EventOrString; use dom::bindings::codegen::UnionTypes::EventOrString::eString; use dom::bindings::codegen::UnionTypes::HTMLElementOrLong; use dom::bindings::codegen::UnionTypes::HTMLElementOrLong::eLong; -use dom::bindings::global::GlobalField; +use dom::bindings::global::{GlobalField, GlobalRef}; use dom::bindings::js::{JSRef, Temporary}; use dom::bindings::num::Finite; use dom::bindings::str::{ByteString, USVString}; @@ -361,8 +361,8 @@ impl<'a> TestBindingMethods for JSRef<'a, TestBinding> { } impl TestBinding { - pub fn BooleanAttributeStatic() -> bool { false } - pub fn SetBooleanAttributeStatic(_: bool) {} - pub fn ReceiveVoidStatic() {} + pub fn BooleanAttributeStatic(_: GlobalRef) -> bool { false } + pub fn SetBooleanAttributeStatic(_: GlobalRef, _: bool) {} + pub fn ReceiveVoidStatic(_: GlobalRef) {} } diff --git a/components/script/dom/webidls/CSS.webidl b/components/script/dom/webidls/CSS.webidl new file mode 100644 index 00000000000..59832c0af15 --- /dev/null +++ b/components/script/dom/webidls/CSS.webidl @@ -0,0 +1,12 @@ +/* This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this file, + * You can obtain one at http://mozilla.org/MPL/2.0/. + * + * The origin of this IDL file is + * http://dev.w3.org/csswg/cssom/#the-css-interface + */ + +interface CSS { + [Throws] + static DOMString escape(DOMString ident); +}; diff --git a/tests/wpt/mozilla/tests/mozilla/interfaces.html b/tests/wpt/mozilla/tests/mozilla/interfaces.html index 9649a9f3e15..f31afc50ec9 100644 --- a/tests/wpt/mozilla/tests/mozilla/interfaces.html +++ b/tests/wpt/mozilla/tests/mozilla/interfaces.html @@ -58,6 +58,7 @@ var interfaceNamesInGlobalScope = [ "CanvasRenderingContext2D", "CanvasPattern", "CharacterData", + "CSS", "CSSStyleDeclaration", "DOMRect", "Comment",