Changeset 215574 in webkit

Timestamp:

Apr 20, 2017 1:09:47 PM (7 years ago)

Author:

commit-queue@webkit.org

Message:

CachedImage should cancel loading images for unsupported/unknown types
​https://bugs.webkit.org/show_bug.cgi?id=170697

Patch by Said Abou-Hallawa <​sabouhallawa@apple.com> on 2017-04-20
Reviewed by Youenn Fablet.

Currently when the image decoder detects an error with the incoming encoded
data of an image, we mark the image to be a broken image. But the network
process keeps feeding the web process with the rest of the data. We should
cancel loading the rest of the data to save network bandwidth and CPU time
loading and processing useless data.

• loader/cache/CachedImage.cpp:

(WebCore::CachedImage::addIncrementalDataBuffer):
(WebCore::CachedImage::finishLoading):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• loader/cache/CachedImage.cpp (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2017-04-20  Said Abou-Hallawa  <sabouhallawa@apple.com>
+
+        CachedImage should cancel loading images for unsupported/unknown types
+        https://bugs.webkit.org/show_bug.cgi?id=170697
+
+        Reviewed by Youenn Fablet.
+
+        Currently when the image decoder detects an error with the incoming encoded
+        data of an image, we mark the image to be a broken image. But the network
+        process keeps feeding the web process with the rest of the data. We should
+        cancel loading the rest of the data to save network bandwidth and CPU time
+        loading and processing useless data.
+
+        * loader/cache/CachedImage.cpp:
+        (WebCore::CachedImage::addIncrementalDataBuffer):
+        (WebCore::CachedImage::finishLoading):
+
 2017-04-20  Aaron Chu  <aaron_chu@apple.com>
 

trunk/Source/WebCore/loader/cache/CachedImage.cpp

@@ -407 +407 @@
         // Image decoding failed. Either we need more image data or the image data is malformed.
         error(errorOccurred() ? status() : DecodeError);
+        if (m_loader && encodedDataStatus == EncodedDataStatus::Error)
+            m_loader->cancel();
         if (inCache())
             MemoryCache::singleton().remove(*this);
@@ -441 +443 @@
         createImage();
 
-    if (m_image)
-        m_image->setData(data, true);
-
-    if (!m_image || m_image->isNull()) {
+    EncodedDataStatus encodedDataStatus = m_image ? m_image->setData(data, true) : EncodedDataStatus::Error;
+
+    if (encodedDataStatus == EncodedDataStatus::Error || m_image->isNull()) {
         // Image decoding failed; the image data is malformed.
         error(errorOccurred() ? status() : DecodeError);