Changeset 199764 in webkit

Timestamp:

Apr 19, 2016 11:02:24 PM (8 years ago)

Author:

Carlos Garcia Campos

Message:

REGRESSION(r198782): SHOULD NEVER BE REACHED failure in ImageSource::setData since r198782
​https://bugs.webkit.org/show_bug.cgi?id=156690

Reviewed by Michael Catanzaro.

The assertion is wrong, because it assumes that ImageDecoder::create() always returns a valid pointer, which is
only true for the CG implementation. The non CG implementation can return nullptr if there isn't enough data to
figure out the image format or if the image format is not supported. This is causing several crashes in the
debug bots.

• platform/graphics/ImageSource.cpp:

(WebCore::ImageSource::setData): Remove the invalid ASSERT and return early if we fail to create the decoder.
(WebCore::ImageSource::ensureDecoderIsCreated): Deleted.

• platform/graphics/ImageSource.h:

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/graphics/ImageSource.cpp (modified) (1 diff)
• platform/graphics/ImageSource.h (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2016-04-19  Carlos Garcia Campos  <cgarcia@igalia.com>
+
+        REGRESSION(r198782): SHOULD NEVER BE REACHED failure in ImageSource::setData since r198782
+        https://bugs.webkit.org/show_bug.cgi?id=156690
+
+        Reviewed by Michael Catanzaro.
+
+        The assertion is wrong, because it assumes that ImageDecoder::create() always returns a valid pointer, which is
+        only true for the CG implementation. The non CG implementation can return nullptr if there isn't enough data to
+        figure out the image format or if the image format is not supported. This is causing several crashes in the
+        debug bots.
+
+        * platform/graphics/ImageSource.cpp:
+        (WebCore::ImageSource::setData): Remove the invalid ASSERT and return early if we fail to create the decoder.
+        (WebCore::ImageSource::ensureDecoderIsCreated): Deleted.
+        * platform/graphics/ImageSource.h:
+
 2016-04-19  Brent Fulgham  <bfulgham@apple.com>
 

trunk/Source/WebCore/platform/graphics/ImageSource.cpp

@@ -72 +72 @@
 }
 
-void ImageSource::ensureDecoderIsCreated(const SharedBuffer& data)
-{
-    if (initialized())
-        return;
-    
-    m_decoder = ImageDecoder::create(data, m_alphaOption, m_gammaAndColorProfileOption);
-}
-
 void ImageSource::setData(SharedBuffer* data, bool allDataReceived)
 {
     if (!data)
         return;
-    
-    ensureDecoderIsCreated(*data);
-    
+
     if (!initialized()) {
-        ASSERT_NOT_REACHED();
-        return;
+        m_decoder = ImageDecoder::create(*data, m_alphaOption, m_gammaAndColorProfileOption);
+        if (!m_decoder)
+            return;
     }
 
-    if (m_decoder)
-        m_decoder->setData(*data, allDataReceived);
+    m_decoder->setData(*data, allDataReceived);
 }
 

trunk/Source/WebCore/platform/graphics/ImageSource.h

@@ -145 +145 @@
 private:
     void clearFrameBufferCache(size_t);
-    void ensureDecoderIsCreated(const SharedBuffer&);
     SubsamplingLevel calculateMaximumSubsamplingLevel() const;
     void dump(TextStream&) const;