Changeset 277507 in webkit

Timestamp:

May 14, 2021, 3:02:15 PM (4 years ago)

Author:

Jean-Yves Avenard

Message:

Bad media session artwork URL results in blue "broken image" icon being shown in Now Playing
​https://bugs.webkit.org/show_bug.cgi?id=225799
rdar://77990886

Reviewed by Eric Carlson.

Source/WebCore:

By default, when the image's URL doesn't point to an image the CachedImage
will return a default image consistent of a blue interrogation mark.
We need to explicitely check that an error occurred. The naming used in the
method didn't make this need obvious.

• Modules/mediasession/MediaMetadata.cpp:

(WebCore::ArtworkImageLoader::notifyFinished): Check for a status error.

• testing/Internals.cpp:

(WebCore::Internals::loadArtworkImage): Fix spelling

LayoutTests:

• fast/mediasession/metadata/artworkdownload-expected.txt:
• fast/mediasession/metadata/artworkdownload.html: Add test case.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/mediasession/metadata/artworkdownload-expected.txt (modified) (1 diff)
• LayoutTests/fast/mediasession/metadata/artworkdownload.html (modified) (1 diff)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/Modules/mediasession/MediaMetadata.cpp (modified) (1 diff)
• Source/WebCore/testing/Internals.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2021-05-14  Jean-Yves Avenard  <jya@apple.com>
+
+        Bad media session artwork URL results in blue "broken image" icon being shown in Now Playing
+        https://bugs.webkit.org/show_bug.cgi?id=225799
+        rdar://77990886
+
+        Reviewed by Eric Carlson.
+
+        * fast/mediasession/metadata/artworkdownload-expected.txt:
+        * fast/mediasession/metadata/artworkdownload.html: Add test case.
+
 2021-05-14  Lauro Moura  <lmoura@igalia.com>
 

trunk/LayoutTests/fast/mediasession/metadata/artworkdownload-expected.txt

@@ -1 +1 @@
 
 PASS ensure loading artwork image method operates properly
+PASS ensure loading invalid artwork causes a failure
+PASS ensure loading a non-image causes a failure
 

trunk/LayoutTests/fast/mediasession/metadata/artworkdownload.html

@@ -10 +10 @@
 promise_test((test) => {
     if (!window.internals)
-        var promise = Promise.resolve();
-    else {
-        var promise = internals.loadArtworkImage(IMAGE_SRC).then((data) => {
-            assert_equals(data.width, 16);
-            assert_equals(data.height, 16);
-        });;
-    }
-    return promise;
+        return Promise.rejects("Test needs internals");
+    return internals.loadArtworkImage(IMAGE_SRC).then((data) => {
+        assert_equals(data.width, 16);
+        assert_equals(data.height, 16);
+    });
 }, "ensure loading artwork image method operates properly");
+
+promise_test(async (test) => {
+    if (!window.internals)
+        return Promise.rejects("Test needs internals");
+
+    return promise_rejects(test, 'InvalidAccessError', internals.loadArtworkImage("bad_image.jpg"));
+}, "ensure loading invalid artwork causes a failure");
+
+promise_test(async (test) => {
+    if (!window.internals)
+        return Promise.rejects("Test needs internals");
+
+    return promise_rejects(test, 'InvalidAccessError', internals.loadArtworkImage(""));
+}, "ensure loading a non-image causes a failure");
 
         </script>

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2021-05-14  Jean-Yves Avenard  <jya@apple.com>
+
+        Bad media session artwork URL results in blue "broken image" icon being shown in Now Playing
+        https://bugs.webkit.org/show_bug.cgi?id=225799
+        rdar://77990886
+
+        Reviewed by Eric Carlson.
+
+        By default, when the image's URL doesn't point to an image the CachedImage
+        will return a default image consistent of a blue interrogation mark.
+        We need to explicitely check that an error occurred. The naming used in the
+        method didn't make this need obvious.
+
+        * Modules/mediasession/MediaMetadata.cpp:
+        (WebCore::ArtworkImageLoader::notifyFinished): Check for a status error.
+        * testing/Internals.cpp:
+        (WebCore::Internals::loadArtworkImage): Fix spelling
+
 2021-05-14  Devin Rousso  <drousso@apple.com>
 

trunk/Source/WebCore/Modules/mediasession/MediaMetadata.cpp

@@ -73 +73 @@
 {
     ASSERT_UNUSED(resource, &resource == m_cachedImage);
-    if (m_cachedImage->loadFailedOrCanceled() || !m_cachedImage->image() || !m_cachedImage->image()->data() || m_cachedImage->image()->data()->isEmpty()) {
+    if (m_cachedImage->loadFailedOrCanceled() || m_cachedImage->errorOccurred() || !m_cachedImage->image() || !m_cachedImage->image()->data() || m_cachedImage->image()->data()->isEmpty()) {
         m_callback(nullptr);
         return;

trunk/Source/WebCore/testing/Internals.cpp

@@ -6218 +6218 @@
                 m_artworkImagePromise->reject(imageData.exception().code());
         } else
-            m_artworkImagePromise->reject(Exception { InvalidAccessError, "No image retrieve."  });
+            m_artworkImagePromise->reject(Exception { InvalidAccessError, "No image retrieved."  });
         m_artworkImagePromise = nullptr;
     });