[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc

[commit-queue at webkit.org]

The following commit has been merged in the debian/experimental branch:
commit d6bdab0101842ce8fee01734f80460426da8eb6d
Author: commit-queue at webkit.org <commit-queue at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Aug 6 03:47:41 2010 +0000

    2010-08-05  Cosmin Truta  <ctruta at chromium.org>
    
            Reviewed by Eric Seidel.
    
            Apply a stylistic fix to the patch 62640.
            https://bug-41175-attachments.webkit.org/attachment.cgi?id=62640
            https://bugs.webkit.org/show_bug.cgi?id=41175
    
            * WebCore/platform/graphics/skia/ImageBufferSkia.cpp:
            (getImageData):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@64813 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 1a70ad0..4b4dd29 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,14 @@
+2010-08-05  Cosmin Truta  <ctruta at chromium.org>
+
+        Reviewed by Eric Seidel.
+
+        Apply a stylistic fix to the patch 62640.
+        https://bug-41175-attachments.webkit.org/attachment.cgi?id=62640
+        https://bugs.webkit.org/show_bug.cgi?id=41175
+
+        * WebCore/platform/graphics/skia/ImageBufferSkia.cpp:
+        (getImageData):
+
 2010-08-05  Patrick Gansterer  <paroga at paroga.com>
 
         Reviewed by Adam Roben.
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<ImageData> 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;
     }
 

-- 
WebKit Debian packaging