Changeset 294729 in webkit

Timestamp:

May 23, 2022, 10:13:48 PM (4 years ago)

Author:

commit-queue@webkit.org

Message:

REGRESSION (250413@main): [ iOS ] system-preview/badge.html is a consistent image failure
​https://bugs.webkit.org/show_bug.cgi?id=240352
rdar://93191053

Patch by Antoine Quint <Antoine Quint> on 2022-05-23
Reviewed by Simon Fraser.

In the case of an ARKit image, we should only be returning when we don't
have a native image to record, otherwise the system image itself needs
to be recorded as well.

• LayoutTests/platform/ios-wk2/TestExpectations:
• Source/WebCore/platform/graphics/displaylists/DisplayListRecorder.cpp:

(WebCore::DisplayList::Recorder::drawSystemImage):

Canonical link: ​https://commits.webkit.org/250907@main

Location:

trunk

Files:

• LayoutTests/platform/ios-wk2/TestExpectations (modified) (1 diff)
• Source/WebCore/platform/graphics/displaylists/DisplayListRecorder.cpp (modified) (1 diff)

trunk/LayoutTests/platform/ios-wk2/TestExpectations

@@ -2237 +2237 @@
 fast/text/install-font-style-recalc.html [ Pass ]
 
-webkit.org/b/240352 system-preview/badge.html [ ImageOnlyFailure ]
-
 # webkit.org/b/240579 Disabling the following http/tests/workers/service/shownotification layout-tests on iOS
 http/tests/workers/service/shownotification-allowed-document.html [ Skip ]

trunk/Source/WebCore/platform/graphics/displaylists/DisplayListRecorder.cpp

@@ -206 +206 @@
     if (is<ARKitBadgeSystemImage>(systemImage)) {
         if (auto image = downcast<ARKitBadgeSystemImage>(systemImage).image()) {
-            if (auto nativeImage = image->nativeImage())
-                recordResourceUse(*nativeImage);
+            auto nativeImage = image->nativeImage();
+            if (!nativeImage)
+                return;
+            recordResourceUse(*nativeImage);
         }
-        return;
     }
 #endif