Changeset 276679 in webkit

Timestamp:

Apr 27, 2021 4:40:17 PM (15 months ago)

Author:

Cameron McCormack

Message:

Associate a picture element with an img only if the img is a direct child.
​https://bugs.webkit.org/show_bug.cgi?id=225044

Reviewed by Ryosuke Niwa.

LayoutTests/imported/w3c:

• web-platform-tests/html/semantics/embedded-content/the-img-element/img-picture-ancestor-expected.txt: Added.
• web-platform-tests/html/semantics/embedded-content/the-img-element/img-picture-ancestor.html: Added.

Source/WebCore:

Test: imported/w3c/web-platform-tests/html/semantics/embedded-content/the-img-element/img-picture-ancestor.html

• html/HTMLImageElement.cpp:

(WebCore::HTMLImageElement::insertedIntoAncestor):
(WebCore::HTMLImageElement::removedFromAncestor):

• html/parser/HTMLConstructionSite.cpp:

(WebCore::HTMLConstructionSite::createHTMLElementOrFindCustomElementInterface):

Location:

trunk

Files:

• LayoutTests/imported/w3c/ChangeLog (modified) (1 diff)
• LayoutTests/imported/w3c/web-platform-tests/html/semantics/embedded-content/the-img-element/img-picture-ancestor-expected.txt (added)
• LayoutTests/imported/w3c/web-platform-tests/html/semantics/embedded-content/the-img-element/img-picture-ancestor.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/html/HTMLImageElement.cpp (modified) (2 diffs)
• Source/WebCore/html/parser/HTMLConstructionSite.cpp (modified) (1 diff)

trunk/LayoutTests/imported/w3c/ChangeLog

@@ +1 @@
+2021-04-27  Cameron McCormack  <heycam@apple.com>
+
+        Associate a picture element with an img only if the img is a direct child.
+        https://bugs.webkit.org/show_bug.cgi?id=225044
+
+        Reviewed by Ryosuke Niwa.
+
+        * web-platform-tests/html/semantics/embedded-content/the-img-element/img-picture-ancestor-expected.txt: Added.
+        * web-platform-tests/html/semantics/embedded-content/the-img-element/img-picture-ancestor.html: Added.
+
 2021-04-27  Alexey Shvayka  <shvaikalesh@gmail.com>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2021-04-27  Cameron McCormack  <heycam@apple.com>
+
+        Associate a picture element with an img only if the img is a direct child.
+        https://bugs.webkit.org/show_bug.cgi?id=225044
+
+        Reviewed by Ryosuke Niwa.
+
+        Test: imported/w3c/web-platform-tests/html/semantics/embedded-content/the-img-element/img-picture-ancestor.html
+
+        * html/HTMLImageElement.cpp:
+        (WebCore::HTMLImageElement::insertedIntoAncestor):
+        (WebCore::HTMLImageElement::removedFromAncestor):
+        * html/parser/HTMLConstructionSite.cpp:
+        (WebCore::HTMLConstructionSite::createHTMLElementOrFindCustomElementInterface):
+
 2021-04-27  Chris Dumez  <cdumez@apple.com>
 

trunk/Source/WebCore/html/HTMLImageElement.cpp

@@ -383 +383 @@
         treeScope().addImageElementByUsemap(*m_parsedUsemap.impl(), *this);
 
-    if (is<HTMLPictureElement>(&parentOfInsertedTree)) {
+    if (is<HTMLPictureElement>(&parentOfInsertedTree) && &parentOfInsertedTree == parentElement()) {
+        // FIXME: When the hack in HTMLConstructionSite::createHTMLElementOrFindCustomElementInterface to eagerly call setPictureElement is removed, we can just assert !pictureElement().
+        ASSERT(!pictureElement() || pictureElement() == &parentOfInsertedTree);
         setPictureElement(&downcast<HTMLPictureElement>(parentOfInsertedTree));
+        // FIXME: We should unconditionally call selectImageSource so that source selection is performed even for <img> elements outside the document.
         if (insertionType.connectedToDocument) {
             selectImageSource(RelevantMutation::Yes);
@@ -412 +415 @@
         oldParentOfRemovedTree.treeScope().removeImageElementByUsemap(*m_parsedUsemap.impl(), *this);
 
-    if (is<HTMLPictureElement>(oldParentOfRemovedTree)) {
+    if (is<HTMLPictureElement>(oldParentOfRemovedTree) && !parentElement()) {
+        ASSERT(pictureElement() == &oldParentOfRemovedTree);
         setPictureElement(nullptr);
+        // FIXME: We should call selectImageSource so that source selection is performed, now that we no longer have a <picture> context.
         m_imageLoader->updateFromElementIgnoringPreviousError(RelevantMutation::Yes);
     }

trunk/Source/WebCore/html/parser/HTMLConstructionSite.cpp

@@ -696 +696 @@
     // FIXME: This is a hack to connect images to pictures before the image has
     // been inserted into the document. It can be removed once asynchronous image
-    // loading is working.
+    // loading is working. When this hack is removed, the assertion just before
+    // the setPictureElement() call in HTMLImageElement::insertedIntoAncestor
+    // can be simplified.
     if (is<HTMLPictureElement>(currentNode()) && is<HTMLImageElement>(*element))
         downcast<HTMLImageElement>(*element).setPictureElement(&downcast<HTMLPictureElement>(currentNode()));