Changeset 249367 in webkit

Timestamp:

Sep 1, 2019 11:28:35 AM (5 years ago)

Author:

commit-queue@webkit.org

Message:

HTMLImageElement::decode() should return a resolved promise for decoding non bitmap images
​https://bugs.webkit.org/show_bug.cgi?id=201243

Patch by Said Abou-Hallawa <​sabouhallawa@apple.com> on 2019-09-01
Reviewed by Youenn Fablet.

LayoutTests/imported/w3c:

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

Source/WebCore:

The specs: ​https://html.spec.whatwg.org/multipage/embedded-content.html#dom-img-decode
states that, decode() should resolve the pending promise if the decoding
was requested for a non bitmap image.

Test: fast/images/decode-non-bitmap-image-resolve.html

• loader/ImageLoader.cpp:

(WebCore::resolveDecodePromises):
(WebCore::rejectDecodePromises):
(WebCore::ImageLoader::notifyFinished):
(WebCore::ImageLoader::decode):
(WebCore::ImageLoader::decodeError): Deleted.

• loader/ImageLoader.h:

(WebCore::ImageLoader::hasPendingDecodePromises const):

LayoutTests:

• fast/images/decode-non-bitmap-image-resolve-expected.txt: Added.
• fast/images/decode-non-bitmap-image-resolve.html: Added.
• fast/images/resources/green-100x100.svg: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/images/decode-non-bitmap-image-resolve-expected.txt (added)
• LayoutTests/fast/images/decode-non-bitmap-image-resolve.html (added)
• LayoutTests/fast/images/resources/green-100x100.svg (added)
• LayoutTests/imported/w3c/ChangeLog (modified) (1 diff)
• LayoutTests/imported/w3c/web-platform-tests/html/semantics/embedded-content/the-img-element/decode/image-decode-picture-expected.txt (modified) (1 diff)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/loader/ImageLoader.cpp (modified) (7 diffs)
• Source/WebCore/loader/ImageLoader.h (modified) (2 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2019-09-01  Said Abou-Hallawa  <sabouhallawa@apple.com>
+
+        HTMLImageElement::decode() should return a resolved promise for decoding non bitmap images
+        https://bugs.webkit.org/show_bug.cgi?id=201243
+
+        Reviewed by Youenn Fablet.
+
+        * fast/images/decode-non-bitmap-image-resolve-expected.txt: Added.
+        * fast/images/decode-non-bitmap-image-resolve.html: Added.
+        * fast/images/resources/green-100x100.svg: Added.
+
 2019-08-31  Said Abou-Hallawa  <sabouhallawa@apple.com>
 

trunk/LayoutTests/imported/w3c/ChangeLog

@@ +1 @@
+2019-09-01  Said Abou-Hallawa  <sabouhallawa@apple.com>
+
+        HTMLImageElement::decode() should return a resolved promise for decoding non bitmap images
+        https://bugs.webkit.org/show_bug.cgi?id=201243
+
+        Reviewed by Youenn Fablet.
+
+        * web-platform-tests/html/semantics/embedded-content/the-img-element/decode/image-decode-picture-expected.txt:
+
 2019-08-31  Rob Buis  <rbuis@igalia.com>
 

trunk/LayoutTests/imported/w3c/web-platform-tests/html/semantics/embedded-content/the-img-element/decode/image-decode-picture-expected.txt

@@ -4 +4 @@
 PASS HTMLImageElement.prototype.decode(), picture tests. Image with multiple sources decodes with undefined. 
 PASS HTMLImageElement.prototype.decode(), picture tests. Image with PNG data URL source decodes with undefined. 
-FAIL HTMLImageElement.prototype.decode(), picture tests. Image with SVG source decodes with undefined. promise_test: Unhandled rejection with value: object "EncodingError: Invalid image type."
+PASS HTMLImageElement.prototype.decode(), picture tests. Image with SVG source decodes with undefined. 
 PASS HTMLImageElement.prototype.decode(), picture tests. Non-existent source fails decode. 
 PASS HTMLImageElement.prototype.decode(), picture tests. Corrupt image in src fails decode. 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2019-09-01  Said Abou-Hallawa  <sabouhallawa@apple.com>
+
+        HTMLImageElement::decode() should return a resolved promise for decoding non bitmap images
+        https://bugs.webkit.org/show_bug.cgi?id=201243
+
+        Reviewed by Youenn Fablet.
+
+        The specs: https://html.spec.whatwg.org/multipage/embedded-content.html#dom-img-decode
+        states that, decode() should resolve the pending promise if the decoding
+        was requested for a non bitmap image.
+
+        Test: fast/images/decode-non-bitmap-image-resolve.html
+
+        * loader/ImageLoader.cpp:
+        (WebCore::resolveDecodePromises):
+        (WebCore::rejectDecodePromises):
+        (WebCore::ImageLoader::notifyFinished):
+        (WebCore::ImageLoader::decode):
+        (WebCore::ImageLoader::decodeError): Deleted.
+        * loader/ImageLoader.h:
+        (WebCore::ImageLoader::hasPendingDecodePromises const):
+
 2019-08-30  Brent Fulgham  <bfulgham@apple.com>
 

trunk/Source/WebCore/loader/ImageLoader.cpp

@@ -276 +276 @@
 }
 
