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

WebCore/platform/image-decoders/qt/RGBA32BufferQt.cpp

 /*
  * Copyright (C) 2006 Apple Computer, Inc.  All rights reserved.
  * Copyright (C) 2008, 2009 Google, Inc.
  * Copyright (C) 2009 Holger Hans Peter Freyther
  *
  * 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.
@@ skipping 57 matching lines @@
 
 void RGBA32Buffer::zeroFill()
 {
     if (m_pixmap.isNull() && !m_image.isNull()) {
         m_pixmap = QPixmap(m_image.width(), m_image.height());
         m_image = QImage();
     }
     m_pixmap.fill(QColor(0, 0, 0, 0));
 }
 
-void RGBA32Buffer::copyBitmapData(const RGBA32Buffer& other)
+bool RGBA32Buffer::copyBitmapData(const RGBA32Buffer& other)
 {
     if (this == &other)
-        return;
+        return true;
 
     m_image = other.m_image;
     m_pixmap = other.m_pixmap;
     m_size = other.m_size;
     m_hasAlpha = other.m_hasAlpha;
+    return true;
 }
 
 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_size = IntSize(newWidth, newHeight);
     m_image = QImage();
@@ skipping 44 matching lines @@
 {
     return m_size.width();
 }
 
 int RGBA32Buffer::height() const
 {
     return m_size.height();
 }
 
 }