Merge 68446 - WebCore: ImageDecoderSkia.cpp needs to check for allocator fail...

WebCore/platform/image-decoders/ImageDecoder.cpp

 /*
  * Copyright (C) 2008-2009 Torch Mobile, Inc.
  * Copyright (C) Research In Motion Limited 2009-2010. All rights reserved.
  *
  *  This library is free software; you can redistribute it and/or
  *  modify it under the terms of the GNU Library General Public
  *  License as published by the Free Software Foundation; either
  *  version 2 of the License, or (at your option) any later version.
  *
  *  This library is distributed in the hope that it will be useful,
@@ skipping 110 matching lines @@
     // frameComplete() may still need to read other metadata out of this frame
     // later.
 }
 
 void RGBA32Buffer::zeroFill()
 {
     m_bytes.fill(0);
     m_hasAlpha = true;
 }
 
-void RGBA32Buffer::copyBitmapData(const RGBA32Buffer& other)
+bool RGBA32Buffer::copyBitmapData(const RGBA32Buffer& other)
 {
     if (this == &other)
-        return;
+        return true;
 
     m_bytes = other.m_bytes;
     m_size = other.m_size;
     setHasAlpha(other.m_hasAlpha);
+    return true;
 }
 
 bool RGBA32Buffer::setSize(int newWidth, int newHeight)
 {
     // NOTE: This has no way to check for allocation failure if the requested
     // size was too big...
     m_bytes.resize(newWidth * newHeight);
     m_size = IntSize(newWidth, newHeight);
 
     // Zero the image.
@@ skipping 107 matching lines @@
 {
     return getScaledValue<LowerBound>(m_scaledRows, origY, searchStart);
 }
 
 int ImageDecoder::scaledY(int origY, int searchStart)
 {
     return getScaledValue<Exact>(m_scaledRows, origY, searchStart);
 }
 
 }