[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 67795693fa68b71b7cb5228f43e606e606c5ca8f
Author: hamaji at chromium.org <hamaji at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Jul 16 06:38:30 2010 +0000

    2010-07-15  Shinichiro Hamaji  <hamaji at chromium.org>
    
            Unreviewed build fix.
    
            Printing test results differ between machines, we should use ImageDiff instead
            https://bugs.webkit.org/show_bug.cgi?id=20011
    
            * DumpRenderTree/PixelDumpSupport.cpp:
            (dumpWebViewAsPixelsAndCompareWithExpected):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@63525 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index 94097dc..443780e 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,5 +1,15 @@
 2010-07-15  Shinichiro Hamaji  <hamaji at chromium.org>
 
+        Unreviewed build fix.
+
+        Printing test results differ between machines, we should use ImageDiff instead
+        https://bugs.webkit.org/show_bug.cgi?id=20011
+
+        * DumpRenderTree/PixelDumpSupport.cpp:
+        (dumpWebViewAsPixelsAndCompareWithExpected):
+
+2010-07-15  Shinichiro Hamaji  <hamaji at chromium.org>
+
         Reviewed by Darin Adler.
 
         Printing test results differ between machines, we should use ImageDiff instead
diff --git a/WebKitTools/DumpRenderTree/PixelDumpSupport.cpp b/WebKitTools/DumpRenderTree/PixelDumpSupport.cpp
index 6212add..b5a5146 100644
--- a/WebKitTools/DumpRenderTree/PixelDumpSupport.cpp
+++ b/WebKitTools/DumpRenderTree/PixelDumpSupport.cpp
@@ -43,9 +43,11 @@
 void dumpWebViewAsPixelsAndCompareWithExpected(const std::string& expectedHash)
 {
     RefPtr<BitmapContext> context;
+#if PLATFORM(MAC)
     if (gLayoutTestController->isPrinting())
         context = createPagedBitmapContext();
     else
+#endif
         context = createBitmapContextFromWebView(gLayoutTestController->testOnscreen(), gLayoutTestController->testRepaint(), gLayoutTestController->testRepaintSweepHorizontally(), gLayoutTestController->dumpSelectionRect());
     ASSERT(context);
     

-- 
WebKit Debian packaging