Cherry-pick ddc412d. rdar://problem/101676331

Unreviewed, reverting r254127@main. https://bugs.webkit.org/show_bug.cgi?id=247297 Causes some images with loading=lazy to not load Reverted changeset: "Fix image-loading-lazy-multiple-times.html" https://bugs.webkit.org/show_bug.cgi?id=216979 https://commits.webkit.org/254127@main Canonical link: https://commits.webkit.org/256175@main Canonical link: https://commits.webkit.org/256138.56@safari-7615.1.12-branch
WebKit · Nov 14, 2022 · 4367e93 · 4367e93
1 parent 8f77fab
commit 4367e93
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 19 deletions.
diff --git a/...semantics/embedded-content/the-img-element/image-loading-lazy-multiple-times-expected.txt b/...semantics/embedded-content/the-img-element/image-loading-lazy-multiple-times-expected.txt
@@ -1,4 +1,4 @@
 
 
-PASS Images with loading='lazy' can be lazy loaded multiple times
+FAIL Images with loading='lazy' can be lazy loaded multiple times assert_unreached: The loading=lazy below-viewport image should lazily load its second image, and not load it eagerly when the `src` attribute is changed Reached unreachable code
 
diff --git a/...ts/html/semantics/embedded-content/the-img-element/image-loading-lazy-multiple-times.html b/...ts/html/semantics/embedded-content/the-img-element/image-loading-lazy-multiple-times.html
@@ -37,24 +37,19 @@
   function changeImageSourceAndScrollToTop() {
     top_div.scrollIntoView();
 
-    // Allow some time for scroll back to top, since we don't
-    // want the image to still be in the viewport and trigger a
-    // load due to the scroll being slow.
+    // Lazily load a "different" image.
+    image.src = 'resources/image.png?image-loading-lazy-multiple-times-second';
+    image.onload =
+      t.unreached_func("The loading=lazy below-viewport image should lazily " +
+                       "load its second image, and not load it eagerly when " +
+                       "the `src` attribute is changed");
+
+    // In 1s, scroll the image *back* into view, and record that it loads
+    // successfully.
     t.step_timeout(() => {
-      // Lazily load a "different" image.
-      image.src = 'resources/image.png?image-loading-lazy-multiple-times-second';
-      image.onload =
-        t.unreached_func("The loading=lazy below-viewport image should lazily " +
-                         "load its second image, and not load it eagerly when " +
-                         "the `src` attribute is changed");
-
-      // In 1s, scroll the image *back* into view, and record that it loads
-      // successfully.
-      t.step_timeout(() => {
-        image.onload = t.step_func_done();
-        image.scrollIntoView();
-      }, 1000);
-    }, 500);
+      image.onload = t.step_func_done();
+      image.scrollIntoView();
+    }, 1000);
   }
 </script>
 </body>
diff --git a/Source/WebCore/loader/ImageLoader.cpp b/Source/WebCore/loader/ImageLoader.cpp
@@ -251,7 +251,7 @@ void ImageLoader::updateFromElement(RelevantMutation relevantMutation)
 #if !LOG_DISABLED
             auto oldState = m_lazyImageLoadState;
 #endif
-            if (!isDeferred() && isImageElement) {
+            if (m_lazyImageLoadState == LazyImageLoadState::None && isImageElement) {
                 auto& imageElement = downcast<HTMLImageElement>(element());
                 if (imageElement.isLazyLoadable() && document.settings().lazyImageLoadingEnabled()) {
                     m_lazyImageLoadState = LazyImageLoadState::Deferred;