Cancel image loads if decoding failed (attempt #2)

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

 /*
  * Copyright (C) 2006 Samuel Weinig (sam.weinig@gmail.com)
  * Copyright (C) 2004, 2005, 2006 Apple Computer, 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 64 matching lines @@
     RefPtr<Image> image = BitmapImage::create();
     image->setData(resource, true);
     return image.release();
 }
 
 bool Image::supportsType(const String& type)
 {
     return MIMETypeRegistry::isSupportedImageResourceMIMEType(type);
 }
 
-bool Image::setData(PassRefPtr<SharedBuffer> data, bool allDataReceived)
+Image::SizeAvailability Image::setData(PassRefPtr<SharedBuffer> data, bool allDataReceived)
 {
     m_encodedImageData = data;
     if (!m_encodedImageData.get())
-        return true;
+        return SizeAvailable;
 
     int length = m_encodedImageData->size();
     if (!length)
-        return true;
+        return SizeAvailable;
 
     return dataChanged(allDataReceived);
 }
 
 void Image::drawTiled(GraphicsContext& ctxt, const FloatRect& destRect, const FloatPoint& srcPoint, const FloatSize& scaledTileSize, SkXfermode::Mode op, const FloatSize& repeatSpacing)
 {
     FloatSize intrinsicTileSize = FloatSize(size());
     if (hasRelativeSize()) {
         intrinsicTileSize.setWidth(scaledTileSize.width());
         intrinsicTileSize.setHeight(scaledTileSize.height());
@@ skipping 194 matching lines @@
     FloatRect subset = dest;
     subset.setX((dest.x() - tile.x()) / scale.width());
     subset.setY((dest.y() - tile.y()) / scale.height());
     subset.setWidth(dest.width() / scale.width());
     subset.setHeight(dest.height() / scale.height());
 
     return subset;
 }
 
 } // namespace blink