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

[hamaji at chromium.org]

The following commit has been merged in the debian/experimental branch:
commit fc798cb9198edb5051012806eff9cf881271dc7c
Author: hamaji at chromium.org <hamaji at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Jul 16 07:36:02 2010 +0000

    2010-07-16  Shinichiro Hamaji  <hamaji at chromium.org>
    
            Another uneviewed attempt to fix build.
    
            Printing test results differ between machines, we should use ImageDiff instead
            https://bugs.webkit.org/show_bug.cgi?id=20011
    
            * DumpRenderTree/mac/PixelDumpSupportMac.mm:
            (createPagedBitmapContext):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@63527 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index cdf9461..393450f 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,5 +1,15 @@
 2010-07-16  Shinichiro Hamaji  <hamaji at chromium.org>
 
+        Another uneviewed attempt to fix build.
+
+        Printing test results differ between machines, we should use ImageDiff instead
+        https://bugs.webkit.org/show_bug.cgi?id=20011
+
+        * DumpRenderTree/mac/PixelDumpSupportMac.mm:
+        (createPagedBitmapContext):
+
+2010-07-16  Shinichiro Hamaji  <hamaji at chromium.org>
+
         Unreviewed tiger build fix.
 
         Printing test results differ between machines, we should use ImageDiff instead
diff --git a/WebKitTools/DumpRenderTree/mac/PixelDumpSupportMac.mm b/WebKitTools/DumpRenderTree/mac/PixelDumpSupportMac.mm
index f897d1d..3967186 100644
--- a/WebKitTools/DumpRenderTree/mac/PixelDumpSupportMac.mm
+++ b/WebKitTools/DumpRenderTree/mac/PixelDumpSupportMac.mm
@@ -270,8 +270,10 @@ PassRefPtr<BitmapContext> createPagedBitmapContext()
     int pageWidthInPixels = LayoutTestController::maxViewWidth;
     int pageHeightInPixels = LayoutTestController::maxViewHeight;
     int numberOfPages = [mainFrame numberOfPages:pageWidthInPixels:pageHeightInPixels];
+    size_t rowBytes = 0;
+    void* buffer = 0;
 
-    RefPtr<BitmapContext> bitmapContext = createBitmapContext(pageWidthInPixels, numberOfPages * (pageHeightInPixels + 1) - 1);
+    RefPtr<BitmapContext> bitmapContext = createBitmapContext(pageWidthInPixels, numberOfPages * (pageHeightInPixels + 1) - 1, rowBytes, buffer);
     [mainFrame printToCGContext:bitmapContext->cgContext():pageWidthInPixels:pageHeightInPixels];
     return bitmapContext.release();
 }

-- 
WebKit Debian packaging