Cancel image loads if decoding failed (attempt #2)

third_party/WebKit/Source/platform/graphics/BitmapImage.cpp

 /*
  * Copyright (C) 2006 Samuel Weinig (sam.weinig@gmail.com)
  * Copyright (C) 2004, 2005, 2006, 2008 Apple Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
@@ skipping 171 matching lines @@
 {
     updateSize();
     return m_sizeRespectingOrientation;
 }
 
 bool BitmapImage::getHotSpot(IntPoint& hotSpot) const
 {
     return m_source.getHotSpot(hotSpot);
 }
 
-bool BitmapImage::setData(PassRefPtr<SharedBuffer> data, bool allDataReceived)
+Image::SizeAvailability BitmapImage::setData(PassRefPtr<SharedBuffer> data, bool allDataReceived)
 {
     if (!data.get())
-        return true;
+        return SizeAvailable;
 
     int length = data->size();
     if (!length)
-        return true;
+        return SizeAvailable;
 
-    m_source.setData(*data, allDataReceived);
+    // If ImageSource::setData() returns Invalid, we know that this is a decode error.
+    // Report size available so that it gets registered as such in ImageResource.
+    if (m_source.setData(*data, allDataReceived) == ImageDecoder::SniffResult::Invalid)
+        return SizeAvailable;
 
     return dataChanged(allDataReceived);
 }
 
-bool BitmapImage::dataChanged(bool allDataReceived)
+Image::SizeAvailability BitmapImage::dataChanged(bool allDataReceived)
 {
     TRACE_EVENT0("blink", "BitmapImage::dataChanged");
 
     // Clear all partially-decoded frames. For most image formats, there is only
     // one frame, but at least GIF and ICO can have more. With GIFs, the frames
     // come in order and we ask to decode them in order, waiting to request a
     // subsequent frame until the prior one is complete. Given that we clear
     // incomplete frames here, this means there is at most one incomplete frame
     // (even if we use destroyDecodedData() -- since it doesn't reset the
     // metadata), and it is after all the complete frames.
@@ skipping 15 matching lines @@
             m_frames[i].clear(true);
             if (i == m_cachedFrameIndex)
                 m_cachedFrame.clear();
         }
     }
 
     // Feed all the data we've seen so far to the image decoder.
     m_allDataReceived = allDataReceived;
 
     m_haveFrameCount = false;
-    return isSizeAvailable();
+    return isSizeAvailable() ? SizeAvailable : SizeUnavailable;
 }
 
 bool BitmapImage::hasColorProfile() const
 {
     return m_source.hasColorProfile();
 }
 
 String BitmapImage::filenameExtension() const
 {
     return m_source.filenameExtension();
@@ skipping 354 matching lines @@
 
     // We need to draw this frame if we advanced to it while not skipping, or if
     // while trying to skip frames we hit the last frame and thus had to stop.
     if (skippingFrames != advancedAnimation)
         getImageObserver()->animationAdvanced(this);
 
     return advancedAnimation;
 }
 
 } // namespace blink