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

[mdelaney at apple.com]

The following commit has been merged in the debian/experimental branch:
commit 1ea167fe75ea25b930216dc35d6fefb0f6a03a2a
Author: mdelaney at apple.com <mdelaney at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Dec 15 23:26:40 2010 +0000

    2010-12-15  Matthew Delaney  <mdelaney at apple.com>
    
            Reviewed by Simon Fraser.
    
            IOSurface bounds checks on bytesPerRow and allocSize are incorrect
            https://bugs.webkit.org/show_bug.cgi?id=51137
    
            No new tests added. For those using this new functionality, many current canvas layout tests will now pass.
    
            * platform/graphics/cg/ImageBufferCG.cpp:
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@74148 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index d02e4fc..e25b2e3 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,14 @@
+2010-12-15  Matthew Delaney  <mdelaney at apple.com>
+
+        Reviewed by Simon Fraser.
+
+        IOSurface bounds checks on bytesPerRow and allocSize are incorrect
+        https://bugs.webkit.org/show_bug.cgi?id=51137
+
+        No new tests added. For those using this new functionality, many current canvas layout tests will now pass.
+
+        * platform/graphics/cg/ImageBufferCG.cpp:
+
 2010-12-15  Kenneth Russell  <kbr at google.com>
 
         Reviewed by James Robinson.
diff --git a/WebCore/platform/graphics/cg/ImageBufferCG.cpp b/WebCore/platform/graphics/cg/ImageBufferCG.cpp
index ae32646..7bc47f2 100644
--- a/WebCore/platform/graphics/cg/ImageBufferCG.cpp
+++ b/WebCore/platform/graphics/cg/ImageBufferCG.cpp
@@ -63,11 +63,11 @@ static RetainPtr<IOSurfaceRef> createIOSurface(const IntSize& size)
     int height = size.height();
 
     unsigned long bytesPerRow = IOSurfaceAlignProperty(kIOSurfaceBytesPerRow, size.width() * bytesPerElement);
-    if (!bytesPerRow || bytesPerRow != (size.width() * bytesPerElement))
+    if (!bytesPerRow)
         return 0;
 
     unsigned long allocSize = IOSurfaceAlignProperty(kIOSurfaceAllocSize, size.height() * bytesPerRow);
-    if (!allocSize || allocSize != (size.height() * bytesPerRow))
+    if (!allocSize)
         return 0;
 
     const void *keys[6];

-- 
WebKit Debian packaging