Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(717)

Unified Diff: WebCore/platform/image-decoders/skia/ImageDecoderSkia.cpp

Issue 3573008: Merge 68446 - WebCore: ImageDecoderSkia.cpp needs to check for allocator fail... (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/517/
Patch Set: Created 10 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « WebCore/platform/image-decoders/qt/RGBA32BufferQt.cpp ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: WebCore/platform/image-decoders/skia/ImageDecoderSkia.cpp
===================================================================
--- WebCore/platform/image-decoders/skia/ImageDecoderSkia.cpp (revision 69026)
+++ WebCore/platform/image-decoders/skia/ImageDecoderSkia.cpp (working copy)
@@ -69,14 +69,14 @@
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)
« no previous file with comments | « WebCore/platform/image-decoders/qt/RGBA32BufferQt.cpp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698