Changeset 63526 in webkit

Timestamp:

Jul 16, 2010 12:12:28 AM (14 years ago)

Author:

hamaji@chromium.org

Message:

2010-07-16 Shinichiro Hamaji <​hamaji@chromium.org>

Unreviewed tiger build fix.

Printing test results differ between machines, we should use ImageDiff instead
​https://bugs.webkit.org/show_bug.cgi?id=20011

• DumpRenderTree/mac/PixelDumpSupportMac.mm: (createBitmapContext): (createBitmapContextFromWebView):

Location:

trunk/WebKitTools

Files:

• ChangeLog (modified) (1 diff)
• DumpRenderTree/mac/PixelDumpSupportMac.mm (modified) (2 diffs)

trunk/WebKitTools/ChangeLog

@@ +1 @@
+2010-07-16  Shinichiro Hamaji  <hamaji@chromium.org>
+
+        Unreviewed tiger build fix.
+
+        Printing test results differ between machines, we should use ImageDiff instead
+        https://bugs.webkit.org/show_bug.cgi?id=20011
+
+        * DumpRenderTree/mac/PixelDumpSupportMac.mm:
+        (createBitmapContext):
+        (createBitmapContextFromWebView):
+
 2010-07-15  Shinichiro Hamaji  <hamaji@chromium.org>
 

trunk/WebKitTools/DumpRenderTree/mac/PixelDumpSupportMac.mm

@@ -106 +106 @@
 }
 
-static PassRefPtr<BitmapContext> createBitmapContext(size_t pixelsWide, size_t pixelsHigh)
-{
-    size_t rowBytes = (4 * pixelsWide + 63) & ~63; // Use a multiple of 64 bytes to improve CG performance
-
-    void *buffer = calloc(pixelsHigh, rowBytes);
+static PassRefPtr<BitmapContext> createBitmapContext(size_t pixelsWide, size_t pixelsHigh, size_t& rowBytes, void*& buffer)
+{
+    rowBytes = (4 * pixelsWide + 63) & ~63; // Use a multiple of 64 bytes to improve CG performance
+
+    buffer = calloc(pixelsHigh, rowBytes);
     if (!buffer)
         return 0;
@@ -147 +147 @@
     size_t pixelsWide = static_cast<size_t>(webViewSize.width);
     size_t pixelsHigh = static_cast<size_t>(webViewSize.height);
-    RefPtr<BitmapContext> bitmapContext = createBitmapContext(pixelsWide, pixelsHigh);
+    size_t rowBytes = 0;
+    void* buffer = 0;
+    RefPtr<BitmapContext> bitmapContext = createBitmapContext(pixelsWide, pixelsHigh, rowBytes, buffer);
     if (!bitmapContext)
         return 0;