mirror of
https://github.com/mozilla/gecko-dev.git
synced 2024-10-21 01:05:45 +00:00
servo: Merge #14047 - fix getElementsByTagName() (from mskrzypkows:getElementsByTagName); r=nox
<!-- Please describe your changes on the following line: --> Improved implementation of getElementsByTagName() in Document, properly pass 3 cases of https://dom.spec.whatwg.org/#concept-getelementsbytagname --- <!-- Thank you for contributing to Servo! Please replace each `[ ]` by `[X]` when the step is complete, and replace `__` with appropriate data: --> - [X] `./mach build -d` does not report any errors - [X] `./mach test-tidy` does not report any errors - [X] These changes fix #11596 (github issue number if applicable). <!-- Either: --> - [x] There are tests for these changes OR - [ ] These changes do not require tests because _____ <!-- Pull requests that do not address these steps are welcome, but they will require additional verification as part of the review process. --> Source-Repo: https://github.com/servo/servo Source-Revision: cfef68f92d1c8cdc928d3c0b60f22de4b40a97be
This commit is contained in:
parent
8433acf585
commit
990ddaaabf
@ -2176,18 +2176,13 @@ impl DocumentMethods for Document {
|
||||
}
|
||||
|
||||
// https://dom.spec.whatwg.org/#dom-document-getelementsbytagname
|
||||
fn GetElementsByTagName(&self, tag_name: DOMString) -> Root<HTMLCollection> {
|
||||
let tag_atom = LocalName::from(&*tag_name);
|
||||
match self.tag_map.borrow_mut().entry(tag_atom.clone()) {
|
||||
fn GetElementsByTagName(&self, qualified_name: DOMString) -> Root<HTMLCollection> {
|
||||
let qualified_name = LocalName::from(&*qualified_name);
|
||||
match self.tag_map.borrow_mut().entry(qualified_name.clone()) {
|
||||
Occupied(entry) => Root::from_ref(entry.get()),
|
||||
Vacant(entry) => {
|
||||
let mut tag_copy = tag_name;
|
||||
tag_copy.make_ascii_lowercase();
|
||||
let ascii_lower_tag = LocalName::from(tag_copy);
|
||||
let result = HTMLCollection::by_atomic_tag_name(&self.window,
|
||||
self.upcast(),
|
||||
tag_atom,
|
||||
ascii_lower_tag);
|
||||
let result = HTMLCollection::by_qualified_name(
|
||||
&self.window, self.upcast(), qualified_name);
|
||||
entry.insert(JS::from_ref(&*result));
|
||||
result
|
||||
}
|
||||
|
@ -1441,7 +1441,7 @@ impl ElementMethods for Element {
|
||||
// https://dom.spec.whatwg.org/#dom-element-getelementsbytagname
|
||||
fn GetElementsByTagName(&self, localname: DOMString) -> Root<HTMLCollection> {
|
||||
let window = window_from_node(self);
|
||||
HTMLCollection::by_tag_name(&window, self.upcast(), localname)
|
||||
HTMLCollection::by_qualified_name(&window, self.upcast(), LocalName::from(&*localname))
|
||||
}
|
||||
|
||||
// https://dom.spec.whatwg.org/#dom-element-getelementsbytagnamens
|
||||
|
@ -15,7 +15,6 @@ use dom::node::Node;
|
||||
use dom::window::Window;
|
||||
use html5ever_atoms::{LocalName, QualName};
|
||||
use servo_atoms::Atom;
|
||||
use std::ascii::AsciiExt;
|
||||
use std::cell::Cell;
|
||||
use style::str::split_html_space_chars;
|
||||
|
||||
@ -114,39 +113,52 @@ impl HTMLCollection {
|
||||
}
|
||||
}
|
||||
|
||||
pub fn by_tag_name(window: &Window, root: &Node, mut tag: DOMString)
|
||||
-> Root<HTMLCollection> {
|
||||
let tag_atom = LocalName::from(&*tag);
|
||||
tag.make_ascii_lowercase();
|
||||
let ascii_lower_tag = LocalName::from(tag); // FIXME(ajeffrey): don't clone atom if it was already lowercased.
|
||||
HTMLCollection::by_atomic_tag_name(window, root, tag_atom, ascii_lower_tag)
|
||||
}
|
||||
|
||||
pub fn by_atomic_tag_name(window: &Window, root: &Node, tag_atom: LocalName, ascii_lower_tag: LocalName)
|
||||
-> Root<HTMLCollection> {
|
||||
#[derive(JSTraceable, HeapSizeOf)]
|
||||
struct TagNameFilter {
|
||||
tag: LocalName,
|
||||
ascii_lower_tag: LocalName,
|
||||
}
|
||||
impl CollectionFilter for TagNameFilter {
|
||||
fn filter(&self, elem: &Element, _root: &Node) -> bool {
|
||||
if self.tag == local_name!("*") {
|
||||
// https://dom.spec.whatwg.org/#concept-getelementsbytagname
|
||||
pub fn by_qualified_name(window: &Window, root: &Node, qualified_name: LocalName)
|
||||
-> Root<HTMLCollection> {
|
||||
// case 1
|
||||
if qualified_name == local_name!("*") {
|
||||
#[derive(JSTraceable, HeapSizeOf)]
|
||||
struct AllFilter;
|
||||
impl CollectionFilter for AllFilter {
|
||||
fn filter(&self, _elem: &Element, _root: &Node) -> bool {
|
||||
true
|
||||
} else if elem.html_element_in_html_document() {
|
||||
*elem.local_name() == self.ascii_lower_tag
|
||||
} else {
|
||||
*elem.local_name() == self.tag
|
||||
}
|
||||
}
|
||||
return HTMLCollection::create(window, root, box AllFilter);
|
||||
}
|
||||
|
||||
#[derive(JSTraceable, HeapSizeOf)]
|
||||
struct HtmlDocumentFilter {
|
||||
qualified_name: LocalName,
|
||||
ascii_lower_qualified_name: LocalName,
|
||||
}
|
||||
impl CollectionFilter for HtmlDocumentFilter {
|
||||
fn filter(&self, elem: &Element, root: &Node) -> bool {
|
||||
if root.is_in_html_doc() && elem.namespace() == &ns!(html) { // case 2
|
||||
HTMLCollection::match_element(elem, &self.ascii_lower_qualified_name)
|
||||
} else { // case 2 and 3
|
||||
HTMLCollection::match_element(elem, &self.qualified_name)
|
||||
}
|
||||
}
|
||||
}
|
||||
let filter = TagNameFilter {
|
||||
tag: tag_atom,
|
||||
ascii_lower_tag: ascii_lower_tag,
|
||||
|
||||
let filter = HtmlDocumentFilter {
|
||||
ascii_lower_qualified_name: qualified_name.to_ascii_lowercase(),
|
||||
qualified_name: qualified_name,
|
||||
};
|
||||
HTMLCollection::create(window, root, box filter)
|
||||
}
|
||||
|
||||
fn match_element(elem: &Element, qualified_name: &LocalName) -> bool {
|
||||
match *elem.prefix() {
|
||||
None => elem.local_name() == qualified_name,
|
||||
Some(ref prefix) => qualified_name.starts_with(prefix as &str) &&
|
||||
qualified_name.find(":") == Some((prefix as &str).len()) &&
|
||||
qualified_name.ends_with(elem.local_name() as &str),
|
||||
}
|
||||
}
|
||||
|
||||
pub fn by_tag_name_ns(window: &Window, root: &Node, tag: DOMString,
|
||||
maybe_ns: Option<DOMString>) -> Root<HTMLCollection> {
|
||||
let local = LocalName::from(tag);
|
||||
|
@ -28,8 +28,8 @@ interface Document : Node {
|
||||
readonly attribute DocumentType? doctype;
|
||||
[Pure]
|
||||
readonly attribute Element? documentElement;
|
||||
HTMLCollection getElementsByTagName(DOMString localName);
|
||||
HTMLCollection getElementsByTagNameNS(DOMString? namespace, DOMString localName);
|
||||
HTMLCollection getElementsByTagName(DOMString qualifiedName);
|
||||
HTMLCollection getElementsByTagNameNS(DOMString? namespace, DOMString qualifiedName);
|
||||
HTMLCollection getElementsByClassName(DOMString classNames);
|
||||
|
||||
[NewObject, Throws]
|
||||
|
Loading…
Reference in New Issue
Block a user