From dd8bb3de4f353a81954234999f1fea748aee2ea9 Mon Sep 17 00:00:00 2001 From: Ben Murdoch Date: Wed, 11 Aug 2010 14:44:44 +0100 Subject: Merge WebKit at r65072 : Initial merge by git. Change-Id: Ibcf418498376b2660aacb7f8d46ea7085ef91585 --- WebCore/platform/graphics/skia/ImageBufferSkia.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'WebCore/platform/graphics/skia/ImageBufferSkia.cpp') diff --git a/WebCore/platform/graphics/skia/ImageBufferSkia.cpp b/WebCore/platform/graphics/skia/ImageBufferSkia.cpp index 3eb033d..eaa91ec 100644 --- a/WebCore/platform/graphics/skia/ImageBufferSkia.cpp +++ b/WebCore/platform/graphics/skia/ImageBufferSkia.cpp @@ -131,7 +131,7 @@ PassRefPtr getImageData(const IntRect& rect, const SkBitmap& bitmap, if (bitmap.config() == SkBitmap::kNo_Config) { // This is an empty SkBitmap that could not be configured. - ASSERT(size.width() == 0 || size.height() == 0); + ASSERT(!size.width() || !size.height()); return result; } -- cgit v1.1