WebCore/platform/image-decoders/qt/RGBA32BufferQt.cpp - Issue 3573008: Merge 68446 - WebCore: ImageDecoderSkia.cpp needs to check for allocator fail...

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: WebCore/platform/image-decoders/qt/RGBA32BufferQt.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/gif/GIFImageDecoder.cpp ('k') | WebCore/platform/image-decoders/skia/ImageDecoderSkia.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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

===================================================================

--- WebCore/platform/image-decoders/qt/RGBA32BufferQt.cpp (revision 69026)

+++ WebCore/platform/image-decoders/qt/RGBA32BufferQt.cpp (working copy)

@@ -75,15 +75,16 @@

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)