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

[tony at chromium.org]

The following commit has been merged in the debian/experimental branch:
commit d0ee1c2f97bc973d9cc4353fb1f5cb20287dc7e7
Author: tony at chromium.org <tony at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Sep 7 22:21:02 2010 +0000

    2010-09-07  Tony Chang  <tony at chromium.org>
    
            Reviewed by Darin Fisher.
    
            [chromium] Make a public flag for how DRT generates bitmaps on Linux
            https://bugs.webkit.org/show_bug.cgi?id=45133
    
            This is so it's possible for me to fix
            http://code.google.com/p/chromium/issues/detail?id=21386 .
    
            * public/WebKit.h: Add areLayoutTestImagesOpaque()
            * src/WebKit.cpp:
            (WebKit::areLayoutTestImagesOpaque):
    2010-09-07  Tony Chang  <tony at chromium.org>
    
            Reviewed by Darin Fisher.
    
            [chromium] Make a public flag for how DRT generates bitmaps on Linux
            https://bugs.webkit.org/show_bug.cgi?id=45133
    
            * DumpRenderTree/chromium/TestShell.cpp:
            (TestShell::dumpImage):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@66914 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/chromium/ChangeLog b/WebKit/chromium/ChangeLog
index 023e1d7..90dc536 100644
--- a/WebKit/chromium/ChangeLog
+++ b/WebKit/chromium/ChangeLog
@@ -1,3 +1,17 @@
+2010-09-07  Tony Chang  <tony at chromium.org>
+
+        Reviewed by Darin Fisher.
+
+        [chromium] Make a public flag for how DRT generates bitmaps on Linux
+        https://bugs.webkit.org/show_bug.cgi?id=45133
+
+        This is so it's possible for me to fix
+        http://code.google.com/p/chromium/issues/detail?id=21386 .
+
+        * public/WebKit.h: Add areLayoutTestImagesOpaque()
+        * src/WebKit.cpp:
+        (WebKit::areLayoutTestImagesOpaque):
+
 2010-09-07  Dimitri Glazkov  <dglazkov at chromium.org>
 
         Unreviewed, rolling out r66886.
diff --git a/WebKit/chromium/public/WebKit.h b/WebKit/chromium/public/WebKit.h
index 732cac6..5550db1 100644
--- a/WebKit/chromium/public/WebKit.h
+++ b/WebKit/chromium/public/WebKit.h
@@ -55,6 +55,11 @@ WEBKIT_API WebKitClient* webKitClient();
 WEBKIT_API void setLayoutTestMode(bool);
 WEBKIT_API bool layoutTestMode();
 
+// This is a temporary flag while we try to get Linux to match Windows'
+// checksum computation.  It specifies whether or not the baseline images
+// should be opaque or not.
+WEBKIT_API bool areLayoutTestImagesOpaque();
+
 // Enables the named log channel.  See WebCore/platform/Logging.h for details.
 WEBKIT_API void enableLogChannel(const char*);
 
diff --git a/WebKit/chromium/src/WebKit.cpp b/WebKit/chromium/src/WebKit.cpp
index cadcb6c..ca0da51 100644
--- a/WebKit/chromium/src/WebKit.cpp
+++ b/WebKit/chromium/src/WebKit.cpp
@@ -103,6 +103,11 @@ bool layoutTestMode()
     return s_layoutTestMode;
 }
 
+bool areLayoutTestImagesOpaque()
+{
+    return false;
+}
+
 void enableLogChannel(const char* name)
 {
     WTFLogChannel* channel = WebCore::getChannelFromName(name);
diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index c30b35f..d02919c 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,13 @@
+2010-09-07  Tony Chang  <tony at chromium.org>
+
+        Reviewed by Darin Fisher.
+
+        [chromium] Make a public flag for how DRT generates bitmaps on Linux
+        https://bugs.webkit.org/show_bug.cgi?id=45133
+
+        * DumpRenderTree/chromium/TestShell.cpp:
+        (TestShell::dumpImage):
+
 2010-09-07  Kent Tamura  <tkent at chromium.org>
 
         Reviewed by Dimitri Glazkov.
diff --git a/WebKitTools/DumpRenderTree/chromium/TestShell.cpp b/WebKitTools/DumpRenderTree/chromium/TestShell.cpp
index aad5a63..4557803 100644
--- a/WebKitTools/DumpRenderTree/chromium/TestShell.cpp
+++ b/WebKitTools/DumpRenderTree/chromium/TestShell.cpp
@@ -42,6 +42,7 @@
 #include "public/WebElement.h"
 #include "public/WebFrame.h"
 #include "public/WebHistoryItem.h"
+#include "public/WebKit.h"
 #include "public/WebRuntimeFeatures.h"
 #include "public/WebScriptController.h"
 #include "public/WebSettings.h"
@@ -592,6 +593,8 @@ void TestShell::dumpImage(skia::PlatformCanvas* canvas) const
     bool discardTransparency = false;
 #elif OS(UNIX)
     bool discardTransparency = true;
+    if (areLayoutTestImagesOpaque())
+        device.makeOpaque(0, 0, sourceBitmap.width(), sourceBitmap.height());
 #endif
 
     // Compute MD5 sum.  We should have done this before calling

-- 
WebKit Debian packaging