+static inline void resolveDecodePromises(Vector<RefPtr<DeferredPromise>>&& promises)
+{
+    ASSERT(!promises.isEmpty());
+    for (auto& promise : promises)
+        promise->resolve();
+}
+
+static inline void rejectDecodePromises(Vector<RefPtr<DeferredPromise>>&& promises, const char* message)
+{
+    ASSERT(!promises.isEmpty());
+    for (auto& promise : promises)
+        promise->reject(Exception { EncodingError, message });
+}
+
 void ImageLoader::notifyFinished(CachedResource& resource)
 {
@@ -300 +314 @@
 
         if (hasPendingDecodePromises())
-            decodeError("Access control error.");
+            rejectDecodePromises(WTFMove(m_decodingPromises), "Access control error.");
         
         ASSERT(!m_hasPendingLoadEvent);
@@ -312 +326 @@
     if (m_image->wasCanceled()) {
         if (hasPendingDecodePromises())
-            decodeError("Loading was canceled.");
+            rejectDecodePromises(WTFMove(m_decodingPromises), "Loading was canceled.");
         m_hasPendingLoadEvent = false;
         // Only consider updating the protection ref-count of the Element immediately before returning
@@ -387 +401 @@
 {
     m_decodingPromises.append(WTFMove(promise));
-    
+
     if (!element().document().domWindow()) {
-        decodeError("Inactive document.");
-        return;
-    }
-    
+        rejectDecodePromises(WTFMove(m_decodingPromises), "Inactive document.");
+        return;
+    }
+
     AtomString attr = element().imageSourceURL();
     if (stripLeadingAndTrailingHTMLSpaces(attr).isEmpty()) {
-        decodeError("Missing source URL.");
-        return;
-    }
-    
+        rejectDecodePromises(WTFMove(m_decodingPromises), "Missing source URL.");
+        return;
+    }
+
     if (m_imageComplete)
         decode();
-}
-
-void ImageLoader::decodeError(const char* message)
-{
-    ASSERT(hasPendingDecodePromises());
-    for (auto& promise : m_decodingPromises)
-        promise->reject(Exception { EncodingError, message });
-    m_decodingPromises.clear();
 }
 
@@ -416 +422 @@
     
     if (!element().document().domWindow()) {
-        decodeError("Inactive document.");
+        rejectDecodePromises(WTFMove(m_decodingPromises), "Inactive document.");
         return;
     }
 
     if (!m_image || !m_image->image() || m_image->errorOccurred()) {
-        decodeError("Loading error.");
+        rejectDecodePromises(WTFMove(m_decodingPromises), "Loading error.");
         return;
     }
@@ -427 +433 @@
     Image* image = m_image->image();
     if (!is<BitmapImage>(image)) {
-        decodeError("Invalid image type.");
+        resolveDecodePromises(WTFMove(m_decodingPromises));
         return;
     }
@@ -433 +439 @@
     auto& bitmapImage = downcast<BitmapImage>(*image);
     bitmapImage.decode([promises = WTFMove(m_decodingPromises)]() mutable {
-        for (auto& promise : promises)
-            promise->resolve();
+        resolveDecodePromises(WTFMove(promises));
     });
 }

trunk/Source/WebCore/loader/ImageLoader.h

@@ -96 +96 @@
 
     bool hasPendingDecodePromises() const { return !m_decodingPromises.isEmpty(); }
-    void decodeError(const char*);
     void decode();
     
@@ -106 +105 @@
     RefPtr<Element> m_protectedElement;
     AtomString m_failedLoadURL;
-    Vector<RefPtr<DeferredPromise>, 1> m_decodingPromises;
+    Vector<RefPtr<DeferredPromise>> m_decodingPromises;
     bool m_hasPendingBeforeLoadEvent : 1;
     bool m_hasPendingLoadEvent : 1;