From 2af2dc96698ce12847cd3720436b70ea726903a7 Mon Sep 17 00:00:00 2001 From: Ms2ger Date: Tue, 23 Dec 2014 01:57:46 -0700 Subject: [PATCH] servo: Merge #4464 - Revert PR #4038 for causing WPT failures (from servo:revert-dataset); r=Ms2ger Source-Repo: https://github.com/servo/servo Source-Revision: 0109cc3ffc6e58a5e294ff469b37a636c98cff70 --- .../dom/bindings/codegen/CodegenRust.py | 22 ++----- servo/components/script/dom/domstringmap.rs | 37 ++++++------ servo/components/script/dom/element.rs | 48 ++++++---------- servo/components/script/dom/htmlelement.rs | 57 +------------------ .../script/dom/webidls/DOMStringMap.webidl | 1 - .../script/dom/webidls/HTMLElement.webidl | 2 +- servo/components/script/tests.rs | 6 +- 7 files changed, 43 insertions(+), 130 deletions(-) diff --git a/servo/components/script/dom/bindings/codegen/CodegenRust.py b/servo/components/script/dom/bindings/codegen/CodegenRust.py index 03efd2b59f59..01efdd012c01 100644 --- a/servo/components/script/dom/bindings/codegen/CodegenRust.py +++ b/servo/components/script/dom/bindings/codegen/CodegenRust.py @@ -2086,14 +2086,11 @@ class CGDefineProxyHandler(CGAbstractMethod): return CGAbstractMethod.define(self) def definition_body(self): - customDefineProperty = 'defineProperty_' - if self.descriptor.operations['IndexedSetter'] or self.descriptor.operations['NamedSetter']: - customDefineProperty = 'defineProperty' body = """\ let traps = ProxyTraps { getPropertyDescriptor: Some(getPropertyDescriptor), getOwnPropertyDescriptor: Some(getOwnPropertyDescriptor), - defineProperty: Some(%s), + defineProperty: Some(defineProperty_), getOwnPropertyNames: ptr::null(), delete_: Some(delete_), enumerate: ptr::null(), @@ -2123,7 +2120,7 @@ let traps = ProxyTraps { }; CreateProxyHandler(&traps, &Class as *const _ as *const _) -""" % (customDefineProperty, FINALIZE_HOOK_NAME, +""" % (FINALIZE_HOOK_NAME, TRACE_HOOK_NAME) return CGGeneric(body) @@ -2279,15 +2276,8 @@ class CGPerSignatureCall(CGThing): invalidEnumValueFatal=not setter) for i in range(argConversionStartsAt, self.argCount)]) - errorResult = None - if self.isFallible(): - if nativeMethodName == "NamedSetter": - errorResult = " false" - else: - errorResult = " false as JSBool" - cgThings.append(CGCallGenerator( - errorResult, + ' false as JSBool' if self.isFallible() else None, self.getArguments(), self.argsPre, returnType, self.extendedAttributes, descriptor, nativeMethodName, static)) @@ -3846,14 +3836,14 @@ if expando.is_not_null() { getIndexedOrExpando = getFromExpando + "\n" namedGetter = self.descriptor.operations['NamedGetter'] - if namedGetter: - getNamed = ("if (RUST_JSID_IS_STRING(id) != 0) {\n" + + if namedGetter and False: #XXXjdm unfinished + getNamed = ("if (JSID_IS_STRING(id)) {\n" + " let name = jsid_to_str(cx, id);\n" + " let this = UnwrapProxy(proxy);\n" + " let this = JS::from_raw(this);\n" + " let this = this.root();\n" + CGIndenter(CGProxyNamedGetter(self.descriptor, templateValues)).define() + - "}\n") + "}\n") % (self.descriptor.concreteType) else: getNamed = "" diff --git a/servo/components/script/dom/domstringmap.rs b/servo/components/script/dom/domstringmap.rs index ff4990eb5f6c..26218445c808 100644 --- a/servo/components/script/dom/domstringmap.rs +++ b/servo/components/script/dom/domstringmap.rs @@ -2,56 +2,51 @@ * 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::cell::DOMRefCell; use dom::bindings::codegen::Bindings::DOMStringMapBinding; use dom::bindings::codegen::Bindings::DOMStringMapBinding::DOMStringMapMethods; -use dom::bindings::error::ErrorResult; use dom::bindings::global::GlobalRef; -use dom::bindings::js::{JS, JSRef, Temporary}; +use dom::bindings::js::{JSRef, Temporary}; use dom::bindings::utils::{Reflectable, Reflector, reflect_dom_object}; -use dom::node::window_from_node; -use dom::htmlelement::{HTMLElement, HTMLElementCustomAttributeHelpers}; use servo_util::str::DOMString; +use std::collections::HashMap; + #[dom_struct] pub struct DOMStringMap { + map: DOMRefCell>, reflector_: Reflector, - element: JS, } impl DOMStringMap { - fn new_inherited(element: JSRef) -> DOMStringMap { + fn new_inherited() -> DOMStringMap { DOMStringMap { + map: DOMRefCell::new(HashMap::new()), reflector_: Reflector::new(), - element: JS::from_rooted(element), } } - pub fn new(element: JSRef) -> Temporary { - let window = window_from_node(element).root(); - reflect_dom_object(box DOMStringMap::new_inherited(element), - GlobalRef::Window(window.root_ref()), DOMStringMapBinding::Wrap) + pub fn new(global: GlobalRef) -> Temporary { + reflect_dom_object(box DOMStringMap::new_inherited(), + global, DOMStringMapBinding::Wrap) } } -// https://html.spec.whatwg.org/#domstringmap impl<'a> DOMStringMapMethods for JSRef<'a, DOMStringMap> { - fn NamedCreator(self, name: DOMString, value: DOMString) -> ErrorResult { - self.NamedSetter(name, value) + fn NamedCreator(self, name: DOMString, value: DOMString) { + self.map.borrow_mut().insert(name, value); } fn NamedDeleter(self, name: DOMString) { - let element = self.element.root(); - element.delete_custom_attr(name) + self.map.borrow_mut().remove(&name); } - fn NamedSetter(self, name: DOMString, value: DOMString) -> ErrorResult { - let element = self.element.root(); - element.set_custom_attr(name, value) + fn NamedSetter(self, name: DOMString, value: DOMString) { + self.map.borrow_mut().insert(name, value); } fn NamedGetter(self, name: DOMString, found: &mut bool) -> DOMString { - let element = self.element.root(); - match element.get_custom_attr(name) { + match self.map.borrow().get(&name) { Some(value) => { *found = true; value.clone() diff --git a/servo/components/script/dom/element.rs b/servo/components/script/dom/element.rs index 1c069ea3aa3e..00f481dcd324 100644 --- a/servo/components/script/dom/element.rs +++ b/servo/components/script/dom/element.rs @@ -459,7 +459,6 @@ impl LayoutElementHelpers for JS { pub trait ElementHelpers<'a> { fn html_element_in_html_document(self) -> bool; fn local_name(self) -> &'a Atom; - fn parsed_name(self, name: DOMString) -> DOMString; fn namespace(self) -> &'a Namespace; fn prefix(self) -> &'a Option; fn attrs(&self) -> Ref>>; @@ -482,15 +481,6 @@ impl<'a> ElementHelpers<'a> for JSRef<'a, Element> { &self.extended_deref().local_name } - // https://dom.spec.whatwg.org/#concept-element-attributes-get-by-name - fn parsed_name(self, name: DOMString) -> DOMString { - if self.html_element_in_html_document() { - name.as_slice().to_ascii_lower() - } else { - name - } - } - fn namespace(self) -> &'a Namespace { &self.extended_deref().namespace } @@ -619,7 +609,6 @@ pub trait AttributeHandlers { value: DOMString, prefix: Option); fn set_attribute(self, name: &Atom, value: AttrValue); - fn set_custom_attribute(self, name: DOMString, value: DOMString) -> ErrorResult; fn do_set_attribute(self, local_name: Atom, value: AttrValue, name: Atom, namespace: Namespace, prefix: Option, cb: |JSRef| -> bool); @@ -689,23 +678,6 @@ impl<'a> AttributeHandlers for JSRef<'a, Element> { ns!(""), None, |attr| *attr.local_name() == *name); } - // https://html.spec.whatwg.org/multipage/dom.html#attr-data-* - fn set_custom_attribute(self, name: DOMString, value: DOMString) -> ErrorResult { - // Step 1. - match xml_name_type(name.as_slice()) { - InvalidXMLName => return Err(InvalidCharacter), - _ => {} - } - - // Steps 2-5. - let name = Atom::from_slice(name.as_slice()); - let value = self.parse_attribute(&ns!(""), &name, value); - self.do_set_attribute(name.clone(), value, name.clone(), ns!(""), None, |attr| { - *attr.name() == name && *attr.namespace() == ns!("") - }); - Ok(()) - } - fn do_set_attribute(self, local_name: Atom, value: AttrValue, name: Atom, namespace: Namespace, prefix: Option, cb: |JSRef| -> bool) { @@ -930,7 +902,11 @@ impl<'a> ElementMethods for JSRef<'a, Element> { // http://dom.spec.whatwg.org/#dom-element-getattribute fn GetAttribute(self, name: DOMString) -> Option { - let name = self.parsed_name(name); + let name = if self.html_element_in_html_document() { + name.as_slice().to_ascii_lower() + } else { + name + }; self.get_attribute(ns!(""), &Atom::from_slice(name.as_slice())).root() .map(|s| s.Value()) } @@ -955,13 +931,17 @@ impl<'a> ElementMethods for JSRef<'a, Element> { } // Step 2. - let name = self.parsed_name(name); + let name = if self.html_element_in_html_document() { + name.as_slice().to_ascii_lower() + } else { + name + }; // Step 3-5. let name = Atom::from_slice(name.as_slice()); let value = self.parse_attribute(&ns!(""), &name, value); self.do_set_attribute(name.clone(), value, name.clone(), ns!(""), None, |attr| { - *attr.name() == name + attr.name().as_slice() == name.as_slice() }); Ok(()) } @@ -1032,7 +1012,11 @@ impl<'a> ElementMethods for JSRef<'a, Element> { // http://dom.spec.whatwg.org/#dom-element-removeattribute fn RemoveAttribute(self, name: DOMString) { - let name = self.parsed_name(name); + let name = if self.html_element_in_html_document() { + name.as_slice().to_ascii_lower() + } else { + name + }; self.remove_attribute(ns!(""), name.as_slice()) } diff --git a/servo/components/script/dom/htmlelement.rs b/servo/components/script/dom/htmlelement.rs index f36e84a078ef..e38ab5ff5235 100644 --- a/servo/components/script/dom/htmlelement.rs +++ b/servo/components/script/dom/htmlelement.rs @@ -13,13 +13,10 @@ use dom::bindings::codegen::InheritTypes::{ElementCast, HTMLFrameSetElementDeriv use dom::bindings::codegen::InheritTypes::{EventTargetCast, HTMLInputElementCast}; use dom::bindings::codegen::InheritTypes::{HTMLElementDerived, HTMLBodyElementDerived}; use dom::bindings::js::{JSRef, Temporary, MutNullableJS}; -use dom::bindings::error::ErrorResult; -use dom::bindings::error::Error::Syntax; use dom::bindings::utils::{Reflectable, Reflector}; use dom::cssstyledeclaration::CSSStyleDeclaration; use dom::document::Document; -use dom::domstringmap::DOMStringMap; -use dom::element::{Element, ElementTypeId, ActivationElementHelpers, AttributeHandlers}; +use dom::element::{Element, ElementTypeId, ActivationElementHelpers}; use dom::eventtarget::{EventTarget, EventTargetHelpers, EventTargetTypeId}; use dom::node::{Node, NodeTypeId, window_from_node}; use dom::virtualmethods::VirtualMethods; @@ -34,7 +31,6 @@ use std::default::Default; pub struct HTMLElement { element: Element, style_decl: MutNullableJS, - dataset: MutNullableJS, } impl HTMLElementDerived for EventTarget { @@ -52,7 +48,6 @@ impl HTMLElement { HTMLElement { element: Element::new_inherited(type_id, tag_name, ns!(HTML), prefix, document), style_decl: Default::default(), - dataset: Default::default(), } } @@ -94,11 +89,6 @@ impl<'a> HTMLElementMethods for JSRef<'a, HTMLElement> { global_event_handlers!(NoOnload) - // https://html.spec.whatwg.org/multipage/dom.html#dom-dataset - fn Dataset(self) -> Temporary { - self.dataset.or_init(|| DOMStringMap::new(self)) - } - fn GetOnload(self) -> Option { if self.is_body_or_frameset() { let win = window_from_node(self).root(); @@ -132,51 +122,6 @@ impl<'a> HTMLElementMethods for JSRef<'a, HTMLElement> { } } -// https://html.spec.whatwg.org/#attr-data-* -pub trait HTMLElementCustomAttributeHelpers { - fn set_custom_attr(self, name: DOMString, value: DOMString) -> ErrorResult; - fn get_custom_attr(self, name: DOMString) -> Option; - fn delete_custom_attr(self, name: DOMString); -} - -fn to_snake_case(name: DOMString) -> DOMString { - let mut attr_name = "data-".into_string(); - for ch in name.as_slice().chars() { - if ch.is_uppercase() { - attr_name.push('\x2d'); - attr_name.push(ch.to_lowercase()); - } else { - attr_name.push(ch); - } - } - attr_name -} - -impl<'a> HTMLElementCustomAttributeHelpers for JSRef<'a, HTMLElement> { - fn set_custom_attr(self, name: DOMString, value: DOMString) -> ErrorResult { - if name.as_slice().chars() - .skip_while(|&ch| ch != '\u002d') - .nth(1).map_or(false, |ch| ch as u8 - b'a' < 26) { - return Err(Syntax); - } - let element: JSRef = ElementCast::from_ref(self); - element.set_custom_attribute(to_snake_case(name), value) - } - - fn get_custom_attr(self, name: DOMString) -> Option { - let element: JSRef = ElementCast::from_ref(self); - element.get_attribute(ns!(""), &Atom::from_slice(to_snake_case(name).as_slice())).map(|attr| { - let attr = attr.root(); - attr.value().as_slice().to_string() - }) - } - - fn delete_custom_attr(self, name: DOMString) { - let element: JSRef = ElementCast::from_ref(self); - element.remove_attribute(ns!(""), to_snake_case(name).as_slice()) - } -} - impl<'a> VirtualMethods for JSRef<'a, HTMLElement> { fn super_type<'a>(&'a self) -> Option<&'a VirtualMethods> { let element: &JSRef = ElementCast::from_borrowed_ref(self); diff --git a/servo/components/script/dom/webidls/DOMStringMap.webidl b/servo/components/script/dom/webidls/DOMStringMap.webidl index c11d47c5a859..aa4d3ed9673e 100644 --- a/servo/components/script/dom/webidls/DOMStringMap.webidl +++ b/servo/components/script/dom/webidls/DOMStringMap.webidl @@ -7,7 +7,6 @@ [OverrideBuiltins] interface DOMStringMap { getter DOMString (DOMString name); - [Throws] setter creator void (DOMString name, DOMString value); deleter void (DOMString name); }; diff --git a/servo/components/script/dom/webidls/HTMLElement.webidl b/servo/components/script/dom/webidls/HTMLElement.webidl index 90ef09d7a9f1..39c7699900d2 100644 --- a/servo/components/script/dom/webidls/HTMLElement.webidl +++ b/servo/components/script/dom/webidls/HTMLElement.webidl @@ -10,7 +10,7 @@ interface HTMLElement : Element { attribute DOMString lang; // attribute boolean translate; // attribute DOMString dir; - readonly attribute DOMStringMap dataset; + //readonly attribute DOMStringMap dataset; // microdata // attribute boolean itemScope; diff --git a/servo/components/script/tests.rs b/servo/components/script/tests.rs index e4636c5b5ade..8f7bbda8385f 100644 --- a/servo/components/script/tests.rs +++ b/servo/components/script/tests.rs @@ -41,8 +41,8 @@ macro_rules! sizeof_checker ( sizeof_checker!(size_event_target, EventTarget, 56) sizeof_checker!(size_node, Node, 304) sizeof_checker!(size_element, Element, 448) -sizeof_checker!(size_htmlelement, HTMLElement, 480) -sizeof_checker!(size_div, HTMLDivElement, 480) -sizeof_checker!(size_span, HTMLSpanElement, 480) +sizeof_checker!(size_htmlelement, HTMLElement, 464) +sizeof_checker!(size_div, HTMLDivElement, 464) +sizeof_checker!(size_span, HTMLSpanElement, 464) sizeof_checker!(size_text, Text, 336) sizeof_checker!(size_characterdata, CharacterData, 336)