eliott/ladybird
1
0
Fork 0
mirror of https://github.com/LadybirdBrowser/ladybird synced 2026-05-11 17:37:33 +02:00
Code Issues Packages Projects Releases Wiki Activity

LibWeb: Re-evaluate picture source set on source mutations

Browse Source 
The img inside a <picture> has to re-run "update the image data" when
nearby <source> elements change, so script-driven swaps of srcset (and
the other dimension/media attributes) actually take effect.

Per the HTML spec, the relevant mutations for an img element include:
"The element's parent is a picture element and a source element that
 is a previous sibling has its srcset, sizes, media, type, width or
 height attributes set, changed, or removed."

The same applies to source insertion, moving, and removal.

Fixes image loading on https://www.apple.com/mac/
This commit is contained in:
Aliaksandr Kalenik
2026-04-26 15:52:55 +02:00
committed by Alexander Kalenik
parent 6bb037aec7
commit 54244f9e4a
Notes: github-actions[bot] 2026-04-26 15:50:18 +00:00 
Author: https://github.com/kalenikaliaksandr
Commit: https://github.com/LadybirdBrowser/ladybird/commit/54244f9e4a7
Pull-request: https://github.com/LadybirdBrowser/ladybird/pull/9115
4 changed files with 115 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

63
Libraries/LibWeb/HTML/HTMLSourceElement.cpp
View File

@@ -7,7 +7,9 @@
#include <LibWeb/Bindings/HTMLSourceElement.h>
#include <LibWeb/Bindings/Intrinsics.h>
#include <LibWeb/HTML/AttributeNames.h>
#include <LibWeb/HTML/HTMLImageElement.h>
#include <LibWeb/HTML/HTMLMediaElement.h>
#include <LibWeb/HTML/HTMLPictureElement.h>
#include <LibWeb/HTML/HTMLSourceElement.h>
namespace Web::HTML {
@@ -27,6 +29,14 @@ void HTMLSourceElement::initialize(JS::Realm& realm)
Base::initialize(realm);
}
static void update_image_children_of_picture(DOM::Node& picture)
{
for (auto* child = picture.first_child(); child; child = child->next_sibling()) {
if (auto* img = as_if<HTMLImageElement>(child))
img->update_the_image_data(true);
}
}
// https://html.spec.whatwg.org/multipage/embedded-content.html#the-source-element:html-element-insertion-steps
void HTMLSourceElement::inserted()
{
@@ -44,8 +54,10 @@ void HTMLSourceElement::inserted()
media_element->select_resource();
}
// FIXME: 3. If parent is a picture element, then for each child of parent's children, if child is an img element, then
// count this as a relevant mutation for child.
// 3. If parent is a picture element, then for each child of parent's children, if child is an img element, then
// count this as a relevant mutation for child.
if (auto* picture = as_if<HTMLPictureElement>(parent))
update_image_children_of_picture(*picture);
}
// https://html.spec.whatwg.org/multipage/embedded-content.html#the-source-element:the-source-element-17
@@ -54,8 +66,17 @@ void HTMLSourceElement::moved_from(IsSubtreeRoot is_subtree_root, GC::Ptr<DOM::N
// The source HTML element moving steps, given movedNode, isSubtreeRoot, and oldAncestor are:
Base::moved_from(is_subtree_root, old_ancestor);
// FIXME: 1. If isSubtreeRoot is true and oldAncestor is a picture element, then for each child of oldAncestor's
// children: if child is an img element, then count this as a relevant mutation for child.
// 1. If isSubtreeRoot is true and oldAncestor is a picture element, then for each child of oldAncestor's
// children: if child is an img element, then count this as a relevant mutation for child.
if (is_subtree_root == IsSubtreeRoot::Yes) {
if (auto* picture = as_if<HTMLPictureElement>(old_ancestor.ptr()))
update_image_children_of_picture(*picture);
}
// The img element may also have moved into a (new) picture parent; the "picture's children
// changed" mutation covers that for the new ancestor too.
if (auto* picture = as_if<HTMLPictureElement>(parent()))
update_image_children_of_picture(*picture);
}
// https://html.spec.whatwg.org/multipage/embedded-content.html#the-source-element:the-source-element-18
@@ -64,8 +85,38 @@ void HTMLSourceElement::removed_from(IsSubtreeRoot is_subtree_root, DOM::Node* o
// The source HTML element removing steps, given removedNode, isSubtreeRoot, and oldAncestor are:
Base::removed_from(is_subtree_root, old_ancestor, old_root);
// FIXME: 1. If isSubtreeRoot is true and oldAncestor is a picture element, then for each child of oldAncestor's
// children: if child is an img element, then count this as a relevant mutation for child.
// 1. If isSubtreeRoot is true and oldAncestor is a picture element, then for each child of oldAncestor's
// children: if child is an img element, then count this as a relevant mutation for child.
if (is_subtree_root == IsSubtreeRoot::Yes) {
if (auto* picture = as_if<HTMLPictureElement>(old_ancestor))
update_image_children_of_picture(*picture);
}
}
// https://html.spec.whatwg.org/multipage/images.html#relevant-mutations
// "The element's parent is a picture element and a source element that is a previous sibling has
// its srcset, sizes, media, type, width or height attributes set, changed, or removed."
void HTMLSourceElement::attribute_changed(FlyString const& name, Optional<String> const& old_value, Optional<String> const& value, Optional<FlyString> const& namespace_)
{
Base::attribute_changed(name, old_value, value, namespace_);
if (!name.is_one_of(
HTML::AttributeNames::srcset,
HTML::AttributeNames::sizes,
HTML::AttributeNames::media,
HTML::AttributeNames::type,
HTML::AttributeNames::width,
HTML::AttributeNames::height))
return;
if (!is<HTMLPictureElement>(parent()))
return;
// Only following img siblings consider this source a "previous sibling".
for (auto* sibling = next_sibling(); sibling; sibling = sibling->next_sibling()) {
if (auto* img = as_if<HTMLImageElement>(sibling))
img->update_the_image_data(true);
}
}
}