Source/WebCore/platform/image-encoders/skia/PNGImageEncoder.cpp - Issue 11876030: Merge 138170

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: Source/WebCore/platform/image-encoders/skia/PNGImageEncoder.cpp

Issue 11876030: Merge 138170 (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/1364/

Patch Set: Created 7 years, 11 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:

Index: Source/WebCore/platform/image-encoders/skia/PNGImageEncoder.cpp

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

--- Source/WebCore/platform/image-encoders/skia/PNGImageEncoder.cpp (revision 139669)

+++ Source/WebCore/platform/image-encoders/skia/PNGImageEncoder.cpp (working copy)

@@ -118,7 +118,7 @@

{

SkAutoLockPixels bitmapLock(bitmap);

- if (bitmap.config() != SkBitmap::kARGB_8888_Config)

+ if (bitmap.config() != SkBitmap::kARGB_8888_Config || !bitmap.getPixels())

return false; // Only support 32 bit/pixel skia bitmaps.

return encodePixels(IntSize(bitmap.width(), bitmap.height()), static_cast<unsigned char*>(bitmap.getPixels()), true, output);