Changeset 74148 in webkit

Timestamp:

Dec 15, 2010 3:26:40 PM (13 years ago)

Author:

mdelaney@apple.com

Message:

2010-12-15 Matthew Delaney <​mdelaney@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:

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/graphics/cg/ImageBufferCG.cpp (modified) (1 diff)

trunk/WebCore/ChangeLog

@@ +1 @@
+2010-12-15  Matthew Delaney  <mdelaney@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@google.com>
 

trunk/WebCore/platform/graphics/cg/ImageBufferCG.cpp

@@ -64 +64 @@
 
     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;