From 55920614747021f79e61e69f2ac155a9aa63a554 Mon Sep 17 00:00:00 2001 From: leo030303 <59373587+leo030303@users.noreply.github.com> Date: Thu, 24 Jul 2025 14:40:44 +0100 Subject: [PATCH] Add dimension source attribute to HTMLImageElement (#38152) HTMLImageElement was missing the dimension source attribute, as step 9 from [here](https://html.spec.whatwg.org/multipage/images.html#updating-the-source-set) wasn't implemented. This meant that for an element like this: ```html Wikimedia Foundation ``` The `width` and `height` attributes of the source tag were being ignored. This broke stuff like these icons on the main page of Wikipedia. **Original:** image **Fixed:** image Testing: If there isn't an existing test that covers this I'll make one, waiting for the github runner to tell me whether this is covered and then I'll amend the PR --------- Signed-off-by: Leo Ring Signed-off-by: Xiaocheng Hu Signed-off-by: Xiaocheng Hu Co-authored-by: Xiaocheng Hu Co-authored-by: Xiaocheng Hu --- components/script/dom/htmlimageelement.rs | 45 +++++++++++++++---- .../picture-aspect-ratio.html.ini | 6 --- 2 files changed, 36 insertions(+), 15 deletions(-) diff --git a/components/script/dom/htmlimageelement.rs b/components/script/dom/htmlimageelement.rs index 427c9ed9401..3a38c851bcf 100644 --- a/components/script/dom/htmlimageelement.rs +++ b/components/script/dom/htmlimageelement.rs @@ -162,6 +162,9 @@ pub(crate) struct HTMLImageElement { form_owner: MutNullableDom, generation: Cell, source_set: DomRefCell, + /// + /// Always non-null after construction. + dimension_attribute_source: MutNullableDom, last_selected_source: DomRefCell>, #[ignore_malloc_size_of = "promises are hard"] image_decode_promises: DomRefCell>>, @@ -737,9 +740,20 @@ impl HTMLImageElement { } // Step 4.9 - self.normalise_source_densities(&mut source_set, width); + if element + .get_attribute(&ns!(), &local_name!("width")) + .is_some() || + element + .get_attribute(&ns!(), &local_name!("height")) + .is_some() + { + self.dimension_attribute_source.set(Some(element)); + } // Step 4.10 + self.normalise_source_densities(&mut source_set, width); + + // Step 4.11 *self.source_set.borrow_mut() = source_set; return; } @@ -1348,6 +1362,7 @@ impl HTMLImageElement { form_owner: Default::default(), generation: Default::default(), source_set: DomRefCell::new(SourceSet::new()), + dimension_attribute_source: Default::default(), last_selected_source: DomRefCell::new(None), image_decode_promises: DomRefCell::new(vec![]), line_number: creator.return_line_number(), @@ -1363,14 +1378,18 @@ impl HTMLImageElement { creator: ElementCreator, can_gc: CanGc, ) -> DomRoot { - Node::reflect_node_with_proto( + let image_element = Node::reflect_node_with_proto( Box::new(HTMLImageElement::new_inherited( local_name, prefix, document, creator, )), document, proto, can_gc, - ) + ); + image_element + .dimension_attribute_source + .set(Some(image_element.upcast())); + image_element } pub(crate) fn areas(&self) -> Option>> { @@ -1487,6 +1506,16 @@ impl<'dom> LayoutDom<'dom, HTMLImageElement> { fn current_request(self) -> &'dom ImageRequest { unsafe { self.unsafe_get().current_request.borrow_for_layout() } } + + #[allow(unsafe_code)] + fn dimension_attribute_source(self) -> LayoutDom<'dom, Element> { + unsafe { + self.unsafe_get() + .dimension_attribute_source + .get_inner_as_layout() + .expect("dimension attribute source should be always non-null") + } + } } impl LayoutHTMLImageElementHelpers for LayoutDom<'_, HTMLImageElement> { @@ -1504,18 +1533,16 @@ impl LayoutHTMLImageElementHelpers for LayoutDom<'_, HTMLImageElement> { } fn get_width(self) -> LengthOrPercentageOrAuto { - self.upcast::() + self.dimension_attribute_source() .get_attr_for_layout(&ns!(), &local_name!("width")) - .map(AttrValue::as_dimension) - .cloned() + .map(|x| *AttrValue::from_dimension(x.to_string()).as_dimension()) .unwrap_or(LengthOrPercentageOrAuto::Auto) } fn get_height(self) -> LengthOrPercentageOrAuto { - self.upcast::() + self.dimension_attribute_source() .get_attr_for_layout(&ns!(), &local_name!("height")) - .map(AttrValue::as_dimension) - .cloned() + .map(|x| *AttrValue::from_dimension(x.to_string()).as_dimension()) .unwrap_or(LengthOrPercentageOrAuto::Auto) } } diff --git a/tests/wpt/meta/html/rendering/replaced-elements/attributes-for-embedded-content-and-images/picture-aspect-ratio.html.ini b/tests/wpt/meta/html/rendering/replaced-elements/attributes-for-embedded-content-and-images/picture-aspect-ratio.html.ini index 5a433f19108..0497f82393a 100644 --- a/tests/wpt/meta/html/rendering/replaced-elements/attributes-for-embedded-content-and-images/picture-aspect-ratio.html.ini +++ b/tests/wpt/meta/html/rendering/replaced-elements/attributes-for-embedded-content-and-images/picture-aspect-ratio.html.ini @@ -31,9 +31,3 @@ [If we only have height attribute, we should get height mapped but no aspect ratio, even if has attributes.] expected: FAIL - - [Loaded picture test: with width and height attributes, without width and height attributes] - expected: FAIL - - [Loaded picture test: Both and are with width and height attributes] - expected: FAIL