system/serenity
system/serenity
1
0
Fork 0
mirror of https://github.com/SerenityOS/serenity synced 2024-09-06 17:06:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

LibWeb: Implement Document's supported property names closer to the spec

Browse source 
Our implementation was errantly matching HTML tags other than the list
specified by the spec. For example, a <meta name=title> tag would be a
match for document.title.

For example, bandcamp will dynamically update its title when audio is
played as follows:

    document.title = "▶︎ " + document.title;

And bandcamp also has a <meta name=title> tag. The result was that the
title would become "▶︎ [object HTMLMetaElement]".
This commit is contained in:
Timothy Flynn 2024-03-29 07:20:16 -04:00 committed by Tim Flynn
parent 8ff3cd6d76
commit 43e55668eb
5 changed files with 76 additions and 59 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
Tests/LibWeb/Text/expected/DOM/Document-named-properties.txt
View file

@ -1,4 +1,4 @@
Submit <FORM >
Submit <FORM >
document.bob === document.forms[0]: true
<BUTTON id="fred" >
img element with name 'foo' and id 'bar':
@ -14,3 +14,4 @@ obj element with name 'greg' and id 'banana':
<OBJECT id="banana" >
goodbye greg/banana
no more greg or banana: true, true
meta tag does not match: true

1
Tests/LibWeb/Text/expected/title-with-meta-title.txt Normal file
View file

@ -0,0 +1 @@
foo

3
Tests/LibWeb/Text/input/DOM/Document-named-properties.html
View file

@ -5,6 +5,7 @@
<img id="baz" src="http://www.example.com" alt="Example" />
<form name="foo">
</form>
<meta name="kangaroo" />
<script src="../include.js"></script>
<script>
test(() => {
@ -41,5 +42,7 @@
document.body.removeChild(document.greg);
println(`no more greg or banana: ${document.greg === undefined}, ${document.banana === undefined}`);
println(`meta tag does not match: ${document.kangaroo === undefined}`);
});
</script>

10
Tests/LibWeb/Text/input/title-with-meta-title.html Normal file
View file

@ -0,0 +1,10 @@
<head>
<title>foo</title>
<meta name="title" content="bar" />
</head>
<script src="include.js"></script>
<script>
test(() => {
println(document.title);
});
</script>

118
Userland/Libraries/LibWeb/DOM/Document.cpp
View file

