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

Unified Diff: WebCore/platform/image-decoders/ImageDecoder.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
Index: WebCore/platform/image-decoders/ImageDecoder.cpp
===================================================================
--- WebCore/platform/image-decoders/ImageDecoder.cpp (revision 69026)
+++ WebCore/platform/image-decoders/ImageDecoder.cpp (working copy)
@@ -128,14 +128,15 @@
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)
« no previous file with comments | « WebCore/platform/image-decoders/ImageDecoder.h ('k') | WebCore/platform/image-decoders/gif/GIFImageDecoder.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698