diff --git a/components/script/dom/htmlanchorelement.rs b/components/script/dom/htmlanchorelement.rs
index af019fb88c5..a5e9fb10947 100644
--- a/components/script/dom/htmlanchorelement.rs
+++ b/components/script/dom/htmlanchorelement.rs
@@ -6,7 +6,7 @@ use std::cell::Cell;
use std::default::Default;
use dom_struct::dom_struct;
-use html5ever::{local_name, namespace_url, ns, LocalName, Prefix};
+use html5ever::{local_name, LocalName, Prefix};
use js::rust::HandleObject;
use num_traits::ToPrimitive;
use servo_atoms::Atom;
@@ -28,10 +28,10 @@ use crate::dom::element::{reflect_referrer_policy_attribute, AttributeMutation,
use crate::dom::event::Event;
use crate::dom::eventtarget::EventTarget;
use crate::dom::htmlelement::HTMLElement;
+use crate::dom::htmlhyperlinkelementutils::{HyperlinkElement, HyperlinkElementTraits};
use crate::dom::htmlimageelement::HTMLImageElement;
use crate::dom::mouseevent::MouseEvent;
-use crate::dom::node::{BindContext, Node, NodeTraits};
-use crate::dom::urlhelper::UrlHelper;
+use crate::dom::node::{BindContext, Node};
use crate::dom::virtualmethods::VirtualMethods;
use crate::links::{follow_hyperlink, LinkRelations};
use crate::script_runtime::CanGc;
@@ -40,7 +40,6 @@ use crate::script_runtime::CanGc;
pub(crate) struct HTMLAnchorElement {
htmlelement: HTMLElement,
rel_list: MutNullableDom,
-
#[no_trace]
relations: Cell,
#[no_trace]
@@ -78,48 +77,11 @@ impl HTMLAnchorElement {
can_gc,
)
}
+}
- ///
- fn set_url(&self) {
- // Step 1. Set this element's url to null.
- *self.url.borrow_mut() = None;
-
- // Step 2. If this element's href content attribute is absent, then return.
- let attribute = self
- .upcast::()
- .get_attribute(&ns!(), &local_name!("href"));
-
- let Some(attribute) = attribute else {
- return;
- };
-
- // Step 3. Let url be the result of encoding-parsing a URL given this element's
- // href content attribute's value, relative to this element's node document.
- let document = self.owner_document();
- let url = document.encoding_parse_a_url(&attribute.value());
-
- // Step 4. If url is not failure, then set this element's url to url.
- if let Ok(url) = url {
- *self.url.borrow_mut() = Some(url);
- }
- }
-
- // https://html.spec.whatwg.org/multipage/#reinitialise-url
- fn reinitialize_url(&self) {
- // Step 1.
- match *self.url.borrow() {
- Some(ref url) if url.scheme() == "blob" && url.cannot_be_a_base() => return,
- _ => (),
- }
-
- // Step 2.
- self.set_url();
- }
-
- // https://html.spec.whatwg.org/multipage/#update-href
- fn update_href(&self, url: DOMString, can_gc: CanGc) {
- self.upcast::()
- .set_string_attribute(&local_name!("href"), url, can_gc);
+impl HyperlinkElement for HTMLAnchorElement {
+ fn get_url(&self) -> &DomRefCell> {
+ &self.url
}
}
@@ -225,362 +187,109 @@ impl HTMLAnchorElementMethods for HTMLAnchorElement {
// https://html.spec.whatwg.org/multipage/#attr-hyperlink-target
make_setter!(SetTarget, "target");
- // https://html.spec.whatwg.org/multipage/#dom-hyperlink-hash
- fn Hash(&self) -> USVString {
- // Step 1.
- self.reinitialize_url();
-
- match *self.url.borrow() {
- // Step 3.
- None => USVString(String::new()),
- Some(ref url) => {
- // Steps 3-4.
- UrlHelper::Hash(url)
- },
- }
- }
-
- // https://html.spec.whatwg.org/multipage/#dom-hyperlink-hash
- fn SetHash(&self, value: USVString, can_gc: CanGc) {
- // Step 1.
- self.reinitialize_url();
-
- // Step 2.
- let url = match self.url.borrow_mut().as_mut() {
- // Step 3.
- Some(ref url) if url.scheme() == "javascript" => return,
- None => return,
- // Steps 4-5.
- Some(url) => {
- UrlHelper::SetHash(url, value);
- DOMString::from(url.as_str())
- },
- };
- // Step 6.
- self.update_href(url, can_gc);
- }
-
- // https://html.spec.whatwg.org/multipage/#dom-hyperlink-host
- fn Host(&self) -> USVString {
- // Step 1.
- self.reinitialize_url();
-
- match *self.url.borrow() {
- // Step 3.
- None => USVString(String::new()),
- Some(ref url) => {
- if url.host().is_none() {
- USVString(String::new())
- } else {
- // Steps 4-5.
- UrlHelper::Host(url)
- }
- },
- }
- }
-
- // https://html.spec.whatwg.org/multipage/#dom-hyperlink-host
- fn SetHost(&self, value: USVString, can_gc: CanGc) {
- // Step 1.
- self.reinitialize_url();
-
- // Step 2.
- let url = match self.url.borrow_mut().as_mut() {
- // Step 3.
- Some(ref url) if url.cannot_be_a_base() => return,
- None => return,
- // Step 4.
- Some(url) => {
- UrlHelper::SetHost(url, value);
- DOMString::from(url.as_str())
- },
- };
- // Step 5.
- self.update_href(url, can_gc);
- }
-
- // https://html.spec.whatwg.org/multipage/#dom-hyperlink-hostname
- fn Hostname(&self) -> USVString {
- // Step 1.
- self.reinitialize_url();
-
- match *self.url.borrow() {
- // Step 3.
- None => USVString(String::new()),
- Some(ref url) => {
- // Step 4.
- UrlHelper::Hostname(url)
- },
- }
- }
-
- // https://html.spec.whatwg.org/multipage/#dom-hyperlink-hostname
- fn SetHostname(&self, value: USVString, can_gc: CanGc) {
- // Step 1.
- self.reinitialize_url();
-
- // Step 2.
- let url = match self.url.borrow_mut().as_mut() {
- // Step 3.
- Some(ref url) if url.cannot_be_a_base() => return,
- None => return,
- // Step 4.
- Some(url) => {
- UrlHelper::SetHostname(url, value);
- DOMString::from(url.as_str())
- },
- };
- // Step 5.
- self.update_href(url, can_gc);
- }
-
- // https://html.spec.whatwg.org/multipage/#dom-hyperlink-href
+ ///
fn Href(&self) -> USVString {
- // Step 1.
- self.reinitialize_url();
-
- USVString(match *self.url.borrow() {
- None => {
- match self
- .upcast::()
- .get_attribute(&ns!(), &local_name!("href"))
- {
- // Step 3.
- None => String::new(),
- // Step 4.
- Some(attribute) => (**attribute.value()).to_owned(),
- }
- },
- // Step 5.
- Some(ref url) => url.as_str().to_owned(),
- })
+ self.get_href()
}
- // https://html.spec.whatwg.org/multipage/#dom-hyperlink-href
+ ///
fn SetHref(&self, value: USVString, can_gc: CanGc) {
- self.upcast::().set_string_attribute(
- &local_name!("href"),
- DOMString::from_string(value.0),
- can_gc,
- );
- self.set_url();
+ self.set_href(value, can_gc);
}
- // https://html.spec.whatwg.org/multipage/#dom-hyperlink-origin
+ ///
fn Origin(&self) -> USVString {
- // Step 1.
- self.reinitialize_url();
-
- USVString(match *self.url.borrow() {
- None => {
- // Step 2.
- "".to_owned()
- },
- Some(ref url) => {
- // Step 3.
- url.origin().ascii_serialization()
- },
- })
+ self.get_origin()
}
- // https://html.spec.whatwg.org/multipage/#dom-hyperlink-password
- fn Password(&self) -> USVString {
- // Step 1.
- self.reinitialize_url();
-
- match *self.url.borrow() {
- // Step 3.
- None => USVString(String::new()),
- // Steps 3-4.
- Some(ref url) => UrlHelper::Password(url),
- }
- }
-
- // https://html.spec.whatwg.org/multipage/#dom-hyperlink-password
- fn SetPassword(&self, value: USVString, can_gc: CanGc) {
- // Step 1.
- self.reinitialize_url();
-
- // Step 2.
- let url = match self.url.borrow_mut().as_mut() {
- // Step 3.
- Some(ref url) if url.host().is_none() || url.cannot_be_a_base() => return,
- None => return,
- // Step 4.
- Some(url) => {
- UrlHelper::SetPassword(url, value);
- DOMString::from(url.as_str())
- },
- };
- // Step 5.
- self.update_href(url, can_gc);
- }
-
- // https://html.spec.whatwg.org/multipage/#dom-hyperlink-pathname
- fn Pathname(&self) -> USVString {
- // Step 1.
- self.reinitialize_url();
-
- match *self.url.borrow() {
- // Step 3.
- None => USVString(String::new()),
- // Steps 4-5.
- Some(ref url) => UrlHelper::Pathname(url),
- }
- }
-
- // https://html.spec.whatwg.org/multipage/#dom-hyperlink-pathname
- fn SetPathname(&self, value: USVString, can_gc: CanGc) {
- // Step 1.
- self.reinitialize_url();
-
- // Step 2.
- let url = match self.url.borrow_mut().as_mut() {
- // Step 3.
- Some(ref url) if url.cannot_be_a_base() => return,
- None => return,
- // Step 5.
- Some(url) => {
- UrlHelper::SetPathname(url, value);
- DOMString::from(url.as_str())
- },
- };
- // Step 6.
- self.update_href(url, can_gc);
- }
-
- // https://html.spec.whatwg.org/multipage/#dom-hyperlink-port
- fn Port(&self) -> USVString {
- // Step 1.
- self.reinitialize_url();
-
- match *self.url.borrow() {
- // Step 3.
- None => USVString(String::new()),
- // Step 4.
- Some(ref url) => UrlHelper::Port(url),
- }
- }
-
- // https://html.spec.whatwg.org/multipage/#dom-hyperlink-port
- fn SetPort(&self, value: USVString, can_gc: CanGc) {
- // Step 1.
- self.reinitialize_url();
-
- // Step 3.
- let url = match self.url.borrow_mut().as_mut() {
- Some(ref url)
- if url.host().is_none() || url.cannot_be_a_base() || url.scheme() == "file" =>
- {
- return;
- },
- None => return,
- // Step 4.
- Some(url) => {
- UrlHelper::SetPort(url, value);
- DOMString::from(url.as_str())
- },
- };
- // Step 5.
- self.update_href(url, can_gc);
- }
-
- // https://html.spec.whatwg.org/multipage/#dom-hyperlink-protocol
+ ///
fn Protocol(&self) -> USVString {
- // Step 1.
- self.reinitialize_url();
-
- match *self.url.borrow() {
- // Step 2.
- None => USVString(":".to_owned()),
- // Step 3.
- Some(ref url) => UrlHelper::Protocol(url),
- }
+ self.get_protocol()
}
- // https://html.spec.whatwg.org/multipage/#dom-hyperlink-protocol
+ ///
fn SetProtocol(&self, value: USVString, can_gc: CanGc) {
- // Step 1.
- self.reinitialize_url();
-
- let url = match self.url.borrow_mut().as_mut() {
- // Step 2.
- None => return,
- // Step 3.
- Some(url) => {
- UrlHelper::SetProtocol(url, value);
- DOMString::from(url.as_str())
- },
- };
- // Step 4.
- self.update_href(url, can_gc);
+ self.set_protocol(value, can_gc);
}
- // https://html.spec.whatwg.org/multipage/#dom-hyperlink-search
+ ///
+ fn Password(&self) -> USVString {
+ self.get_password()
+ }
+
+ ///
+ fn SetPassword(&self, value: USVString, can_gc: CanGc) {
+ self.set_password(value, can_gc);
+ }
+
+ ///
+ fn Hash(&self) -> USVString {
+ self.get_hash()
+ }
+
+ ///
+ fn SetHash(&self, value: USVString, can_gc: CanGc) {
+ self.set_hash(value, can_gc);
+ }
+
+ ///
+ fn Host(&self) -> USVString {
+ self.get_host()
+ }
+
+ ///
+ fn SetHost(&self, value: USVString, can_gc: CanGc) {
+ self.set_host(value, can_gc);
+ }
+
+ ///
+ fn Hostname(&self) -> USVString {
+ self.get_hostname()
+ }
+
+ ///
+ fn SetHostname(&self, value: USVString, can_gc: CanGc) {
+ self.set_hostname(value, can_gc);
+ }
+
+ ///
+ fn Port(&self) -> USVString {
+ self.get_port()
+ }
+
+ ///
+ fn SetPort(&self, value: USVString, can_gc: CanGc) {
+ self.set_port(value, can_gc);
+ }
+
+ ///
+ fn Pathname(&self) -> USVString {
+ self.get_pathname()
+ }
+
+ ///
+ fn SetPathname(&self, value: USVString, can_gc: CanGc) {
+ self.set_pathname(value, can_gc);
+ }
+
+ ///
fn Search(&self) -> USVString {
- // Step 1.
- self.reinitialize_url();
-
- match *self.url.borrow() {
- // Step 2.
- None => USVString(String::new()),
- // Step 3.
- Some(ref url) => UrlHelper::Search(url),
- }
+ self.get_search()
}
- // https://html.spec.whatwg.org/multipage/#dom-hyperlink-search
+ ///
fn SetSearch(&self, value: USVString, can_gc: CanGc) {
- // Step 1.
- self.reinitialize_url();
-
- // Step 2.
- let url = match self.url.borrow_mut().as_mut() {
- // Step 3.
- None => return,
- // Steps 4-5.
- // TODO add this element's node document character encoding as
- // encoding override (as described in the spec)
- Some(url) => {
- UrlHelper::SetSearch(url, value);
- DOMString::from(url.as_str())
- },
- };
- // Step 6.
- self.update_href(url, can_gc);
+ self.set_search(value, can_gc);
}
- // https://html.spec.whatwg.org/multipage/#dom-hyperlink-username
+ ///
fn Username(&self) -> USVString {
- // Step 1.
- self.reinitialize_url();
-
- match *self.url.borrow() {
- // Step 2.
- None => USVString(String::new()),
- // Step 3.
- Some(ref url) => UrlHelper::Username(url),
- }
+ self.get_username()
}
- // https://html.spec.whatwg.org/multipage/#dom-hyperlink-username
+ ///
fn SetUsername(&self, value: USVString, can_gc: CanGc) {
- // Step 1.
- self.reinitialize_url();
-
- // Step 2.
- let url = match self.url.borrow_mut().as_mut() {
- // Step 3.
- Some(ref url) if url.host().is_none() || url.cannot_be_a_base() => return,
- None => return,
- // Step 4.
- Some(url) => {
- UrlHelper::SetUsername(url, value);
- DOMString::from(url.as_str())
- },
- };
- // Step 5.
- self.update_href(url, can_gc);
+ self.set_username(value, can_gc);
}
// https://html.spec.whatwg.org/multipage/#dom-a-referrerpolicy
diff --git a/components/script/dom/htmlareaelement.rs b/components/script/dom/htmlareaelement.rs
index 145916281f6..342fee4d615 100644
--- a/components/script/dom/htmlareaelement.rs
+++ b/components/script/dom/htmlareaelement.rs
@@ -12,20 +12,23 @@ use euclid::default::Point2D;
use html5ever::{local_name, LocalName, Prefix};
use js::rust::HandleObject;
use servo_atoms::Atom;
+use servo_url::ServoUrl;
use style::attr::AttrValue;
use crate::dom::activation::Activatable;
use crate::dom::attr::Attr;
+use crate::dom::bindings::cell::DomRefCell;
use crate::dom::bindings::codegen::Bindings::HTMLAreaElementBinding::HTMLAreaElementMethods;
use crate::dom::bindings::inheritance::Castable;
use crate::dom::bindings::root::{DomRoot, MutNullableDom};
-use crate::dom::bindings::str::DOMString;
+use crate::dom::bindings::str::{DOMString, USVString};
use crate::dom::document::Document;
use crate::dom::domtokenlist::DOMTokenList;
use crate::dom::element::{reflect_referrer_policy_attribute, AttributeMutation, Element};
use crate::dom::event::Event;
use crate::dom::eventtarget::EventTarget;
use crate::dom::htmlelement::HTMLElement;
+use crate::dom::htmlhyperlinkelementutils::{HyperlinkElement, HyperlinkElementTraits};
use crate::dom::node::{BindContext, Node};
use crate::dom::virtualmethods::VirtualMethods;
use crate::links::{follow_hyperlink, LinkRelations};
@@ -107,7 +110,7 @@ impl Area {
index += 1;
}
- // The input does not consist any valid charecters
+ // The input does not consist any valid characters
if array.is_empty() {
break;
}
@@ -240,9 +243,10 @@ impl Area {
pub(crate) struct HTMLAreaElement {
htmlelement: HTMLElement,
rel_list: MutNullableDom,
-
#[no_trace]
relations: Cell,
+ #[no_trace]
+ url: DomRefCell>,
}
impl HTMLAreaElement {
@@ -255,6 +259,7 @@ impl HTMLAreaElement {
htmlelement: HTMLElement::new_inherited(local_name, prefix, document),
rel_list: Default::default(),
relations: Cell::new(LinkRelations::empty()),
+ url: DomRefCell::new(None),
}
}
@@ -295,6 +300,12 @@ impl HTMLAreaElement {
}
}
+impl HyperlinkElement for HTMLAreaElement {
+ fn get_url(&self) -> &DomRefCell> {
+ &self.url
+ }
+}
+
impl VirtualMethods for HTMLAreaElement {
fn super_type(&self) -> Option<&dyn VirtualMethods> {
Some(self.upcast::() as &dyn VirtualMethods)
@@ -348,7 +359,7 @@ impl HTMLAreaElementMethods for HTMLAreaElement {
.set_tokenlist_attribute(&local_name!("rel"), rel, can_gc);
}
- // https://html.spec.whatwg.org/multipage/#dom-area-rellist
+ ///
fn RelList(&self) -> DomRoot {
self.rel_list.or_init(|| {
DOMTokenList::new(
@@ -370,6 +381,111 @@ impl HTMLAreaElementMethods for HTMLAreaElement {
// https://html.spec.whatwg.org/multipage/#attr-iframe-referrerpolicy
make_setter!(SetReferrerPolicy, "referrerpolicy");
+
+ ///
+ fn Href(&self) -> USVString {
+ self.get_href()
+ }
+
+ ///
+ fn SetHref(&self, value: USVString, can_gc: CanGc) {
+ self.set_href(value, can_gc);
+ }
+
+ ///
+ fn Origin(&self) -> USVString {
+ self.get_origin()
+ }
+
+ ///
+ fn Protocol(&self) -> USVString {
+ self.get_protocol()
+ }
+
+ ///
+ fn SetProtocol(&self, value: USVString, can_gc: CanGc) {
+ self.set_protocol(value, can_gc);
+ }
+
+ ///
+ fn Password(&self) -> USVString {
+ self.get_password()
+ }
+
+ ///
+ fn SetPassword(&self, value: USVString, can_gc: CanGc) {
+ self.set_password(value, can_gc);
+ }
+
+ ///
+ fn Hash(&self) -> USVString {
+ self.get_hash()
+ }
+
+ ///
+ fn SetHash(&self, value: USVString, can_gc: CanGc) {
+ self.set_hash(value, can_gc);
+ }
+
+ ///
+ fn Host(&self) -> USVString {
+ self.get_host()
+ }
+
+ ///
+ fn SetHost(&self, value: USVString, can_gc: CanGc) {
+ self.set_host(value, can_gc);
+ }
+
+ ///
+ fn Hostname(&self) -> USVString {
+ self.get_hostname()
+ }
+
+ ///
+ fn SetHostname(&self, value: USVString, can_gc: CanGc) {
+ self.set_hostname(value, can_gc);
+ }
+
+ ///
+ fn Port(&self) -> USVString {
+ self.get_port()
+ }
+
+ ///
+ fn SetPort(&self, value: USVString, can_gc: CanGc) {
+ self.set_port(value, can_gc);
+ }
+
+ ///
+ fn Pathname(&self) -> USVString {
+ self.get_pathname()
+ }
+
+ ///
+ fn SetPathname(&self, value: USVString, can_gc: CanGc) {
+ self.set_pathname(value, can_gc);
+ }
+
+ ///
+ fn Search(&self) -> USVString {
+ self.get_search()
+ }
+
+ ///
+ fn SetSearch(&self, value: USVString, can_gc: CanGc) {
+ self.set_search(value, can_gc);
+ }
+
+ ///
+ fn Username(&self) -> USVString {
+ self.get_username()
+ }
+
+ ///
+ fn SetUsername(&self, value: USVString, can_gc: CanGc) {
+ self.set_username(value, can_gc);
+ }
}
impl Activatable for HTMLAreaElement {
diff --git a/components/script/dom/htmlhyperlinkelementutils.rs b/components/script/dom/htmlhyperlinkelementutils.rs
new file mode 100644
index 00000000000..52b16f796e5
--- /dev/null
+++ b/components/script/dom/htmlhyperlinkelementutils.rs
@@ -0,0 +1,493 @@
+/* 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 https://mozilla.org/MPL/2.0/. */
+
+use html5ever::{local_name, namespace_url, ns};
+use servo_url::ServoUrl;
+
+use crate::dom::bindings::cell::DomRefCell;
+use crate::dom::bindings::conversions::DerivedFrom;
+use crate::dom::bindings::inheritance::Castable;
+use crate::dom::bindings::str::{DOMString, USVString};
+use crate::dom::element::Element;
+use crate::dom::node::NodeTraits;
+use crate::dom::urlhelper::UrlHelper;
+use crate::script_runtime::CanGc;
+
+pub(crate) trait HyperlinkElement {
+ fn get_url(&self) -> &DomRefCell>;
+}
+
+///
+pub(crate) trait HyperlinkElementTraits {
+ fn get_hash(&self) -> USVString;
+ fn set_hash(&self, value: USVString, can_gc: CanGc);
+ fn get_host(&self) -> USVString;
+ fn set_host(&self, value: USVString, can_gc: CanGc);
+ fn get_hostname(&self) -> USVString;
+ fn set_hostname(&self, value: USVString, can_gc: CanGc);
+ fn get_href(&self) -> USVString;
+ fn set_href(&self, value: USVString, can_gc: CanGc);
+ fn get_origin(&self) -> USVString;
+ fn get_password(&self) -> USVString;
+ fn set_password(&self, value: USVString, can_gc: CanGc);
+ fn get_pathname(&self) -> USVString;
+ fn set_pathname(&self, value: USVString, can_gc: CanGc);
+ fn get_port(&self) -> USVString;
+ fn set_port(&self, value: USVString, can_gc: CanGc);
+ fn get_protocol(&self) -> USVString;
+ fn set_protocol(&self, value: USVString, can_gc: CanGc);
+ fn get_search(&self) -> USVString;
+ fn set_search(&self, value: USVString, can_gc: CanGc);
+ fn get_username(&self) -> USVString;
+ fn set_url(&self);
+ fn set_username(&self, value: USVString, can_gc: CanGc);
+ fn update_href(&self, url: DOMString, can_gc: CanGc);
+ fn reinitialize_url(&self);
+}
+
+impl + Castable + NodeTraits> HyperlinkElementTraits
+ for T
+{
+ ///
+ fn get_hash(&self) -> USVString {
+ // Step 1. Reinitialize url.
+ self.reinitialize_url();
+
+ // Step 2. Let url be this's url.
+ match *self.get_url().borrow() {
+ // Step 3. If url is null, or url's fragment is either null or the empty string, return
+ // the empty string.
+ None => USVString(String::new()),
+ Some(ref url) if url.fragment().is_none() || url.fragment() == Some("") => {
+ USVString(String::new())
+ },
+ Some(ref url) => {
+ // Step 4. Return "#", followed by url's fragment.
+ UrlHelper::Hash(url)
+ },
+ }
+ }
+
+ ///
+ fn set_hash(&self, value: USVString, can_gc: CanGc) {
+ // Step 1. Reinitialize url.
+ self.reinitialize_url();
+
+ // Step 2. Let url be this's url.
+ let url = match self.get_url().borrow_mut().as_mut() {
+ // Step 3. If url is null, then return.
+ None => return,
+ // Step 4. If the given value is the empty string, set url's fragment to null.
+ // Note this step is taken care of by UrlHelper::SetHash when the value is Some
+ // Steps 5. Otherwise:
+ Some(url) => {
+ // Step 5.1. Let input be the given value with a single leading "#" removed, if any.
+ // Step 5.2. Set url's fragment to the empty string.
+ // Note these steps are taken care of by UrlHelper::SetHash
+ UrlHelper::SetHash(url, value);
+
+ // Step 5.4. Basic URL parse input, with url as url and fragment state as state
+ // override.
+ DOMString::from(url.as_str())
+ },
+ };
+
+ // Step 6. Update href.
+ self.update_href(url, can_gc);
+ }
+
+ ///
+ fn get_host(&self) -> USVString {
+ // Step 1. Reinitialize url.
+ self.reinitialize_url();
+
+ // Step 2. Let url be this's url.
+ match *self.get_url().borrow() {
+ // Step 3. If url or url's host is null, return the empty string.
+ None => USVString(String::new()),
+ Some(ref url) => {
+ if url.host().is_none() {
+ USVString(String::new())
+ } else {
+ // Step 4. If url's port is null, return url's host, serialized.
+ // Step 5. Return url's host, serialized, followed by ":" and url's port,
+ // serialized.
+ UrlHelper::Host(url)
+ }
+ },
+ }
+ }
+
+ ///
+ fn set_host(&self, value: USVString, can_gc: CanGc) {
+ // Step 1. Reinitialize url.
+ self.reinitialize_url();
+
+ // Step 2. Let url be this's url.
+ let url = match self.get_url().borrow_mut().as_mut() {
+ // Step 3. If url or url's host is null, return the empty string.
+ Some(ref url) if url.cannot_be_a_base() => return,
+ None => return,
+ // Step 4. Basic URL parse the given value, with url as url and host state as state
+ // override.
+ Some(url) => {
+ UrlHelper::SetHost(url, value);
+ DOMString::from(url.as_str())
+ },
+ };
+
+ // Step 5. Update href.
+ self.update_href(url, can_gc);
+ }
+
+ ///
+ fn get_hostname(&self) -> USVString {
+ // Step 1. Reinitialize url.
+ self.reinitialize_url();
+
+ // Step 2. Let url be this's url.
+ match *self.get_url().borrow() {
+ // Step 3. If url or url's host is null, return the empty string.
+ None => USVString(String::new()),
+ Some(ref url) => {
+ // Step 4. Return url's host, serialized.
+ UrlHelper::Hostname(url)
+ },
+ }
+ }
+
+ ///
+ fn set_hostname(&self, value: USVString, can_gc: CanGc) {
+ // Step 1. Reinitialize url.
+ self.reinitialize_url();
+
+ // Step 2. Let url be this's url.
+ let url = match self.get_url().borrow_mut().as_mut() {
+ // Step 3. If url is null or url has an opaque path, then return.
+ None => return,
+ Some(ref url) if url.cannot_be_a_base() => return,
+ // Step 4. Basic URL parse the given value, with url as url and hostname state as state
+ // override.
+ Some(url) => {
+ UrlHelper::SetHostname(url, value);
+ DOMString::from(url.as_str())
+ },
+ };
+
+ // Step 5. Update href.
+ self.update_href(url, can_gc);
+ }
+
+ ///
+ fn get_href(&self) -> USVString {
+ // Step 1. Reinitialize url.
+ self.reinitialize_url();
+
+ // Step 2. Let url be this's url.
+ USVString(match *self.get_url().borrow() {
+ None => {
+ match self
+ .upcast::()
+ .get_attribute(&ns!(), &local_name!("href"))
+ {
+ // Step 3. If url is null and this has no href content attribute, return the
+ // empty string.
+ None => String::new(),
+
+ // Step 4. Otherwise, if url is null, return this's href content attribute's value.
+ Some(attribute) => (**attribute.value()).to_owned(),
+ }
+ },
+ // Step 5. Return url, serialized.
+ Some(ref url) => url.as_str().to_owned(),
+ })
+ }
+
+ /// ().set_string_attribute(
+ &local_name!("href"),
+ DOMString::from_string(value.0),
+ can_gc,
+ );
+
+ self.set_url();
+ }
+
+ ///
+ fn get_origin(&self) -> USVString {
+ // Step 1. Reinitialize url.
+ self.reinitialize_url();
+
+ USVString(match *self.get_url().borrow() {
+ // Step 2. If this's url is null, return the empty string.
+ None => "".to_owned(),
+ // Step 3. Return the serialization of this's url's origin.
+ Some(ref url) => url.origin().ascii_serialization(),
+ })
+ }
+
+ ///
+ fn get_password(&self) -> USVString {
+ // Step 1. Reinitialize url.
+ self.reinitialize_url();
+
+ // Step 2. Let url be this's url.
+ match *self.get_url().borrow() {
+ // Step 3. If url is null, then return the empty string.
+ None => USVString(String::new()),
+ // Steps 4. Return url's password.
+ Some(ref url) => UrlHelper::Password(url),
+ }
+ }
+
+ ///
+ fn set_password(&self, value: USVString, can_gc: CanGc) {
+ // Step 1. Reinitialize url.
+ self.reinitialize_url();
+
+ // Step 2. Let url be this's url.
+ let url = match self.get_url().borrow_mut().as_mut() {
+ // Step 3. If url is null or url cannot have a username/password/port, then return.
+ None => return,
+ Some(ref url) if url.host().is_none() || url.cannot_be_a_base() => return,
+ // Step 4. Set the password, given url and the given value.
+ Some(url) => {
+ UrlHelper::SetPassword(url, value);
+ DOMString::from(url.as_str())
+ },
+ };
+
+ // Step 5. Update href.
+ self.update_href(url, can_gc);
+ }
+
+ ///
+ fn get_pathname(&self) -> USVString {
+ // Step 1. Reinitialize url.
+ self.reinitialize_url();
+
+ // Step 2. Let url be this's url.
+ match *self.get_url().borrow() {
+ // Step 3. If url is null, then return the empty string.
+ None => USVString(String::new()),
+ // Steps 4. Return the result of URL path serializing url.
+ Some(ref url) => UrlHelper::Pathname(url),
+ }
+ }
+
+ ///
+ fn set_pathname(&self, value: USVString, can_gc: CanGc) {
+ // Step 1. Reinitialize url.
+ self.reinitialize_url();
+
+ // Step 2. Let url be this's url.
+ let url = match self.get_url().borrow_mut().as_mut() {
+ // Step 3. If url is null or url has an opaque path, then return.
+ None => return,
+ Some(ref url) if url.cannot_be_a_base() => return,
+ // Step 4. Set url's path to the empty list.
+ // Step 5. Basic URL parse the given value, with url as url and path start state as state override.
+ Some(url) => {
+ UrlHelper::SetPathname(url, value);
+ DOMString::from(url.as_str())
+ },
+ };
+
+ // Step 6. Update href.
+ self.update_href(url, can_gc);
+ }
+
+ ///
+ fn get_port(&self) -> USVString {
+ // Step 1. Reinitialize url.
+ self.reinitialize_url();
+
+ // Step 2. Let url be this's url.
+ match *self.get_url().borrow() {
+ // Step 3. If url or url's port is null, return the empty string.
+ None => USVString(String::new()),
+ // Step 4. Return url's port, serialized.
+ Some(ref url) => UrlHelper::Port(url),
+ }
+ }
+
+ ///
+ fn set_port(&self, value: USVString, can_gc: CanGc) {
+ // Step 1. Reinitialize url.
+ self.reinitialize_url();
+
+ // Step 2. Let url be this's url.
+ let url = match self.get_url().borrow_mut().as_mut() {
+ // Step 3. If url is null or url cannot have a username/password/port, then return.
+ None => return,
+ Some(ref url)
+ // https://url.spec.whatwg.org/#cannot-have-a-username-password-port
+ if url.host().is_none() || url.cannot_be_a_base() || url.scheme() == "file" =>
+ {
+ return;
+ },
+ // Step 4. If the given value is the empty string, then set url's port to null.
+ // Step 5. Otherwise, basic URL parse the given value, with url as url and port state as
+ // state override.
+ Some(url) => {
+ UrlHelper::SetPort(url, value);
+ DOMString::from(url.as_str())
+ },
+ };
+
+ // Step 6. Update href.
+ self.update_href(url, can_gc);
+ }
+
+ ///
+ fn get_protocol(&self) -> USVString {
+ // Step 1. Reinitialize url.
+ self.reinitialize_url();
+
+ match *self.get_url().borrow() {
+ // Step 2. If this's url is null, return ":".
+ None => USVString(":".to_owned()),
+ // Step 3. Return this's url's scheme, followed by ":".
+ Some(ref url) => UrlHelper::Protocol(url),
+ }
+ }
+
+ ///
+ fn set_protocol(&self, value: USVString, can_gc: CanGc) {
+ // Step 1. Reinitialize url.
+ self.reinitialize_url();
+
+ let url = match self.get_url().borrow_mut().as_mut() {
+ // Step 2. If this's url is null, then return.
+ None => return,
+ // Step 3. Basic URL parse the given value, followed by ":", with this's url as url and
+ // scheme start state as state override.
+ Some(url) => {
+ UrlHelper::SetProtocol(url, value);
+ DOMString::from(url.as_str())
+ },
+ };
+
+ // Step 4. Update href.
+ self.update_href(url, can_gc);
+ }
+
+ ///
+ fn get_search(&self) -> USVString {
+ // Step 1. Reinitialize url.
+ self.reinitialize_url();
+
+ // Step 2. Let url be this's url.
+ match *self.get_url().borrow() {
+ // Step 3. If url is null, or url's query is either null or the empty string, return the
+ // empty string.
+ // Step 4. Return "?", followed by url's query.
+ // Note: This is handled in UrlHelper::Search
+ None => USVString(String::new()),
+ Some(ref url) => UrlHelper::Search(url),
+ }
+ }
+
+ ///
+ fn set_search(&self, value: USVString, can_gc: CanGc) {
+ // Step 1. Reinitialize url.
+ self.reinitialize_url();
+
+ // Step 2. Let url be this's url.
+ let url = match self.get_url().borrow_mut().as_mut() {
+ // Step 3. If url is null, terminate these steps.
+ None => return,
+ // Step 4. If the given value is the empty string, set url's query to null.
+ // Step 5. Otherwise:
+ Some(url) => {
+ // Note: Inner steps are handled by UrlHelper::SetSearch
+ UrlHelper::SetSearch(url, value);
+ DOMString::from(url.as_str())
+ },
+ };
+
+ // Step 6. Update href.
+ self.update_href(url, can_gc);
+ }
+
+ ///
+ fn get_username(&self) -> USVString {
+ // Step 1. Reinitialize url.
+ self.reinitialize_url();
+
+ match *self.get_url().borrow() {
+ // Step 2. If this's url is null, return the empty string.
+ None => USVString(String::new()),
+ // Step 3. Return this's url's username.
+ Some(ref url) => UrlHelper::Username(url),
+ }
+ }
+
+ ///
+ fn set_url(&self) {
+ // Step 1. Set this element's url to null.
+ *self.get_url().borrow_mut() = None;
+
+ let attribute = self
+ .upcast::()
+ .get_attribute(&ns!(), &local_name!("href"));
+
+ // Step 2. If this element's href content attribute is absent, then return.
+ let Some(attribute) = attribute else {
+ return;
+ };
+
+ let document = self.owner_document();
+
+ // Step 3. Let url be the result of encoding-parsing a URL given this element's href content
+ // attribute's value, relative to this element's node document.
+ let url = document.encoding_parse_a_url(&attribute.value());
+
+ // Step 4. If url is not failure, then set this element's url to url.
+ if let Ok(url) = url {
+ *self.get_url().borrow_mut() = Some(url);
+ }
+ }
+
+ ///
+ fn set_username(&self, value: USVString, can_gc: CanGc) {
+ // Step 1. Reinitialize url.
+ self.reinitialize_url();
+
+ // Step 2. Let url be this's url.
+ let url = match self.get_url().borrow_mut().as_mut() {
+ // Step 3. If url is null or url cannot have a username/password/port, then return.
+ None => return,
+ Some(ref url) if url.host().is_none() || url.cannot_be_a_base() => return,
+ // Step 4. Set the username, given url and the given value.
+ Some(url) => {
+ UrlHelper::SetUsername(url, value);
+ DOMString::from(url.as_str())
+ },
+ };
+
+ // Step 5. Update href.
+ self.update_href(url, can_gc);
+ }
+
+ ///
+ fn update_href(&self, url: DOMString, can_gc: CanGc) {
+ self.upcast::()
+ .set_string_attribute(&local_name!("href"), url, can_gc);
+ }
+
+ ///
+ fn reinitialize_url(&self) {
+ // Step 1. If the element's url is non-null, its scheme is "blob", and it has an opaque
+ // path, then terminate these steps.
+ match *self.get_url().borrow() {
+ Some(ref url) if url.scheme() == "blob" && url.cannot_be_a_base() => return,
+ _ => (),
+ }
+
+ // Step 2. Set the url.
+ self.set_url();
+ }
+}
diff --git a/components/script/dom/mod.rs b/components/script/dom/mod.rs
index ec5f9a8c9a6..0fd8c9c10ee 100644
--- a/components/script/dom/mod.rs
+++ b/components/script/dom/mod.rs
@@ -370,6 +370,7 @@ pub(crate) mod htmlheadelement;
pub(crate) mod htmlheadingelement;
pub(crate) mod htmlhrelement;
pub(crate) mod htmlhtmlelement;
+pub(crate) mod htmlhyperlinkelementutils;
pub(crate) mod htmliframeelement;
pub(crate) mod htmlimageelement;
pub(crate) mod htmlinputelement;
diff --git a/components/script_bindings/codegen/Bindings.conf b/components/script_bindings/codegen/Bindings.conf
index df27a32a06c..d8c7f94917a 100644
--- a/components/script_bindings/codegen/Bindings.conf
+++ b/components/script_bindings/codegen/Bindings.conf
@@ -232,7 +232,7 @@ DOMInterfaces = {
},
"HTMLAreaElement": {
- "canGc": ["SetRel"]
+ "canGc": ['SetText', 'SetRel', 'SetHref', 'SetHash', 'SetHost', 'SetHostname', 'SetPassword', 'SetPathname', 'SetPort', 'SetProtocol', 'SetSearch', 'SetUsername']
},
"HTMLBodyElement": {
diff --git a/components/script_bindings/webidls/HTMLAreaElement.webidl b/components/script_bindings/webidls/HTMLAreaElement.webidl
index 222eef4962c..014fc38fb09 100644
--- a/components/script_bindings/webidls/HTMLAreaElement.webidl
+++ b/components/script_bindings/webidls/HTMLAreaElement.webidl
@@ -25,7 +25,7 @@ interface HTMLAreaElement : HTMLElement {
[CEReactions] attribute DOMString referrerPolicy;
// hreflang and type are not reflected
};
-//HTMLAreaElement includes HTMLHyperlinkElementUtils;
+HTMLAreaElement includes HTMLHyperlinkElementUtils;
// https://html.spec.whatwg.org/multipage/#HTMLAreaElement-partial
partial interface HTMLAreaElement {
diff --git a/tests/wpt/meta/dom/events/Event-dispatch-single-activation-behavior.html.ini b/tests/wpt/meta/dom/events/Event-dispatch-single-activation-behavior.html.ini
index 46310d80c45..9eb815a14a6 100644
--- a/tests/wpt/meta/dom/events/Event-dispatch-single-activation-behavior.html.ini
+++ b/tests/wpt/meta/dom/events/Event-dispatch-single-activation-behavior.html.ini
@@ -44,9 +44,6 @@
[When clicking child of parent , only child should be activated.]
expected: FAIL
- [When clicking child of parent , only child should be activated.]
- expected: FAIL
-
[When clicking child of parent