Changeset 202800 in webkit

Timestamp:

Jul 3, 2016 11:30:28 PM (8 years ago)

Author:

Carlos Garcia Campos

Message:

[image-decoders] Make ImageDecoder::size() lazily decode the image if needed to return a valid size
​https://bugs.webkit.org/show_bug.cgi?id=159297

Reviewed by Antonio Gomes.

It's otherwise confusing leading to bugs like #159089.

• platform/image-decoders/ImageDecoder.cpp:

(WebCore::ImageDecoder::createFrameImageAtIndex): Check the size at the beginning and return early if it's
empty. We no longer need to check the size after calling frameBufferAtIndex().

• platform/image-decoders/ImageDecoder.h:

(WebCore::ImageDecoder::size): Check first is size is available, which lazily decodes the image.
(WebCore::ImageDecoder::scaledSize): Remove const.
(WebCore::ImageDecoder::frameSizeAtIndex): Ditto.

• platform/image-decoders/ico/ICOImageDecoder.cpp:

(WebCore::ICOImageDecoder::size): Ditto.
(WebCore::ICOImageDecoder::frameSizeAtIndex): Ditto.

• platform/image-decoders/ico/ICOImageDecoder.h:

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/image-decoders/ImageDecoder.cpp (modified) (1 diff)
• platform/image-decoders/ImageDecoder.h (modified) (2 diffs)
• platform/image-decoders/ico/ICOImageDecoder.cpp (modified) (1 diff)
• platform/image-decoders/ico/ICOImageDecoder.h (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2016-07-03  Carlos Garcia Campos  <cgarcia@igalia.com>
+
+        [image-decoders] Make ImageDecoder::size() lazily decode the image if needed to return a valid size
+        https://bugs.webkit.org/show_bug.cgi?id=159297
+
+        Reviewed by Antonio Gomes.
+
+        It's otherwise confusing leading to bugs like #159089.
+
+        * platform/image-decoders/ImageDecoder.cpp:
+        (WebCore::ImageDecoder::createFrameImageAtIndex): Check the size at the beginning and return early if it's
+        empty. We no longer need to check the size after calling frameBufferAtIndex().
+        * platform/image-decoders/ImageDecoder.h:
+        (WebCore::ImageDecoder::size): Check first is size is available, which lazily decodes the image.
+        (WebCore::ImageDecoder::scaledSize): Remove const.
+        (WebCore::ImageDecoder::frameSizeAtIndex): Ditto.
+        * platform/image-decoders/ico/ICOImageDecoder.cpp:
+        (WebCore::ICOImageDecoder::size): Ditto.
+        (WebCore::ICOImageDecoder::frameSizeAtIndex): Ditto.
+        * platform/image-decoders/ico/ICOImageDecoder.h:
+
 2016-07-02  Youenn Fablet  <youenn@apple.com>
 

trunk/Source/WebCore/platform/image-decoders/ImageDecoder.cpp

@@ -313 +313 @@
 NativeImagePtr ImageDecoder::createFrameImageAtIndex(size_t index, SubsamplingLevel)
 {
+    // Zero-height images can cause problems for some ports. If we have an empty image dimension, just bail.
+    if (size().isEmpty())
+        return nullptr;
+
     ImageFrame* buffer = frameBufferAtIndex(index);
-    // Zero-height images can cause problems for some ports. If we have an empty image dimension, just bail.
-    // It's important to check the size after calling frameBufferAtIndex() to ensure the decoder has updated the size.
-    // See https://bugs.webkit.org/show_bug.cgi?id=159089.
-    if (!buffer || buffer->status() == ImageFrame::FrameEmpty || size().isEmpty())
+    if (!buffer || buffer->status() == ImageFrame::FrameEmpty)
         return nullptr;
 

trunk/Source/WebCore/platform/image-decoders/ImageDecoder.h

@@ -272 +272 @@
         }
 
-        virtual IntSize size() const { return m_size; }
-
-        IntSize scaledSize() const
+        virtual IntSize size() { return isSizeAvailable() ? m_size : IntSize(); }
+
+        IntSize scaledSize()
         {
             return m_scaled ? IntSize(m_scaledColumns.size(), m_scaledRows.size()) : size();
@@ -284 +284 @@
         // composites any smaller frames against previous frames to create full-
         // size frames.
-        virtual IntSize frameSizeAtIndex(size_t, SubsamplingLevel) const
+        virtual IntSize frameSizeAtIndex(size_t, SubsamplingLevel)
         {
             return size();

trunk/Source/WebCore/platform/image-decoders/ico/ICOImageDecoder.cpp

@@ -79 +79 @@
 }
 
-IntSize ICOImageDecoder::size() const
+IntSize ICOImageDecoder::size()
 {
     return m_frameSize.isEmpty() ? ImageDecoder::size() : m_frameSize;
 }
 
-IntSize ICOImageDecoder::frameSizeAtIndex(size_t index, SubsamplingLevel) const
+IntSize ICOImageDecoder::frameSizeAtIndex(size_t index, SubsamplingLevel)
 {
     return (index && (index < m_dirEntries.size())) ? m_dirEntries[index].m_size : size();

trunk/Source/WebCore/platform/image-decoders/ico/ICOImageDecoder.h

@@ -48 +48 @@
         void setData(SharedBuffer&, bool allDataReceived) override;
         bool isSizeAvailable() override;
-        IntSize size() const override;
-        IntSize frameSizeAtIndex(size_t, SubsamplingLevel) const override;
+        IntSize size() override;
+        IntSize frameSizeAtIndex(size_t, SubsamplingLevel) override;
         bool setSize(unsigned width, unsigned height) override;
         size_t frameCount() override;