@ -4336,16 +4336,14 @@ JS::GCPtr<Element const> Document::scrolling_element() const
// https://html.spec.whatwg.org/multipage/dom.html#exposed
static bool is_exposed(Element const& element)
{
if (is<HTML::HTMLObjectElement>(element) || is<HTML::HTMLEmbedElement>(element)) {
// FIXME: An embed or object element is said to be exposed if it has no exposed object ancestor, and,
// for object elements, is additionally either not showing its fallback content or has no object or embed descendants.
return true;
}
VERIFY(is<HTML::HTMLEmbedElement>(element) || is<HTML::HTMLObjectElement>(element));
// FIXME: An embed or object element is said to be exposed if it has no exposed object ancestor, and,
// for object elements, is additionally either not showing its fallback content or has no object or embed descendants.
return true;
}
// https://html.spec.whatwg.org/multipage/dom.html#dom-document-nameditem-which
// https://html.spec.whatwg.org/multipage/dom.html#dom-tree-accessors:supported-property-names
Vector<FlyString> Document::supported_property_names() const
{
// The supported property names of a Document object document at any moment consist of the following,
@ -4353,62 +4351,77 @@ Vector<FlyString> Document::supported_property_names() const
// and with values from id attributes coming before values from name attributes when the same element contributes both:
OrderedHashTable<FlyString> names;
// the value of the name content attribute for all exposed embed, form, iframe, img, and exposed object elements
// that have a non-empty name content attribute and are in a document tree with document as their root;
// the value of the id content attribute for all exposed object elements that have a non-empty id content attribute
// and are in a document tree with document as their root; and
// the value of the id content attribute for all img elements that have both a non-empty id content attribute
// and a non-empty name content attribute, and are in a document tree with document as their root.
for (auto const& element : m_potentially_named_elements) {
if (!is_exposed(element))
continue;
// - the value of the name content attribute for all exposed embed, form, iframe, img, and exposed object elements
// that have a non-empty name content attribute and are in a document tree with document as their root;
if ((is<HTML::HTMLEmbedElement>(*element) && is_exposed(element))
|| is<HTML::HTMLFormElement>(*element)
|| is<HTML::HTMLIFrameElement>(*element)
|| is<HTML::HTMLImageElement>(*element)
|| (is<HTML::HTMLObjectElement>(*element) && is_exposed(element))) {
if (auto name = element->name(); name.has_value()) {
names.set(name.value());
}
}
if (is<HTML::HTMLObjectElement>(*element)) {
if (auto id = element->id(); id.has_value())
// - the value of the id content attribute for all exposed object elements that have a non-empty id content attribute
// and are in a document tree with document as their root; and
if (is<HTML::HTMLObjectElement>(*element) && is_exposed(element)) {
if (auto id = element->id(); id.has_value()) {
names.set(id.value());
}
if (is<HTML::HTMLImageElement>(*element)) {
auto maybe_name = element->name();
// Only set id if both name and id have value, for img elements. clear as mud
if (auto maybe_id = element->id(); maybe_name.has_value() && maybe_id.has_value())
names.set(maybe_id.value());
}
}
if (auto name = element->name(); name.has_value())
names.set(name.value());
// - the value of the id content attribute for all img elements that have both a non-empty id content attribute
// and a non-empty name content attribute, and are in a document tree with document as their root.
if (is<HTML::HTMLImageElement>(*element)) {
if (auto id = element->id(); id.has_value() && element->name().has_value()) {
names.set(id.value());
}
}
}
return names.values();
}
// https://html.spec.whatwg.org/multipage/dom.html#dom-document-nameditem-filter
static Vector<JS::NonnullGCPtr<DOM::Element>> named_elements_with_name(Document const& document, FlyString const& name)
static bool is_named_element_with_name(Element const& element, FlyString const& name)
{
// Named elements with the name name, for the purposes of the above algorithm, are those that are either:
// - Exposed embed, form, iframe, img, or exposed object elements that have a name content attribute whose value is name, or
// - Exposed embed, form, iframe, img, or exposed object elements that have a name content attribute whose value
// is name, or
if ((is<HTML::HTMLEmbedElement>(element) && is_exposed(element))
|| is<HTML::HTMLFormElement>(element)
|| is<HTML::HTMLIFrameElement>(element)
|| is<HTML::HTMLImageElement>(element)
|| (is<HTML::HTMLObjectElement>(element) && is_exposed(element))) {
if (element.name() == name)
return true;
}
// - Exposed object elements that have an id content attribute whose value is name, or
// - img elements that have an id content attribute whose value is name, and that have a non-empty name content attribute present also.
if (is<HTML::HTMLObjectElement>(element) && is_exposed(element)) {
if (element.id() == name)
return true;
}
// - img elements that have an id content attribute whose value is name, and that have a non-empty name content
// attribute present also.
if (is<HTML::HTMLImageElement>(element)) {
if (element.id() == name && element.name().has_value())
return true;
}
return false;
}
static Vector<JS::NonnullGCPtr<DOM::Element>> named_elements_with_name(Document const& document, FlyString const& name)
{
Vector<JS::NonnullGCPtr<DOM::Element>> named_elements;
for (auto const& element : document.potentially_named_elements()) {
if (!is_exposed(*element))
continue;
if (is<HTML::HTMLObjectElement>(*element)) {
if (element->id() == name)
named_elements.append(element);
} else if (is<HTML::HTMLImageElement>(*element)) {
if (element->id() == name && element->name().has_value())
named_elements.append(element);
}
if (element->name() == name) {
named_elements.append(*element);
}
if (is_named_element_with_name(element, name))
named_elements.append(element);
}
return named_elements;
@ -4434,20 +4447,9 @@ WebIDL::ExceptionOr<JS::Value> Document::named_item_value(FlyString const& name)
return elements.first();
// 4. Otherwise return an HTMLCollection rooted at the Document node, whose filter matches only named elements with the name name.
auto collection = HTMLCollection::create(*const_cast<Document*>(this), HTMLCollection::Scope::Descendants, [name](auto& element) {
if (!is_potentially_named_element(element) || !is_exposed(element))
return false;
if (is<HTML::HTMLObjectElement>(element)) {
if (element.id() == name)
return true;
} else if (is<HTML::HTMLImageElement>(element)) {
if (element.id() == name && element.name().has_value())
return true;
}
return (element.name() == name);
return HTMLCollection::create(*const_cast<Document*>(this), HTMLCollection::Scope::Descendants, [name](auto& element) {
return is_named_element_with_name(element, name);
});
return collection;
}
// https://w3c.github.io/editing/docs/execCommand/#execcommand()