From 6c518c89b969d1e9a96c3c5b9fe0da6cfc3637d1 Mon Sep 17 00:00:00 2001 From: Simon Sapin Date: Tue, 2 May 2017 11:10:49 +0200 Subject: Upgrade to html5ever 0.16 --- components/script/dom/create.rs | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'components/script/dom/create.rs') diff --git a/components/script/dom/create.rs b/components/script/dom/create.rs index 7c9a9eeea9c..ad5c4f2c763 100644 --- a/components/script/dom/create.rs +++ b/components/script/dom/create.rs @@ -77,7 +77,7 @@ use dom::htmlulistelement::HTMLUListElement; use dom::htmlunknownelement::HTMLUnknownElement; use dom::htmlvideoelement::HTMLVideoElement; use dom::svgsvgelement::SVGSVGElement; -use html5ever_atoms::{Prefix, QualName}; +use html5ever::QualName; use servo_config::prefs::PREFS; fn create_svg_element(name: QualName, @@ -274,13 +274,12 @@ fn create_html_element(name: QualName, } pub fn create_element(name: QualName, - prefix: Option, document: &Document, creator: ElementCreator) -> Root { // FIXME(ajeffrey): Convert directly from Prefix to DOMString. - let prefix = prefix.map(|p| DOMString::from(&*p)); + let prefix = name.prefix.as_ref().map(|p| DOMString::from(&**p)); match name.ns { ns!(html) => create_html_element(name, prefix, document, creator), -- cgit v1.2.3 From 875e422fe67f68bdf57bd3635279e224b0c90996 Mon Sep 17 00:00:00 2001 From: Christian Poveda Date: Wed, 3 May 2017 10:17:42 -0500 Subject: Changed all prefixes from DOMString to the atomic Prefix from html5ever --- components/script/dom/create.rs | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'components/script/dom/create.rs') diff --git a/components/script/dom/create.rs b/components/script/dom/create.rs index 7c9a9eeea9c..de20420d03f 100644 --- a/components/script/dom/create.rs +++ b/components/script/dom/create.rs @@ -3,7 +3,6 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ use dom::bindings::js::Root; -use dom::bindings::str::DOMString; use dom::document::Document; use dom::element::Element; use dom::element::ElementCreator; @@ -81,7 +80,7 @@ use html5ever_atoms::{Prefix, QualName}; use servo_config::prefs::PREFS; fn create_svg_element(name: QualName, - prefix: Option, + prefix: Option, document: &Document) -> Root { assert!(name.ns == ns!(svg)); @@ -108,7 +107,7 @@ fn create_svg_element(name: QualName, } fn create_html_element(name: QualName, - prefix: Option, + prefix: Option, document: &Document, creator: ElementCreator) -> Root { @@ -280,7 +279,7 @@ pub fn create_element(name: QualName, -> Root { // FIXME(ajeffrey): Convert directly from Prefix to DOMString. - let prefix = prefix.map(|p| DOMString::from(&*p)); + // let prefix = prefix.map(|p| DOMString::from(&*p)); match name.ns { ns!(html) => create_html_element(name, prefix, document, creator), -- cgit v1.2.3 From 2333b39569a0cc598289c948aefea64aa9aa4858 Mon Sep 17 00:00:00 2001 From: Connor Brewster Date: Wed, 7 Jun 2017 13:55:42 -0600 Subject: Implement HTMLConstructor --- components/script/dom/create.rs | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) (limited to 'components/script/dom/create.rs') diff --git a/components/script/dom/create.rs b/components/script/dom/create.rs index 91ea3e1e7da..b96406b60ed 100644 --- a/components/script/dom/create.rs +++ b/components/script/dom/create.rs @@ -107,10 +107,18 @@ fn create_svg_element(name: QualName, } fn create_html_element(name: QualName, - prefix: Option, - document: &Document, - creator: ElementCreator) - -> Root { + prefix: Option, + document: &Document, + creator: ElementCreator) + -> Root { + create_native_html_element(name, prefix, document, creator) +} + +pub fn create_native_html_element(name: QualName, + prefix: Option, + document: &Document, + creator: ElementCreator) + -> Root { assert!(name.ns == ns!(html)); macro_rules! make( -- cgit v1.2.3 From 6697f5469d0e331d704dc1211c6236b751102bc8 Mon Sep 17 00:00:00 2001 From: Connor Brewster Date: Fri, 9 Jun 2017 18:23:27 -0600 Subject: Hook CE registry into element creation --- components/script/dom/create.rs | 35 +++++++++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) (limited to 'components/script/dom/create.rs') diff --git a/components/script/dom/create.rs b/components/script/dom/create.rs index b96406b60ed..52410a487b8 100644 --- a/components/script/dom/create.rs +++ b/components/script/dom/create.rs @@ -2,10 +2,13 @@ * 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::{report_pending_exception, throw_dom_exception}; use dom::bindings::js::Root; +use dom::bindings::reflector::DomObject; use dom::document::Document; use dom::element::Element; use dom::element::ElementCreator; +use dom::globalscope::GlobalScope; use dom::htmlanchorelement::HTMLAnchorElement; use dom::htmlappletelement::HTMLAppletElement; use dom::htmlareaelement::HTMLAreaElement; @@ -77,6 +80,7 @@ use dom::htmlunknownelement::HTMLUnknownElement; use dom::htmlvideoelement::HTMLVideoElement; use dom::svgsvgelement::SVGSVGElement; use html5ever::{QualName, Prefix}; +use js::jsapi::JSAutoCompartment; use servo_config::prefs::PREFS; fn create_svg_element(name: QualName, @@ -106,11 +110,42 @@ fn create_svg_element(name: QualName, } } +// https://dom.spec.whatwg.org/#concept-create-element +#[allow(unsafe_code)] fn create_html_element(name: QualName, prefix: Option, document: &Document, creator: ElementCreator) -> Root { + assert!(name.ns == ns!(html)); + + // Step 4 + let definition = document.lookup_custom_element_definition(name.local.clone(), None); + + if let Some(definition) = definition { + // TODO: Handle customized built-in elements. Relies on CE upgrades. + if definition.is_autonomous() { + let local_name = name.local.clone(); + return match definition.create_element(document) { + Ok(element) => element, + Err(error) => { + // Step 6. Recovering from exception. + let global = GlobalScope::current().unwrap_or_else(|| document.global()); + + // Step 6.1.1 + unsafe { + let _ac = JSAutoCompartment::new(global.get_cx(), global.reflector().get_jsobject().get()); + throw_dom_exception(global.get_cx(), &global, error); + report_pending_exception(global.get_cx(), true); + } + + // Step 6.1.2 + Root::upcast(HTMLUnknownElement::new(local_name, prefix, document)) + }, + }; + } + } + create_native_html_element(name, prefix, document, creator) } -- cgit v1.2.3 From 2f36d3544fd7082cb5fcb16a43955cbb446bcbd7 Mon Sep 17 00:00:00 2001 From: Connor Brewster Date: Fri, 16 Jun 2017 14:34:17 -0600 Subject: Support `is` option when creating elements --- components/script/dom/create.rs | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) (limited to 'components/script/dom/create.rs') diff --git a/components/script/dom/create.rs b/components/script/dom/create.rs index 52410a487b8..bcf7a551cf7 100644 --- a/components/script/dom/create.rs +++ b/components/script/dom/create.rs @@ -79,7 +79,7 @@ use dom::htmlulistelement::HTMLUListElement; use dom::htmlunknownelement::HTMLUnknownElement; use dom::htmlvideoelement::HTMLVideoElement; use dom::svgsvgelement::SVGSVGElement; -use html5ever::{QualName, Prefix}; +use html5ever::{LocalName, Prefix, QualName}; use js::jsapi::JSAutoCompartment; use servo_config::prefs::PREFS; @@ -114,16 +114,16 @@ fn create_svg_element(name: QualName, #[allow(unsafe_code)] fn create_html_element(name: QualName, prefix: Option, + is: Option, document: &Document, creator: ElementCreator) -> Root { assert!(name.ns == ns!(html)); // Step 4 - let definition = document.lookup_custom_element_definition(name.local.clone(), None); + let definition = document.lookup_custom_element_definition(name.local.clone(), is); if let Some(definition) = definition { - // TODO: Handle customized built-in elements. Relies on CE upgrades. if definition.is_autonomous() { let local_name = name.local.clone(); return match definition.create_element(document) { @@ -143,6 +143,11 @@ fn create_html_element(name: QualName, Root::upcast(HTMLUnknownElement::new(local_name, prefix, document)) }, }; + } else { + let element = create_native_html_element(name, prefix, document, creator); + element.set_is(definition.name.clone()); + // TODO: Enqueue custom element upgrade + return element; } } @@ -316,12 +321,13 @@ pub fn create_native_html_element(name: QualName, } pub fn create_element(name: QualName, + is: Option, document: &Document, creator: ElementCreator) -> Root { let prefix = name.prefix.clone(); match name.ns { - ns!(html) => create_html_element(name, prefix, document, creator), + ns!(html) => create_html_element(name, prefix, is, document, creator), ns!(svg) => create_svg_element(name, prefix, document), _ => Element::new(name.local, name.ns, prefix, document) } -- cgit v1.2.3 From 062b1286889527d9f4d41cf8cb8293b3aabfd37d Mon Sep 17 00:00:00 2001 From: Connor Brewster Date: Fri, 16 Jun 2017 15:30:13 -0600 Subject: Add flag for sync/async CE creation --- components/script/dom/create.rs | 48 ++++++++++++++++++++++++----------------- 1 file changed, 28 insertions(+), 20 deletions(-) (limited to 'components/script/dom/create.rs') diff --git a/components/script/dom/create.rs b/components/script/dom/create.rs index bcf7a551cf7..a728ab4f364 100644 --- a/components/script/dom/create.rs +++ b/components/script/dom/create.rs @@ -6,8 +6,7 @@ use dom::bindings::error::{report_pending_exception, throw_dom_exception}; use dom::bindings::js::Root; use dom::bindings::reflector::DomObject; use dom::document::Document; -use dom::element::Element; -use dom::element::ElementCreator; +use dom::element::{CustomElementCreationMode, Element, ElementCreator}; use dom::globalscope::GlobalScope; use dom::htmlanchorelement::HTMLAnchorElement; use dom::htmlappletelement::HTMLAppletElement; @@ -116,7 +115,8 @@ fn create_html_element(name: QualName, prefix: Option, is: Option, document: &Document, - creator: ElementCreator) + creator: ElementCreator, + mode: CustomElementCreationMode) -> Root { assert!(name.ns == ns!(html)); @@ -125,24 +125,31 @@ fn create_html_element(name: QualName, if let Some(definition) = definition { if definition.is_autonomous() { - let local_name = name.local.clone(); - return match definition.create_element(document) { - Ok(element) => element, - Err(error) => { - // Step 6. Recovering from exception. - let global = GlobalScope::current().unwrap_or_else(|| document.global()); + match mode { + // TODO: Handle asynchronous CE creation. Relies on CE upgrades. + CustomElementCreationMode::Asynchronous => {}, + CustomElementCreationMode::Synchronous => { + let local_name = name.local.clone(); + return match definition.create_element(document) { + Ok(element) => element, + Err(error) => { + // Step 6. Recovering from exception. + let global = GlobalScope::current().unwrap_or_else(|| document.global()); + let cx = global.get_cx(); - // Step 6.1.1 - unsafe { - let _ac = JSAutoCompartment::new(global.get_cx(), global.reflector().get_jsobject().get()); - throw_dom_exception(global.get_cx(), &global, error); - report_pending_exception(global.get_cx(), true); - } + // Step 6.1.1 + unsafe { + let _ac = JSAutoCompartment::new(cx, global.reflector().get_jsobject().get()); + throw_dom_exception(cx, &global, error); + report_pending_exception(cx, true); + } - // Step 6.1.2 - Root::upcast(HTMLUnknownElement::new(local_name, prefix, document)) + // Step 6.1.2 + Root::upcast(HTMLUnknownElement::new(local_name, prefix, document)) + }, + }; }, - }; + } } else { let element = create_native_html_element(name, prefix, document, creator); element.set_is(definition.name.clone()); @@ -323,11 +330,12 @@ pub fn create_native_html_element(name: QualName, pub fn create_element(name: QualName, is: Option, document: &Document, - creator: ElementCreator) + creator: ElementCreator, + mode: CustomElementCreationMode) -> Root { let prefix = name.prefix.clone(); match name.ns { - ns!(html) => create_html_element(name, prefix, is, document, creator), + ns!(html) => create_html_element(name, prefix, is, document, creator, mode), ns!(svg) => create_svg_element(name, prefix, document), _ => Element::new(name.local, name.ns, prefix, document) } -- cgit v1.2.3 From 37e8b89377302e9e981e1268eab97e7bbebbfdb6 Mon Sep 17 00:00:00 2001 From: Connor Brewster Date: Fri, 23 Jun 2017 14:21:50 -0600 Subject: Allow element prefix to be set Implements step 6.1.10 of https://dom.spec.whatwg.org/#concept-create-element --- components/script/dom/create.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'components/script/dom/create.rs') diff --git a/components/script/dom/create.rs b/components/script/dom/create.rs index a728ab4f364..e22e28a886e 100644 --- a/components/script/dom/create.rs +++ b/components/script/dom/create.rs @@ -130,7 +130,7 @@ fn create_html_element(name: QualName, CustomElementCreationMode::Asynchronous => {}, CustomElementCreationMode::Synchronous => { let local_name = name.local.clone(); - return match definition.create_element(document) { + return match definition.create_element(document, prefix.clone()) { Ok(element) => element, Err(error) => { // Step 6. Recovering from exception. -- cgit v1.2.3 From 46659915036bb44e73e7ef2696ea9f35105f1659 Mon Sep 17 00:00:00 2001 From: Connor Brewster Date: Wed, 21 Jun 2017 14:40:34 -0600 Subject: Support custom element callback reactions --- components/script/dom/create.rs | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'components/script/dom/create.rs') diff --git a/components/script/dom/create.rs b/components/script/dom/create.rs index e22e28a886e..5f03a3adb98 100644 --- a/components/script/dom/create.rs +++ b/components/script/dom/create.rs @@ -131,7 +131,10 @@ fn create_html_element(name: QualName, CustomElementCreationMode::Synchronous => { let local_name = name.local.clone(); return match definition.create_element(document, prefix.clone()) { - Ok(element) => element, + Ok(element) => { + element.set_custom_element_definition(definition.clone()); + element + }, Err(error) => { // Step 6. Recovering from exception. let global = GlobalScope::current().unwrap_or_else(|| document.global()); -- cgit v1.2.3 From 37cbc857276578617f9771bb984700a00f132a3f Mon Sep 17 00:00:00 2001 From: Connor Brewster Date: Thu, 20 Jul 2017 16:35:01 -0600 Subject: Use HTMLElement interface for possible CEs --- components/script/dom/create.rs | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'components/script/dom/create.rs') diff --git a/components/script/dom/create.rs b/components/script/dom/create.rs index 5f03a3adb98..fa05f4e00f1 100644 --- a/components/script/dom/create.rs +++ b/components/script/dom/create.rs @@ -5,6 +5,7 @@ use dom::bindings::error::{report_pending_exception, throw_dom_exception}; use dom::bindings::js::Root; use dom::bindings::reflector::DomObject; +use dom::customelementregistry::is_valid_custom_element_name; use dom::document::Document; use dom::element::{CustomElementCreationMode, Element, ElementCreator}; use dom::globalscope::GlobalScope; @@ -184,6 +185,7 @@ pub fn create_native_html_element(name: QualName, // This is a big match, and the IDs for inline-interned atoms are not very structured. // Perhaps we should build a perfect hash from those IDs instead. + // https://html.spec.whatwg.org/multipage/#elements-in-the-dom match name.local { local_name!("a") => make!(HTMLAnchorElement), local_name!("abbr") => make!(HTMLElement), @@ -326,7 +328,8 @@ pub fn create_native_html_element(name: QualName, local_name!("video") => make!(HTMLVideoElement), local_name!("wbr") => make!(HTMLElement), local_name!("xmp") => make!(HTMLPreElement), - _ => make!(HTMLUnknownElement), + _ if is_valid_custom_element_name(&*name.local) => make!(HTMLElement), + _ => make!(HTMLUnknownElement), } } -- cgit v1.2.3 From 41371208a51661e82d65617e4f6ac221463a9ee7 Mon Sep 17 00:00:00 2001 From: Connor Brewster Date: Fri, 21 Jul 2017 14:08:03 -0600 Subject: Check namespace during ce def lookup --- components/script/dom/create.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'components/script/dom/create.rs') diff --git a/components/script/dom/create.rs b/components/script/dom/create.rs index fa05f4e00f1..f1895e8844e 100644 --- a/components/script/dom/create.rs +++ b/components/script/dom/create.rs @@ -122,7 +122,7 @@ fn create_html_element(name: QualName, assert!(name.ns == ns!(html)); // Step 4 - let definition = document.lookup_custom_element_definition(name.local.clone(), is); + let definition = document.lookup_custom_element_definition(&name.ns, &name.local, is.as_ref()); if let Some(definition) = definition { if definition.is_autonomous() { -- cgit v1.2.3 From 6d9d4add617e4e5ad08a65d563e9842b3cde0c7b Mon Sep 17 00:00:00 2001 From: Connor Brewster Date: Wed, 19 Jul 2017 13:34:33 -0600 Subject: Enqueue upgrades --- components/script/dom/create.rs | 20 ++++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-) (limited to 'components/script/dom/create.rs') diff --git a/components/script/dom/create.rs b/components/script/dom/create.rs index f1895e8844e..e70c547e3d3 100644 --- a/components/script/dom/create.rs +++ b/components/script/dom/create.rs @@ -5,7 +5,7 @@ use dom::bindings::error::{report_pending_exception, throw_dom_exception}; use dom::bindings::js::Root; use dom::bindings::reflector::DomObject; -use dom::customelementregistry::is_valid_custom_element_name; +use dom::customelementregistry::{is_valid_custom_element_name, upgrade_element}; use dom::document::Document; use dom::element::{CustomElementCreationMode, Element, ElementCreator}; use dom::globalscope::GlobalScope; @@ -81,6 +81,7 @@ use dom::htmlvideoelement::HTMLVideoElement; use dom::svgsvgelement::SVGSVGElement; use html5ever::{LocalName, Prefix, QualName}; use js::jsapi::JSAutoCompartment; +use script_thread::ScriptThread; use servo_config::prefs::PREFS; fn create_svg_element(name: QualName, @@ -127,8 +128,11 @@ fn create_html_element(name: QualName, if let Some(definition) = definition { if definition.is_autonomous() { match mode { - // TODO: Handle asynchronous CE creation. Relies on CE upgrades. - CustomElementCreationMode::Asynchronous => {}, + CustomElementCreationMode::Asynchronous => { + let result = Root::upcast(HTMLElement::new(name.local.clone(), prefix.clone(), document)); + ScriptThread::enqueue_upgrade_reaction(&*result, definition); + return result; + }, CustomElementCreationMode::Synchronous => { let local_name = name.local.clone(); return match definition.create_element(document, prefix.clone()) { @@ -155,9 +159,17 @@ fn create_html_element(name: QualName, }, } } else { + // Steps 5.1-5.2 let element = create_native_html_element(name, prefix, document, creator); element.set_is(definition.name.clone()); - // TODO: Enqueue custom element upgrade + match mode { + // Step 5.3 + CustomElementCreationMode::Synchronous => + upgrade_element(definition, &*element), + // Step 5.4 + CustomElementCreationMode::Asynchronous => + ScriptThread::enqueue_upgrade_reaction(&*element, definition), + } return element; } } -- cgit v1.2.3 From 9f51c7df21b9a03c40235cbccd1b7930528f23a2 Mon Sep 17 00:00:00 2001 From: Connor Brewster Date: Tue, 1 Aug 2017 12:20:31 -0600 Subject: Track custom element state --- components/script/dom/create.rs | 22 ++++++++++++++++++---- 1 file changed, 18 insertions(+), 4 deletions(-) (limited to 'components/script/dom/create.rs') diff --git a/components/script/dom/create.rs b/components/script/dom/create.rs index e70c547e3d3..922757593f3 100644 --- a/components/script/dom/create.rs +++ b/components/script/dom/create.rs @@ -7,7 +7,7 @@ use dom::bindings::js::Root; use dom::bindings::reflector::DomObject; use dom::customelementregistry::{is_valid_custom_element_name, upgrade_element}; use dom::document::Document; -use dom::element::{CustomElementCreationMode, Element, ElementCreator}; +use dom::element::{CustomElementCreationMode, CustomElementState, Element, ElementCreator}; use dom::globalscope::GlobalScope; use dom::htmlanchorelement::HTMLAnchorElement; use dom::htmlappletelement::HTMLAppletElement; @@ -129,7 +129,9 @@ fn create_html_element(name: QualName, if definition.is_autonomous() { match mode { CustomElementCreationMode::Asynchronous => { - let result = Root::upcast(HTMLElement::new(name.local.clone(), prefix.clone(), document)); + let result = Root::upcast::( + HTMLElement::new(name.local.clone(), prefix.clone(), document)); + result.set_custom_element_state(CustomElementState::Undefined); ScriptThread::enqueue_upgrade_reaction(&*result, definition); return result; }, @@ -153,7 +155,10 @@ fn create_html_element(name: QualName, } // Step 6.1.2 - Root::upcast(HTMLUnknownElement::new(local_name, prefix, document)) + let element = Root::upcast::( + HTMLUnknownElement::new(local_name, prefix, document)); + element.set_custom_element_state(CustomElementState::Failed); + element }, }; }, @@ -162,6 +167,7 @@ fn create_html_element(name: QualName, // Steps 5.1-5.2 let element = create_native_html_element(name, prefix, document, creator); element.set_is(definition.name.clone()); + element.set_custom_element_state(CustomElementState::Undefined); match mode { // Step 5.3 CustomElementCreationMode::Synchronous => @@ -174,7 +180,15 @@ fn create_html_element(name: QualName, } } - create_native_html_element(name, prefix, document, creator) + // Steps 7.1-7.2 + let result = create_native_html_element(name.clone(), prefix, document, creator); + + // Step 7.3 + if is_valid_custom_element_name(&*name.local) || is.is_some() { + result.set_custom_element_state(CustomElementState::Undefined); + } + + result } pub fn create_native_html_element(name: QualName, -- cgit v1.2.3 From 0e3c54c1911ba2c3bf305ee04f04fcd9bf2fc2fe Mon Sep 17 00:00:00 2001 From: Anthony Ramine Date: Mon, 25 Sep 2017 23:30:24 +0200 Subject: Rename dom::bindings::js to dom::bindings::root --- components/script/dom/create.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'components/script/dom/create.rs') diff --git a/components/script/dom/create.rs b/components/script/dom/create.rs index 922757593f3..c62fc1c14c6 100644 --- a/components/script/dom/create.rs +++ b/components/script/dom/create.rs @@ -3,8 +3,8 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ use dom::bindings::error::{report_pending_exception, throw_dom_exception}; -use dom::bindings::js::Root; use dom::bindings::reflector::DomObject; +use dom::bindings::root::Root; use dom::customelementregistry::{is_valid_custom_element_name, upgrade_element}; use dom::document::Document; use dom::element::{CustomElementCreationMode, CustomElementState, Element, ElementCreator}; -- cgit v1.2.3 From f87c2a8d7616112ca924e30292db2d244cf87eec Mon Sep 17 00:00:00 2001 From: Anthony Ramine Date: Tue, 26 Sep 2017 01:53:40 +0200 Subject: Rename Root to DomRoot In a later PR, DomRoot will become a type alias of Root>, where Root will be able to handle all the things that need to be rooted that have a stable traceable address that doesn't move for the whole lifetime of the root. Stay tuned. --- components/script/dom/create.rs | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) (limited to 'components/script/dom/create.rs') diff --git a/components/script/dom/create.rs b/components/script/dom/create.rs index c62fc1c14c6..39e91a215e5 100644 --- a/components/script/dom/create.rs +++ b/components/script/dom/create.rs @@ -4,7 +4,7 @@ use dom::bindings::error::{report_pending_exception, throw_dom_exception}; use dom::bindings::reflector::DomObject; -use dom::bindings::root::Root; +use dom::bindings::root::DomRoot; use dom::customelementregistry::{is_valid_custom_element_name, upgrade_element}; use dom::document::Document; use dom::element::{CustomElementCreationMode, CustomElementState, Element, ElementCreator}; @@ -87,17 +87,17 @@ use servo_config::prefs::PREFS; fn create_svg_element(name: QualName, prefix: Option, document: &Document) - -> Root { + -> DomRoot { assert!(name.ns == ns!(svg)); macro_rules! make( ($ctor:ident) => ({ let obj = $ctor::new(name.local, prefix, document); - Root::upcast(obj) + DomRoot::upcast(obj) }); ($ctor:ident, $($arg:expr),+) => ({ let obj = $ctor::new(name.local, prefix, document, $($arg),+); - Root::upcast(obj) + DomRoot::upcast(obj) }) ); @@ -119,7 +119,7 @@ fn create_html_element(name: QualName, document: &Document, creator: ElementCreator, mode: CustomElementCreationMode) - -> Root { + -> DomRoot { assert!(name.ns == ns!(html)); // Step 4 @@ -129,7 +129,7 @@ fn create_html_element(name: QualName, if definition.is_autonomous() { match mode { CustomElementCreationMode::Asynchronous => { - let result = Root::upcast::( + let result = DomRoot::upcast::( HTMLElement::new(name.local.clone(), prefix.clone(), document)); result.set_custom_element_state(CustomElementState::Undefined); ScriptThread::enqueue_upgrade_reaction(&*result, definition); @@ -155,7 +155,7 @@ fn create_html_element(name: QualName, } // Step 6.1.2 - let element = Root::upcast::( + let element = DomRoot::upcast::( HTMLUnknownElement::new(local_name, prefix, document)); element.set_custom_element_state(CustomElementState::Failed); element @@ -195,17 +195,17 @@ pub fn create_native_html_element(name: QualName, prefix: Option, document: &Document, creator: ElementCreator) - -> Root { + -> DomRoot { assert!(name.ns == ns!(html)); macro_rules! make( ($ctor:ident) => ({ let obj = $ctor::new(name.local, prefix, document); - Root::upcast(obj) + DomRoot::upcast(obj) }); ($ctor:ident, $($arg:expr),+) => ({ let obj = $ctor::new(name.local, prefix, document, $($arg),+); - Root::upcast(obj) + DomRoot::upcast(obj) }) ); @@ -364,7 +364,7 @@ pub fn create_element(name: QualName, document: &Document, creator: ElementCreator, mode: CustomElementCreationMode) - -> Root { + -> DomRoot { let prefix = name.prefix.clone(); match name.ns { ns!(html) => create_html_element(name, prefix, is, document, creator, mode), -- cgit v1.2.3 From 8b0f58c8af3fd5f0a328ac9286d2719328cadbd5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Emilio=20Cobos=20=C3=81lvarez?= Date: Wed, 27 Sep 2017 20:42:40 +0200 Subject: script: Remove HTMLAppletElement. It was removed from the spec, there's no reason to keep it in tree. --- components/script/dom/create.rs | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) (limited to 'components/script/dom/create.rs') diff --git a/components/script/dom/create.rs b/components/script/dom/create.rs index 39e91a215e5..4790088b009 100644 --- a/components/script/dom/create.rs +++ b/components/script/dom/create.rs @@ -10,7 +10,6 @@ use dom::document::Document; use dom::element::{CustomElementCreationMode, CustomElementState, Element, ElementCreator}; use dom::globalscope::GlobalScope; use dom::htmlanchorelement::HTMLAnchorElement; -use dom::htmlappletelement::HTMLAppletElement; use dom::htmlareaelement::HTMLAreaElement; use dom::htmlaudioelement::HTMLAudioElement; use dom::htmlbaseelement::HTMLBaseElement; @@ -191,12 +190,13 @@ fn create_html_element(name: QualName, result } -pub fn create_native_html_element(name: QualName, - prefix: Option, - document: &Document, - creator: ElementCreator) - -> DomRoot { - assert!(name.ns == ns!(html)); +pub fn create_native_html_element( + name: QualName, + prefix: Option, + document: &Document, + creator: ElementCreator, +) -> DomRoot { + assert_eq!(name.ns, ns!(html)); macro_rules! make( ($ctor:ident) => ({ @@ -217,7 +217,6 @@ pub fn create_native_html_element(name: QualName, local_name!("abbr") => make!(HTMLElement), local_name!("acronym") => make!(HTMLElement), local_name!("address") => make!(HTMLElement), - local_name!("applet") => make!(HTMLAppletElement), local_name!("area") => make!(HTMLAreaElement), local_name!("article") => make!(HTMLElement), local_name!("aside") => make!(HTMLElement), -- cgit v1.2.3 From 548633570862ad3e47e7f89d5ff9d0699ff00472 Mon Sep 17 00:00:00 2001 From: CYBAI Date: Thu, 25 Jan 2018 23:49:34 +0800 Subject: Use specific assertion for DOM create --- components/script/dom/create.rs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'components/script/dom/create.rs') diff --git a/components/script/dom/create.rs b/components/script/dom/create.rs index 4790088b009..49661e4b5bf 100644 --- a/components/script/dom/create.rs +++ b/components/script/dom/create.rs @@ -87,7 +87,7 @@ fn create_svg_element(name: QualName, prefix: Option, document: &Document) -> DomRoot { - assert!(name.ns == ns!(svg)); + assert_eq!(name.ns, ns!(svg)); macro_rules! make( ($ctor:ident) => ({ @@ -119,7 +119,7 @@ fn create_html_element(name: QualName, creator: ElementCreator, mode: CustomElementCreationMode) -> DomRoot { - assert!(name.ns == ns!(html)); + assert_eq!(name.ns, ns!(html)); // Step 4 let definition = document.lookup_custom_element_definition(&name.ns, &name.local, is.as_ref()); -- cgit v1.2.3 From d47ce855cec831586c0eda100f9dc24c5e13e772 Mon Sep 17 00:00:00 2001 From: Rakhi Sharma Date: Thu, 4 Jan 2018 11:46:03 +0000 Subject: Implement HTMLPictureElement interface. --- components/script/dom/create.rs | 2 ++ 1 file changed, 2 insertions(+) (limited to 'components/script/dom/create.rs') diff --git a/components/script/dom/create.rs b/components/script/dom/create.rs index 49661e4b5bf..64116663a84 100644 --- a/components/script/dom/create.rs +++ b/components/script/dom/create.rs @@ -54,6 +54,7 @@ use dom::htmloptionelement::HTMLOptionElement; use dom::htmloutputelement::HTMLOutputElement; use dom::htmlparagraphelement::HTMLParagraphElement; use dom::htmlparamelement::HTMLParamElement; +use dom::htmlpictureelement::HTMLPictureElement; use dom::htmlpreelement::HTMLPreElement; use dom::htmlprogresselement::HTMLProgressElement; use dom::htmlquoteelement::HTMLQuoteElement; @@ -309,6 +310,7 @@ pub fn create_native_html_element( local_name!("output") => make!(HTMLOutputElement), local_name!("p") => make!(HTMLParagraphElement), local_name!("param") => make!(HTMLParamElement), + local_name!("picture") => make!(HTMLPictureElement), local_name!("plaintext") => make!(HTMLPreElement), local_name!("pre") => make!(HTMLPreElement), local_name!("progress") => make!(HTMLProgressElement), -- cgit v1.2.3 From c37a345dc9f4dda6ea29c42f96f6c7201c42cbac Mon Sep 17 00:00:00 2001 From: chansuke Date: Tue, 18 Sep 2018 23:24:15 +0900 Subject: Format script component --- components/script/dom/create.rs | 335 +++++++++++++++++++++------------------- 1 file changed, 173 insertions(+), 162 deletions(-) (limited to 'components/script/dom/create.rs') diff --git a/components/script/dom/create.rs b/components/script/dom/create.rs index 64116663a84..94fe6bd1457 100644 --- a/components/script/dom/create.rs +++ b/components/script/dom/create.rs @@ -84,10 +84,11 @@ use js::jsapi::JSAutoCompartment; use script_thread::ScriptThread; use servo_config::prefs::PREFS; -fn create_svg_element(name: QualName, - prefix: Option, - document: &Document) - -> DomRoot { +fn create_svg_element( + name: QualName, + prefix: Option, + document: &Document, +) -> DomRoot { assert_eq!(name.ns, ns!(svg)); macro_rules! make( @@ -106,20 +107,21 @@ fn create_svg_element(name: QualName, } match name.local { - local_name!("svg") => make!(SVGSVGElement), - _ => Element::new(name.local, name.ns, prefix, document), + local_name!("svg") => make!(SVGSVGElement), + _ => Element::new(name.local, name.ns, prefix, document), } } // https://dom.spec.whatwg.org/#concept-create-element #[allow(unsafe_code)] -fn create_html_element(name: QualName, - prefix: Option, - is: Option, - document: &Document, - creator: ElementCreator, - mode: CustomElementCreationMode) - -> DomRoot { +fn create_html_element( + name: QualName, + prefix: Option, + is: Option, + document: &Document, + creator: ElementCreator, + mode: CustomElementCreationMode, +) -> DomRoot { assert_eq!(name.ns, ns!(html)); // Step 4 @@ -129,8 +131,11 @@ fn create_html_element(name: QualName, if definition.is_autonomous() { match mode { CustomElementCreationMode::Asynchronous => { - let result = DomRoot::upcast::( - HTMLElement::new(name.local.clone(), prefix.clone(), document)); + let result = DomRoot::upcast::(HTMLElement::new( + name.local.clone(), + prefix.clone(), + document, + )); result.set_custom_element_state(CustomElementState::Undefined); ScriptThread::enqueue_upgrade_reaction(&*result, definition); return result; @@ -144,19 +149,24 @@ fn create_html_element(name: QualName, }, Err(error) => { // Step 6. Recovering from exception. - let global = GlobalScope::current().unwrap_or_else(|| document.global()); + let global = + GlobalScope::current().unwrap_or_else(|| document.global()); let cx = global.get_cx(); // Step 6.1.1 unsafe { - let _ac = JSAutoCompartment::new(cx, global.reflector().get_jsobject().get()); + let _ac = JSAutoCompartment::new( + cx, + global.reflector().get_jsobject().get(), + ); throw_dom_exception(cx, &global, error); report_pending_exception(cx, true); } // Step 6.1.2 - let element = DomRoot::upcast::( - HTMLUnknownElement::new(local_name, prefix, document)); + let element = DomRoot::upcast::(HTMLUnknownElement::new( + local_name, prefix, document, + )); element.set_custom_element_state(CustomElementState::Failed); element }, @@ -170,11 +180,11 @@ fn create_html_element(name: QualName, element.set_custom_element_state(CustomElementState::Undefined); match mode { // Step 5.3 - CustomElementCreationMode::Synchronous => - upgrade_element(definition, &*element), + CustomElementCreationMode::Synchronous => upgrade_element(definition, &*element), // Step 5.4 - CustomElementCreationMode::Asynchronous => - ScriptThread::enqueue_upgrade_reaction(&*element, definition), + CustomElementCreationMode::Asynchronous => { + ScriptThread::enqueue_upgrade_reaction(&*element, definition) + }, } return element; } @@ -214,162 +224,163 @@ pub fn create_native_html_element( // Perhaps we should build a perfect hash from those IDs instead. // https://html.spec.whatwg.org/multipage/#elements-in-the-dom match name.local { - local_name!("a") => make!(HTMLAnchorElement), - local_name!("abbr") => make!(HTMLElement), - local_name!("acronym") => make!(HTMLElement), - local_name!("address") => make!(HTMLElement), - local_name!("area") => make!(HTMLAreaElement), - local_name!("article") => make!(HTMLElement), - local_name!("aside") => make!(HTMLElement), - local_name!("audio") => make!(HTMLAudioElement), - local_name!("b") => make!(HTMLElement), - local_name!("base") => make!(HTMLBaseElement), - local_name!("bdi") => make!(HTMLElement), - local_name!("bdo") => make!(HTMLElement), + local_name!("a") => make!(HTMLAnchorElement), + local_name!("abbr") => make!(HTMLElement), + local_name!("acronym") => make!(HTMLElement), + local_name!("address") => make!(HTMLElement), + local_name!("area") => make!(HTMLAreaElement), + local_name!("article") => make!(HTMLElement), + local_name!("aside") => make!(HTMLElement), + local_name!("audio") => make!(HTMLAudioElement), + local_name!("b") => make!(HTMLElement), + local_name!("base") => make!(HTMLBaseElement), + local_name!("bdi") => make!(HTMLElement), + local_name!("bdo") => make!(HTMLElement), // https://html.spec.whatwg.org/multipage/#other-elements,-attributes-and-apis:bgsound - local_name!("bgsound") => make!(HTMLUnknownElement), - local_name!("big") => make!(HTMLElement), + local_name!("bgsound") => make!(HTMLUnknownElement), + local_name!("big") => make!(HTMLElement), // https://html.spec.whatwg.org/multipage/#other-elements,-attributes-and-apis:blink - local_name!("blink") => make!(HTMLUnknownElement), + local_name!("blink") => make!(HTMLUnknownElement), // https://html.spec.whatwg.org/multipage/#the-blockquote-element local_name!("blockquote") => make!(HTMLQuoteElement), - local_name!("body") => make!(HTMLBodyElement), - local_name!("br") => make!(HTMLBRElement), - local_name!("button") => make!(HTMLButtonElement), - local_name!("canvas") => make!(HTMLCanvasElement), - local_name!("caption") => make!(HTMLTableCaptionElement), - local_name!("center") => make!(HTMLElement), - local_name!("cite") => make!(HTMLElement), - local_name!("code") => make!(HTMLElement), - local_name!("col") => make!(HTMLTableColElement), - local_name!("colgroup") => make!(HTMLTableColElement), - local_name!("data") => make!(HTMLDataElement), - local_name!("datalist") => make!(HTMLDataListElement), - local_name!("dd") => make!(HTMLElement), - local_name!("del") => make!(HTMLModElement), - local_name!("details") => make!(HTMLDetailsElement), - local_name!("dfn") => make!(HTMLElement), - local_name!("dialog") => make!(HTMLDialogElement), - local_name!("dir") => make!(HTMLDirectoryElement), - local_name!("div") => make!(HTMLDivElement), - local_name!("dl") => make!(HTMLDListElement), - local_name!("dt") => make!(HTMLElement), - local_name!("em") => make!(HTMLElement), - local_name!("embed") => make!(HTMLEmbedElement), - local_name!("fieldset") => make!(HTMLFieldSetElement), + local_name!("body") => make!(HTMLBodyElement), + local_name!("br") => make!(HTMLBRElement), + local_name!("button") => make!(HTMLButtonElement), + local_name!("canvas") => make!(HTMLCanvasElement), + local_name!("caption") => make!(HTMLTableCaptionElement), + local_name!("center") => make!(HTMLElement), + local_name!("cite") => make!(HTMLElement), + local_name!("code") => make!(HTMLElement), + local_name!("col") => make!(HTMLTableColElement), + local_name!("colgroup") => make!(HTMLTableColElement), + local_name!("data") => make!(HTMLDataElement), + local_name!("datalist") => make!(HTMLDataListElement), + local_name!("dd") => make!(HTMLElement), + local_name!("del") => make!(HTMLModElement), + local_name!("details") => make!(HTMLDetailsElement), + local_name!("dfn") => make!(HTMLElement), + local_name!("dialog") => make!(HTMLDialogElement), + local_name!("dir") => make!(HTMLDirectoryElement), + local_name!("div") => make!(HTMLDivElement), + local_name!("dl") => make!(HTMLDListElement), + local_name!("dt") => make!(HTMLElement), + local_name!("em") => make!(HTMLElement), + local_name!("embed") => make!(HTMLEmbedElement), + local_name!("fieldset") => make!(HTMLFieldSetElement), local_name!("figcaption") => make!(HTMLElement), - local_name!("figure") => make!(HTMLElement), - local_name!("font") => make!(HTMLFontElement), - local_name!("footer") => make!(HTMLElement), - local_name!("form") => make!(HTMLFormElement), - local_name!("frame") => make!(HTMLFrameElement), - local_name!("frameset") => make!(HTMLFrameSetElement), - local_name!("h1") => make!(HTMLHeadingElement, HeadingLevel::Heading1), - local_name!("h2") => make!(HTMLHeadingElement, HeadingLevel::Heading2), - local_name!("h3") => make!(HTMLHeadingElement, HeadingLevel::Heading3), - local_name!("h4") => make!(HTMLHeadingElement, HeadingLevel::Heading4), - local_name!("h5") => make!(HTMLHeadingElement, HeadingLevel::Heading5), - local_name!("h6") => make!(HTMLHeadingElement, HeadingLevel::Heading6), - local_name!("head") => make!(HTMLHeadElement), - local_name!("header") => make!(HTMLElement), - local_name!("hgroup") => make!(HTMLElement), - local_name!("hr") => make!(HTMLHRElement), - local_name!("html") => make!(HTMLHtmlElement), - local_name!("i") => make!(HTMLElement), - local_name!("iframe") => make!(HTMLIFrameElement), - local_name!("img") => make!(HTMLImageElement), - local_name!("input") => make!(HTMLInputElement), - local_name!("ins") => make!(HTMLModElement), + local_name!("figure") => make!(HTMLElement), + local_name!("font") => make!(HTMLFontElement), + local_name!("footer") => make!(HTMLElement), + local_name!("form") => make!(HTMLFormElement), + local_name!("frame") => make!(HTMLFrameElement), + local_name!("frameset") => make!(HTMLFrameSetElement), + local_name!("h1") => make!(HTMLHeadingElement, HeadingLevel::Heading1), + local_name!("h2") => make!(HTMLHeadingElement, HeadingLevel::Heading2), + local_name!("h3") => make!(HTMLHeadingElement, HeadingLevel::Heading3), + local_name!("h4") => make!(HTMLHeadingElement, HeadingLevel::Heading4), + local_name!("h5") => make!(HTMLHeadingElement, HeadingLevel::Heading5), + local_name!("h6") => make!(HTMLHeadingElement, HeadingLevel::Heading6), + local_name!("head") => make!(HTMLHeadElement), + local_name!("header") => make!(HTMLElement), + local_name!("hgroup") => make!(HTMLElement), + local_name!("hr") => make!(HTMLHRElement), + local_name!("html") => make!(HTMLHtmlElement), + local_name!("i") => make!(HTMLElement), + local_name!("iframe") => make!(HTMLIFrameElement), + local_name!("img") => make!(HTMLImageElement), + local_name!("input") => make!(HTMLInputElement), + local_name!("ins") => make!(HTMLModElement), // https://html.spec.whatwg.org/multipage/#other-elements,-attributes-and-apis:isindex-2 - local_name!("isindex") => make!(HTMLUnknownElement), - local_name!("kbd") => make!(HTMLElement), - local_name!("label") => make!(HTMLLabelElement), - local_name!("legend") => make!(HTMLLegendElement), - local_name!("li") => make!(HTMLLIElement), - local_name!("link") => make!(HTMLLinkElement, creator), + local_name!("isindex") => make!(HTMLUnknownElement), + local_name!("kbd") => make!(HTMLElement), + local_name!("label") => make!(HTMLLabelElement), + local_name!("legend") => make!(HTMLLegendElement), + local_name!("li") => make!(HTMLLIElement), + local_name!("link") => make!(HTMLLinkElement, creator), // https://html.spec.whatwg.org/multipage/#other-elements,-attributes-and-apis:listing - local_name!("listing") => make!(HTMLPreElement), - local_name!("main") => make!(HTMLElement), - local_name!("map") => make!(HTMLMapElement), - local_name!("mark") => make!(HTMLElement), - local_name!("marquee") => make!(HTMLElement), - local_name!("meta") => make!(HTMLMetaElement), - local_name!("meter") => make!(HTMLMeterElement), + local_name!("listing") => make!(HTMLPreElement), + local_name!("main") => make!(HTMLElement), + local_name!("map") => make!(HTMLMapElement), + local_name!("mark") => make!(HTMLElement), + local_name!("marquee") => make!(HTMLElement), + local_name!("meta") => make!(HTMLMetaElement), + local_name!("meter") => make!(HTMLMeterElement), // https://html.spec.whatwg.org/multipage/#other-elements,-attributes-and-apis:multicol - local_name!("multicol") => make!(HTMLUnknownElement), - local_name!("nav") => make!(HTMLElement), + local_name!("multicol") => make!(HTMLUnknownElement), + local_name!("nav") => make!(HTMLElement), // https://html.spec.whatwg.org/multipage/#other-elements,-attributes-and-apis:nextid - local_name!("nextid") => make!(HTMLUnknownElement), - local_name!("nobr") => make!(HTMLElement), - local_name!("noframes") => make!(HTMLElement), - local_name!("noscript") => make!(HTMLElement), - local_name!("object") => make!(HTMLObjectElement), - local_name!("ol") => make!(HTMLOListElement), - local_name!("optgroup") => make!(HTMLOptGroupElement), - local_name!("option") => make!(HTMLOptionElement), - local_name!("output") => make!(HTMLOutputElement), - local_name!("p") => make!(HTMLParagraphElement), - local_name!("param") => make!(HTMLParamElement), - local_name!("picture") => make!(HTMLPictureElement), - local_name!("plaintext") => make!(HTMLPreElement), - local_name!("pre") => make!(HTMLPreElement), - local_name!("progress") => make!(HTMLProgressElement), - local_name!("q") => make!(HTMLQuoteElement), - local_name!("rp") => make!(HTMLElement), - local_name!("rt") => make!(HTMLElement), - local_name!("ruby") => make!(HTMLElement), - local_name!("s") => make!(HTMLElement), - local_name!("samp") => make!(HTMLElement), - local_name!("script") => make!(HTMLScriptElement, creator), - local_name!("section") => make!(HTMLElement), - local_name!("select") => make!(HTMLSelectElement), - local_name!("small") => make!(HTMLElement), - local_name!("source") => make!(HTMLSourceElement), + local_name!("nextid") => make!(HTMLUnknownElement), + local_name!("nobr") => make!(HTMLElement), + local_name!("noframes") => make!(HTMLElement), + local_name!("noscript") => make!(HTMLElement), + local_name!("object") => make!(HTMLObjectElement), + local_name!("ol") => make!(HTMLOListElement), + local_name!("optgroup") => make!(HTMLOptGroupElement), + local_name!("option") => make!(HTMLOptionElement), + local_name!("output") => make!(HTMLOutputElement), + local_name!("p") => make!(HTMLParagraphElement), + local_name!("param") => make!(HTMLParamElement), + local_name!("picture") => make!(HTMLPictureElement), + local_name!("plaintext") => make!(HTMLPreElement), + local_name!("pre") => make!(HTMLPreElement), + local_name!("progress") => make!(HTMLProgressElement), + local_name!("q") => make!(HTMLQuoteElement), + local_name!("rp") => make!(HTMLElement), + local_name!("rt") => make!(HTMLElement), + local_name!("ruby") => make!(HTMLElement), + local_name!("s") => make!(HTMLElement), + local_name!("samp") => make!(HTMLElement), + local_name!("script") => make!(HTMLScriptElement, creator), + local_name!("section") => make!(HTMLElement), + local_name!("select") => make!(HTMLSelectElement), + local_name!("small") => make!(HTMLElement), + local_name!("source") => make!(HTMLSourceElement), // https://html.spec.whatwg.org/multipage/#other-elements,-attributes-and-apis:spacer - local_name!("spacer") => make!(HTMLUnknownElement), - local_name!("span") => make!(HTMLSpanElement), - local_name!("strike") => make!(HTMLElement), - local_name!("strong") => make!(HTMLElement), - local_name!("style") => make!(HTMLStyleElement, creator), - local_name!("sub") => make!(HTMLElement), - local_name!("summary") => make!(HTMLElement), - local_name!("sup") => make!(HTMLElement), - local_name!("table") => make!(HTMLTableElement), - local_name!("tbody") => make!(HTMLTableSectionElement), - local_name!("td") => make!(HTMLTableDataCellElement), - local_name!("template") => make!(HTMLTemplateElement), - local_name!("textarea") => make!(HTMLTextAreaElement), + local_name!("spacer") => make!(HTMLUnknownElement), + local_name!("span") => make!(HTMLSpanElement), + local_name!("strike") => make!(HTMLElement), + local_name!("strong") => make!(HTMLElement), + local_name!("style") => make!(HTMLStyleElement, creator), + local_name!("sub") => make!(HTMLElement), + local_name!("summary") => make!(HTMLElement), + local_name!("sup") => make!(HTMLElement), + local_name!("table") => make!(HTMLTableElement), + local_name!("tbody") => make!(HTMLTableSectionElement), + local_name!("td") => make!(HTMLTableDataCellElement), + local_name!("template") => make!(HTMLTemplateElement), + local_name!("textarea") => make!(HTMLTextAreaElement), // https://html.spec.whatwg.org/multipage/#the-tfoot-element:concept-element-dom - local_name!("tfoot") => make!(HTMLTableSectionElement), - local_name!("th") => make!(HTMLTableHeaderCellElement), + local_name!("tfoot") => make!(HTMLTableSectionElement), + local_name!("th") => make!(HTMLTableHeaderCellElement), // https://html.spec.whatwg.org/multipage/#the-thead-element:concept-element-dom - local_name!("thead") => make!(HTMLTableSectionElement), - local_name!("time") => make!(HTMLTimeElement), - local_name!("title") => make!(HTMLTitleElement), - local_name!("tr") => make!(HTMLTableRowElement), - local_name!("tt") => make!(HTMLElement), - local_name!("track") => make!(HTMLTrackElement), - local_name!("u") => make!(HTMLElement), - local_name!("ul") => make!(HTMLUListElement), - local_name!("var") => make!(HTMLElement), - local_name!("video") => make!(HTMLVideoElement), - local_name!("wbr") => make!(HTMLElement), - local_name!("xmp") => make!(HTMLPreElement), + local_name!("thead") => make!(HTMLTableSectionElement), + local_name!("time") => make!(HTMLTimeElement), + local_name!("title") => make!(HTMLTitleElement), + local_name!("tr") => make!(HTMLTableRowElement), + local_name!("tt") => make!(HTMLElement), + local_name!("track") => make!(HTMLTrackElement), + local_name!("u") => make!(HTMLElement), + local_name!("ul") => make!(HTMLUListElement), + local_name!("var") => make!(HTMLElement), + local_name!("video") => make!(HTMLVideoElement), + local_name!("wbr") => make!(HTMLElement), + local_name!("xmp") => make!(HTMLPreElement), _ if is_valid_custom_element_name(&*name.local) => make!(HTMLElement), - _ => make!(HTMLUnknownElement), + _ => make!(HTMLUnknownElement), } } -pub fn create_element(name: QualName, - is: Option, - document: &Document, - creator: ElementCreator, - mode: CustomElementCreationMode) - -> DomRoot { +pub fn create_element( + name: QualName, + is: Option, + document: &Document, + creator: ElementCreator, + mode: CustomElementCreationMode, +) -> DomRoot { let prefix = name.prefix.clone(); match name.ns { - ns!(html) => create_html_element(name, prefix, is, document, creator, mode), - ns!(svg) => create_svg_element(name, prefix, document), - _ => Element::new(name.local, name.ns, prefix, document) + ns!(html) => create_html_element(name, prefix, is, document, creator, mode), + ns!(svg) => create_svg_element(name, prefix, document), + _ => Element::new(name.local, name.ns, prefix, document), } } -- cgit v1.2.3 From 9b74f0af2451afbbe05915d1f85845296f3577e0 Mon Sep 17 00:00:00 2001 From: Simon Pieters Date: Tue, 2 Oct 2018 19:13:53 +0200 Subject: Remove the HTMLTable{Header,Data}CellElement interfaces Fixes #17222. --- components/script/dom/create.rs | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'components/script/dom/create.rs') diff --git a/components/script/dom/create.rs b/components/script/dom/create.rs index 94fe6bd1457..e1949ccc559 100644 --- a/components/script/dom/create.rs +++ b/components/script/dom/create.rs @@ -64,10 +64,9 @@ use dom::htmlsourceelement::HTMLSourceElement; use dom::htmlspanelement::HTMLSpanElement; use dom::htmlstyleelement::HTMLStyleElement; use dom::htmltablecaptionelement::HTMLTableCaptionElement; +use dom::htmltablecellelement::HTMLTableCellElement; use dom::htmltablecolelement::HTMLTableColElement; -use dom::htmltabledatacellelement::HTMLTableDataCellElement; use dom::htmltableelement::HTMLTableElement; -use dom::htmltableheadercellelement::HTMLTableHeaderCellElement; use dom::htmltablerowelement::HTMLTableRowElement; use dom::htmltablesectionelement::HTMLTableSectionElement; use dom::htmltemplateelement::HTMLTemplateElement; @@ -346,12 +345,12 @@ pub fn create_native_html_element( local_name!("sup") => make!(HTMLElement), local_name!("table") => make!(HTMLTableElement), local_name!("tbody") => make!(HTMLTableSectionElement), - local_name!("td") => make!(HTMLTableDataCellElement), + local_name!("td") => make!(HTMLTableCellElement), local_name!("template") => make!(HTMLTemplateElement), local_name!("textarea") => make!(HTMLTextAreaElement), // https://html.spec.whatwg.org/multipage/#the-tfoot-element:concept-element-dom local_name!("tfoot") => make!(HTMLTableSectionElement), - local_name!("th") => make!(HTMLTableHeaderCellElement), + local_name!("th") => make!(HTMLTableCellElement), // https://html.spec.whatwg.org/multipage/#the-thead-element:concept-element-dom local_name!("thead") => make!(HTMLTableSectionElement), local_name!("time") => make!(HTMLTimeElement), -- cgit v1.2.3 From 45f7199eee82c66637ec68287eafa40a651001c4 Mon Sep 17 00:00:00 2001 From: Simon Sapin Date: Thu, 1 Nov 2018 23:45:06 +0100 Subject: `cargo fix --edition` --- components/script/dom/create.rs | 154 ++++++++++++++++++++-------------------- 1 file changed, 77 insertions(+), 77 deletions(-) (limited to 'components/script/dom/create.rs') diff --git a/components/script/dom/create.rs b/components/script/dom/create.rs index e1949ccc559..b8afe815b8e 100644 --- a/components/script/dom/create.rs +++ b/components/script/dom/create.rs @@ -2,85 +2,85 @@ * 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::{report_pending_exception, throw_dom_exception}; -use dom::bindings::reflector::DomObject; -use dom::bindings::root::DomRoot; -use dom::customelementregistry::{is_valid_custom_element_name, upgrade_element}; -use dom::document::Document; -use dom::element::{CustomElementCreationMode, CustomElementState, Element, ElementCreator}; -use dom::globalscope::GlobalScope; -use dom::htmlanchorelement::HTMLAnchorElement; -use dom::htmlareaelement::HTMLAreaElement; -use dom::htmlaudioelement::HTMLAudioElement; -use dom::htmlbaseelement::HTMLBaseElement; -use dom::htmlbodyelement::HTMLBodyElement; -use dom::htmlbrelement::HTMLBRElement; -use dom::htmlbuttonelement::HTMLButtonElement; -use dom::htmlcanvaselement::HTMLCanvasElement; -use dom::htmldataelement::HTMLDataElement; -use dom::htmldatalistelement::HTMLDataListElement; -use dom::htmldetailselement::HTMLDetailsElement; -use dom::htmldialogelement::HTMLDialogElement; -use dom::htmldirectoryelement::HTMLDirectoryElement; -use dom::htmldivelement::HTMLDivElement; -use dom::htmldlistelement::HTMLDListElement; -use dom::htmlelement::HTMLElement; -use dom::htmlembedelement::HTMLEmbedElement; -use dom::htmlfieldsetelement::HTMLFieldSetElement; -use dom::htmlfontelement::HTMLFontElement; -use dom::htmlformelement::HTMLFormElement; -use dom::htmlframeelement::HTMLFrameElement; -use dom::htmlframesetelement::HTMLFrameSetElement; -use dom::htmlheadelement::HTMLHeadElement; -use dom::htmlheadingelement::HTMLHeadingElement; -use dom::htmlheadingelement::HeadingLevel; -use dom::htmlhrelement::HTMLHRElement; -use dom::htmlhtmlelement::HTMLHtmlElement; -use dom::htmliframeelement::HTMLIFrameElement; -use dom::htmlimageelement::HTMLImageElement; -use dom::htmlinputelement::HTMLInputElement; -use dom::htmllabelelement::HTMLLabelElement; -use dom::htmllegendelement::HTMLLegendElement; -use dom::htmllielement::HTMLLIElement; -use dom::htmllinkelement::HTMLLinkElement; -use dom::htmlmapelement::HTMLMapElement; -use dom::htmlmetaelement::HTMLMetaElement; -use dom::htmlmeterelement::HTMLMeterElement; -use dom::htmlmodelement::HTMLModElement; -use dom::htmlobjectelement::HTMLObjectElement; -use dom::htmlolistelement::HTMLOListElement; -use dom::htmloptgroupelement::HTMLOptGroupElement; -use dom::htmloptionelement::HTMLOptionElement; -use dom::htmloutputelement::HTMLOutputElement; -use dom::htmlparagraphelement::HTMLParagraphElement; -use dom::htmlparamelement::HTMLParamElement; -use dom::htmlpictureelement::HTMLPictureElement; -use dom::htmlpreelement::HTMLPreElement; -use dom::htmlprogresselement::HTMLProgressElement; -use dom::htmlquoteelement::HTMLQuoteElement; -use dom::htmlscriptelement::HTMLScriptElement; -use dom::htmlselectelement::HTMLSelectElement; -use dom::htmlsourceelement::HTMLSourceElement; -use dom::htmlspanelement::HTMLSpanElement; -use dom::htmlstyleelement::HTMLStyleElement; -use dom::htmltablecaptionelement::HTMLTableCaptionElement; -use dom::htmltablecellelement::HTMLTableCellElement; -use dom::htmltablecolelement::HTMLTableColElement; -use dom::htmltableelement::HTMLTableElement; -use dom::htmltablerowelement::HTMLTableRowElement; -use dom::htmltablesectionelement::HTMLTableSectionElement; -use dom::htmltemplateelement::HTMLTemplateElement; -use dom::htmltextareaelement::HTMLTextAreaElement; -use dom::htmltimeelement::HTMLTimeElement; -use dom::htmltitleelement::HTMLTitleElement; -use dom::htmltrackelement::HTMLTrackElement; -use dom::htmlulistelement::HTMLUListElement; -use dom::htmlunknownelement::HTMLUnknownElement; -use dom::htmlvideoelement::HTMLVideoElement; -use dom::svgsvgelement::SVGSVGElement; +use crate::dom::bindings::error::{report_pending_exception, throw_dom_exception}; +use crate::dom::bindings::reflector::DomObject; +use crate::dom::bindings::root::DomRoot; +use crate::dom::customelementregistry::{is_valid_custom_element_name, upgrade_element}; +use crate::dom::document::Document; +use crate::dom::element::{CustomElementCreationMode, CustomElementState, Element, ElementCreator}; +use crate::dom::globalscope::GlobalScope; +use crate::dom::htmlanchorelement::HTMLAnchorElement; +use crate::dom::htmlareaelement::HTMLAreaElement; +use crate::dom::htmlaudioelement::HTMLAudioElement; +use crate::dom::htmlbaseelement::HTMLBaseElement; +use crate::dom::htmlbodyelement::HTMLBodyElement; +use crate::dom::htmlbrelement::HTMLBRElement; +use crate::dom::htmlbuttonelement::HTMLButtonElement; +use crate::dom::htmlcanvaselement::HTMLCanvasElement; +use crate::dom::htmldataelement::HTMLDataElement; +use crate::dom::htmldatalistelement::HTMLDataListElement; +use crate::dom::htmldetailselement::HTMLDetailsElement; +use crate::dom::htmldialogelement::HTMLDialogElement; +use crate::dom::htmldirectoryelement::HTMLDirectoryElement; +use crate::dom::htmldivelement::HTMLDivElement; +use crate::dom::htmldlistelement::HTMLDListElement; +use crate::dom::htmlelement::HTMLElement; +use crate::dom::htmlembedelement::HTMLEmbedElement; +use crate::dom::htmlfieldsetelement::HTMLFieldSetElement; +use crate::dom::htmlfontelement::HTMLFontElement; +use crate::dom::htmlformelement::HTMLFormElement; +use crate::dom::htmlframeelement::HTMLFrameElement; +use crate::dom::htmlframesetelement::HTMLFrameSetElement; +use crate::dom::htmlheadelement::HTMLHeadElement; +use crate::dom::htmlheadingelement::HTMLHeadingElement; +use crate::dom::htmlheadingelement::HeadingLevel; +use crate::dom::htmlhrelement::HTMLHRElement; +use crate::dom::htmlhtmlelement::HTMLHtmlElement; +use crate::dom::htmliframeelement::HTMLIFrameElement; +use crate::dom::htmlimageelement::HTMLImageElement; +use crate::dom::htmlinputelement::HTMLInputElement; +use crate::dom::htmllabelelement::HTMLLabelElement; +use crate::dom::htmllegendelement::HTMLLegendElement; +use crate::dom::htmllielement::HTMLLIElement; +use crate::dom::htmllinkelement::HTMLLinkElement; +use crate::dom::htmlmapelement::HTMLMapElement; +use crate::dom::htmlmetaelement::HTMLMetaElement; +use crate::dom::htmlmeterelement::HTMLMeterElement; +use crate::dom::htmlmodelement::HTMLModElement; +use crate::dom::htmlobjectelement::HTMLObjectElement; +use crate::dom::htmlolistelement::HTMLOListElement; +use crate::dom::htmloptgroupelement::HTMLOptGroupElement; +use crate::dom::htmloptionelement::HTMLOptionElement; +use crate::dom::htmloutputelement::HTMLOutputElement; +use crate::dom::htmlparagraphelement::HTMLParagraphElement; +use crate::dom::htmlparamelement::HTMLParamElement; +use crate::dom::htmlpictureelement::HTMLPictureElement; +use crate::dom::htmlpreelement::HTMLPreElement; +use crate::dom::htmlprogresselement::HTMLProgressElement; +use crate::dom::htmlquoteelement::HTMLQuoteElement; +use crate::dom::htmlscriptelement::HTMLScriptElement; +use crate::dom::htmlselectelement::HTMLSelectElement; +use crate::dom::htmlsourceelement::HTMLSourceElement; +use crate::dom::htmlspanelement::HTMLSpanElement; +use crate::dom::htmlstyleelement::HTMLStyleElement; +use crate::dom::htmltablecaptionelement::HTMLTableCaptionElement; +use crate::dom::htmltablecellelement::HTMLTableCellElement; +use crate::dom::htmltablecolelement::HTMLTableColElement; +use crate::dom::htmltableelement::HTMLTableElement; +use crate::dom::htmltablerowelement::HTMLTableRowElement; +use crate::dom::htmltablesectionelement::HTMLTableSectionElement; +use crate::dom::htmltemplateelement::HTMLTemplateElement; +use crate::dom::htmltextareaelement::HTMLTextAreaElement; +use crate::dom::htmltimeelement::HTMLTimeElement; +use crate::dom::htmltitleelement::HTMLTitleElement; +use crate::dom::htmltrackelement::HTMLTrackElement; +use crate::dom::htmlulistelement::HTMLUListElement; +use crate::dom::htmlunknownelement::HTMLUnknownElement; +use crate::dom::htmlvideoelement::HTMLVideoElement; +use crate::dom::svgsvgelement::SVGSVGElement; use html5ever::{LocalName, Prefix, QualName}; use js::jsapi::JSAutoCompartment; -use script_thread::ScriptThread; +use crate::script_thread::ScriptThread; use servo_config::prefs::PREFS; fn create_svg_element( -- cgit v1.2.3 From 76e59a46d3aff701b2e8dfbaf047f6d5c3edcced Mon Sep 17 00:00:00 2001 From: Simon Sapin Date: Thu, 1 Nov 2018 17:23:56 +0100 Subject: Sort `use` statements --- components/script/dom/create.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'components/script/dom/create.rs') diff --git a/components/script/dom/create.rs b/components/script/dom/create.rs index b8afe815b8e..00526a9e59f 100644 --- a/components/script/dom/create.rs +++ b/components/script/dom/create.rs @@ -78,9 +78,9 @@ use crate::dom::htmlulistelement::HTMLUListElement; use crate::dom::htmlunknownelement::HTMLUnknownElement; use crate::dom::htmlvideoelement::HTMLVideoElement; use crate::dom::svgsvgelement::SVGSVGElement; +use crate::script_thread::ScriptThread; use html5ever::{LocalName, Prefix, QualName}; use js::jsapi::JSAutoCompartment; -use crate::script_thread::ScriptThread; use servo_config::prefs::PREFS; fn create_svg_element( -- cgit v1.2.3 From a1a14459c141afc6ac6771b8a6c9ca374537edf2 Mon Sep 17 00:00:00 2001 From: Jan Andre Ikenmeyer Date: Mon, 19 Nov 2018 14:47:12 +0100 Subject: Update MPL license to https (part 3) --- components/script/dom/create.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'components/script/dom/create.rs') diff --git a/components/script/dom/create.rs b/components/script/dom/create.rs index 00526a9e59f..ae830843406 100644 --- a/components/script/dom/create.rs +++ b/components/script/dom/create.rs @@ -1,6 +1,6 @@ /* 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/. */ + * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ use crate::dom::bindings::error::{report_pending_exception, throw_dom_exception}; use crate::dom::bindings::reflector::DomObject; -- cgit v1.2.3 From 8bfd4dc1e2f9c71ff3d1f9964565c43a6ae02278 Mon Sep 17 00:00:00 2001 From: Peter Hall Date: Thu, 14 Feb 2019 12:53:59 +0000 Subject: #8539 Config preferences backend restructure --- components/script/dom/create.rs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'components/script/dom/create.rs') diff --git a/components/script/dom/create.rs b/components/script/dom/create.rs index ae830843406..461e37a28de 100644 --- a/components/script/dom/create.rs +++ b/components/script/dom/create.rs @@ -81,7 +81,7 @@ use crate::dom::svgsvgelement::SVGSVGElement; use crate::script_thread::ScriptThread; use html5ever::{LocalName, Prefix, QualName}; use js::jsapi::JSAutoCompartment; -use servo_config::prefs::PREFS; +use servo_config::pref; fn create_svg_element( name: QualName, @@ -101,7 +101,7 @@ fn create_svg_element( }) ); - if !PREFS.get("dom.svg.enabled").as_boolean().unwrap_or(false) { + if !pref!(dom.svg.enabled) { return Element::new(name.local, name.ns, prefix, document); } -- cgit v1.2.3 From c75da615bdf2cd850859253768bf79a7c4050d0b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fernando=20Jim=C3=A9nez=20Moreno?= Date: Wed, 6 Mar 2019 16:34:16 +0100 Subject: Add custom elements related stuff into ElementRareData --- components/script/dom/create.rs | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'components/script/dom/create.rs') diff --git a/components/script/dom/create.rs b/components/script/dom/create.rs index 461e37a28de..6ffb38f753a 100644 --- a/components/script/dom/create.rs +++ b/components/script/dom/create.rs @@ -5,9 +5,11 @@ use crate::dom::bindings::error::{report_pending_exception, throw_dom_exception}; use crate::dom::bindings::reflector::DomObject; use crate::dom::bindings::root::DomRoot; -use crate::dom::customelementregistry::{is_valid_custom_element_name, upgrade_element}; +use crate::dom::customelementregistry::{ + is_valid_custom_element_name, upgrade_element, CustomElementState, +}; use crate::dom::document::Document; -use crate::dom::element::{CustomElementCreationMode, CustomElementState, Element, ElementCreator}; +use crate::dom::element::{CustomElementCreationMode, Element, ElementCreator}; use crate::dom::globalscope::GlobalScope; use crate::dom::htmlanchorelement::HTMLAnchorElement; use crate::dom::htmlareaelement::HTMLAreaElement; -- cgit v1.2.3 From 4328713f71d5bc389ecd47e78bfe9b8087b8c104 Mon Sep 17 00:00:00 2001 From: Josh Matthews Date: Mon, 6 May 2019 11:38:34 -0400 Subject: Update to SpiderMonkey 66. --- components/script/dom/create.rs | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) (limited to 'components/script/dom/create.rs') diff --git a/components/script/dom/create.rs b/components/script/dom/create.rs index 6ffb38f753a..5ca05d2f713 100644 --- a/components/script/dom/create.rs +++ b/components/script/dom/create.rs @@ -82,7 +82,7 @@ use crate::dom::htmlvideoelement::HTMLVideoElement; use crate::dom::svgsvgelement::SVGSVGElement; use crate::script_thread::ScriptThread; use html5ever::{LocalName, Prefix, QualName}; -use js::jsapi::JSAutoCompartment; +use js::jsapi::JSAutoRealm; use servo_config::pref; fn create_svg_element( @@ -156,10 +156,8 @@ fn create_html_element( // Step 6.1.1 unsafe { - let _ac = JSAutoCompartment::new( - cx, - global.reflector().get_jsobject().get(), - ); + let _ac = + JSAutoRealm::new(cx, global.reflector().get_jsobject().get()); throw_dom_exception(cx, &global, error); report_pending_exception(cx, true); } -- cgit v1.2.3 From 88cacfb0098e20be70c27bfde6b74cd3290f1fe4 Mon Sep 17 00:00:00 2001 From: marmeladema Date: Mon, 22 Jul 2019 22:14:11 +0100 Subject: Modify *::get_cx methods to return a safe JSContext instead of a raw one --- components/script/dom/create.rs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'components/script/dom/create.rs') diff --git a/components/script/dom/create.rs b/components/script/dom/create.rs index 5ca05d2f713..18c9504a245 100644 --- a/components/script/dom/create.rs +++ b/components/script/dom/create.rs @@ -157,9 +157,9 @@ fn create_html_element( // Step 6.1.1 unsafe { let _ac = - JSAutoRealm::new(cx, global.reflector().get_jsobject().get()); - throw_dom_exception(cx, &global, error); - report_pending_exception(cx, true); + JSAutoRealm::new(*cx, global.reflector().get_jsobject().get()); + throw_dom_exception(*cx, &global, error); + report_pending_exception(*cx, true); } // Step 6.1.2 -- cgit v1.2.3 From 0703a1ad6d736796d467f5a028e5ab3c6d876268 Mon Sep 17 00:00:00 2001 From: marmeladema Date: Sat, 27 Jul 2019 19:36:21 +0100 Subject: Use safe JSContext as first argument for throw_dom_exception --- components/script/dom/create.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'components/script/dom/create.rs') diff --git a/components/script/dom/create.rs b/components/script/dom/create.rs index 18c9504a245..e992a8707dd 100644 --- a/components/script/dom/create.rs +++ b/components/script/dom/create.rs @@ -158,7 +158,7 @@ fn create_html_element( unsafe { let _ac = JSAutoRealm::new(*cx, global.reflector().get_jsobject().get()); - throw_dom_exception(*cx, &global, error); + throw_dom_exception(cx, &global, error); report_pending_exception(*cx, true); } -- cgit v1.2.3 From 14d278ff1ce87bb628850729ee1e46894290e8bf Mon Sep 17 00:00:00 2001 From: Patrick Shaughnessy Date: Sun, 22 Dec 2019 20:46:31 -0500 Subject: apply is: to Document.createElement even when name isn't registered yet --- components/script/dom/create.rs | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) (limited to 'components/script/dom/create.rs') diff --git a/components/script/dom/create.rs b/components/script/dom/create.rs index e992a8707dd..c45e4286992 100644 --- a/components/script/dom/create.rs +++ b/components/script/dom/create.rs @@ -189,14 +189,21 @@ fn create_html_element( } } - // Steps 7.1-7.2 + // Steps 7.1-7.3 let result = create_native_html_element(name.clone(), prefix, document, creator); + match is { + Some(is) => { + result.set_is(is); + result.set_custom_element_state(CustomElementState::Undefined); + }, + None => { + if is_valid_custom_element_name(&*name.local) { + result.set_custom_element_state(CustomElementState::Undefined); + } + }, + }; - // Step 7.3 - if is_valid_custom_element_name(&*name.local) || is.is_some() { - result.set_custom_element_state(CustomElementState::Undefined); - } - + // Step 8 result } -- cgit v1.2.3 From c1a23a85b2a4f0e53d2d58de64adfee4be7fb30b Mon Sep 17 00:00:00 2001 From: Patrick Shaughnessy Date: Wed, 22 Jan 2020 20:15:42 -0500 Subject: Implement HTMLMenuElement --- components/script/dom/create.rs | 2 ++ 1 file changed, 2 insertions(+) (limited to 'components/script/dom/create.rs') diff --git a/components/script/dom/create.rs b/components/script/dom/create.rs index c45e4286992..d67550ee47f 100644 --- a/components/script/dom/create.rs +++ b/components/script/dom/create.rs @@ -46,6 +46,7 @@ use crate::dom::htmllegendelement::HTMLLegendElement; use crate::dom::htmllielement::HTMLLIElement; use crate::dom::htmllinkelement::HTMLLinkElement; use crate::dom::htmlmapelement::HTMLMapElement; +use crate::dom::htmlmenuelement::HTMLMenuElement; use crate::dom::htmlmetaelement::HTMLMetaElement; use crate::dom::htmlmeterelement::HTMLMeterElement; use crate::dom::htmlmodelement::HTMLModElement; @@ -309,6 +310,7 @@ pub fn create_native_html_element( local_name!("map") => make!(HTMLMapElement), local_name!("mark") => make!(HTMLElement), local_name!("marquee") => make!(HTMLElement), + local_name!("menu") => make!(HTMLMenuElement), local_name!("meta") => make!(HTMLMetaElement), local_name!("meter") => make!(HTMLMeterElement), // https://html.spec.whatwg.org/multipage/#other-elements,-attributes-and-apis:multicol -- cgit v1.2.3 From 8ca4db2cd64344c874016f110922cefd9e4ebb58 Mon Sep 17 00:00:00 2001 From: Patrick Shaughnessy Date: Mon, 27 Jan 2020 21:00:34 -0500 Subject: :defined works --- components/script/dom/create.rs | 2 ++ 1 file changed, 2 insertions(+) (limited to 'components/script/dom/create.rs') diff --git a/components/script/dom/create.rs b/components/script/dom/create.rs index d67550ee47f..f68a680483d 100644 --- a/components/script/dom/create.rs +++ b/components/script/dom/create.rs @@ -200,6 +200,8 @@ fn create_html_element( None => { if is_valid_custom_element_name(&*name.local) { result.set_custom_element_state(CustomElementState::Undefined); + } else { + result.set_custom_element_state(CustomElementState::Uncustomized); } }, }; -- cgit v1.2.3 From 403ffcf1eb5c659626f70dec72f76aaf7782986d Mon Sep 17 00:00:00 2001 From: CYBAI Date: Fri, 24 Jan 2020 12:43:49 +0900 Subject: Always pass InRealm to GlobalScope::from_context to avoid getting null global --- components/script/dom/create.rs | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'components/script/dom/create.rs') diff --git a/components/script/dom/create.rs b/components/script/dom/create.rs index f68a680483d..62484c6f861 100644 --- a/components/script/dom/create.rs +++ b/components/script/dom/create.rs @@ -81,9 +81,9 @@ use crate::dom::htmlulistelement::HTMLUListElement; use crate::dom::htmlunknownelement::HTMLUnknownElement; use crate::dom::htmlvideoelement::HTMLVideoElement; use crate::dom::svgsvgelement::SVGSVGElement; +use crate::realms::{enter_realm, InRealm}; use crate::script_thread::ScriptThread; use html5ever::{LocalName, Prefix, QualName}; -use js::jsapi::JSAutoRealm; use servo_config::pref; fn create_svg_element( @@ -157,10 +157,9 @@ fn create_html_element( // Step 6.1.1 unsafe { - let _ac = - JSAutoRealm::new(*cx, global.reflector().get_jsobject().get()); + let ar = enter_realm(&*global); throw_dom_exception(cx, &global, error); - report_pending_exception(*cx, true); + report_pending_exception(*cx, true, InRealm::Entered(&ar)); } // Step 6.1.2 -- cgit v1.2.3 From c561a3eb0e72a4d20f23eef2d61549284e6dd237 Mon Sep 17 00:00:00 2001 From: CYBAI Date: Thu, 4 Jun 2020 21:37:29 +0900 Subject: Introduce ElementCSSInlineStyle for SVGElement --- components/script/dom/create.rs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'components/script/dom/create.rs') diff --git a/components/script/dom/create.rs b/components/script/dom/create.rs index 62484c6f861..37aaf07286f 100644 --- a/components/script/dom/create.rs +++ b/components/script/dom/create.rs @@ -80,6 +80,7 @@ use crate::dom::htmltrackelement::HTMLTrackElement; use crate::dom::htmlulistelement::HTMLUListElement; use crate::dom::htmlunknownelement::HTMLUnknownElement; use crate::dom::htmlvideoelement::HTMLVideoElement; +use crate::dom::svgelement::SVGElement; use crate::dom::svgsvgelement::SVGSVGElement; use crate::realms::{enter_realm, InRealm}; use crate::script_thread::ScriptThread; @@ -110,7 +111,7 @@ fn create_svg_element( match name.local { local_name!("svg") => make!(SVGSVGElement), - _ => Element::new(name.local, name.ns, prefix, document), + _ => make!(SVGElement), } } -- cgit v1.2.3