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

WebCore/platform/image-decoders/skia/ImageDecoderSkia.cpp

 /*
  * Copyright (C) 2006 Apple Computer, Inc.  All rights reserved.
  * Copyright (C) 2008, 2009 Google, Inc.
  *
  * 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 51 matching lines @@
     // calls this to free the bitmap data, but other functions like
     // initFrameBuffer() and frameComplete() may still need to read
     // other metadata out of this frame later.
 }
 
 void RGBA32Buffer::zeroFill()
 {
     m_bitmap.eraseARGB(0, 0, 0, 0);
 }
 
-void RGBA32Buffer::copyBitmapData(const RGBA32Buffer& other)
+bool RGBA32Buffer::copyBitmapData(const RGBA32Buffer& other)
 {
     if (this == &other)
-        return;
+        return true;
 
     m_bitmap.reset();
     const NativeImageSkia& otherBitmap = other.m_bitmap;
-    otherBitmap.copyTo(&m_bitmap, otherBitmap.config());
+    return otherBitmap.copyTo(&m_bitmap, otherBitmap.config());
 }
 
 bool RGBA32Buffer::setSize(int newWidth, int newHeight)
 {
     // This function should only be called once, it will leak memory
     // otherwise.
     ASSERT(width() == 0 && height() == 0);
     m_bitmap.setConfig(SkBitmap::kARGB_8888_Config, newWidth, newHeight);
     if (!m_bitmap.allocPixels())
         return false;
@@ skipping 30 matching lines @@
 {
     return m_bitmap.width();
 }
 
 int RGBA32Buffer::height() const
 {
     return m_bitmap.height();
 }
 
 } // namespace WebCore