Title: [139670] branches/chromium/1364/Source/WebCore/platform/image-encoders/skia
- Revision
- 139670
- Author
- [email protected]
- Date
- 2013-01-14 14:46:32 -0800 (Mon, 14 Jan 2013)
Log Message
Merge 138170
BUG=162551
Review URL: https://codereview.chromium.org/11876030
Modified Paths
Diff
Modified: branches/chromium/1364/Source/WebCore/platform/image-encoders/skia/JPEGImageEncoder.cpp (139669 => 139670)
--- branches/chromium/1364/Source/WebCore/platform/image-encoders/skia/JPEGImageEncoder.cpp 2013-01-14 22:44:02 UTC (rev 139669)
+++ branches/chromium/1364/Source/WebCore/platform/image-encoders/skia/JPEGImageEncoder.cpp 2013-01-14 22:46:32 UTC (rev 139670)
@@ -188,7 +188,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, quality, output);
Modified: branches/chromium/1364/Source/WebCore/platform/image-encoders/skia/PNGImageEncoder.cpp (139669 => 139670)
--- branches/chromium/1364/Source/WebCore/platform/image-encoders/skia/PNGImageEncoder.cpp 2013-01-14 22:44:02 UTC (rev 139669)
+++ branches/chromium/1364/Source/WebCore/platform/image-encoders/skia/PNGImageEncoder.cpp 2013-01-14 22:46:32 UTC (rev 139670)
@@ -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);
Modified: branches/chromium/1364/Source/WebCore/platform/image-encoders/skia/WEBPImageEncoder.cpp (139669 => 139670)
--- branches/chromium/1364/Source/WebCore/platform/image-encoders/skia/WEBPImageEncoder.cpp 2013-01-14 22:44:02 UTC (rev 139669)
+++ branches/chromium/1364/Source/WebCore/platform/image-encoders/skia/WEBPImageEncoder.cpp 2013-01-14 22:46:32 UTC (rev 139670)
@@ -122,7 +122,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, quality, output);
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo/webkit-changes
