[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 48616ea6acad3fe5ce5f7b5d5a7f8c14a073b13c
Author: tony at chromium.org <tony at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Sep 15 00:45:24 2010 +0000

    2010-09-14  Tony Chang  <tony at chromium.org>
    
            Reviewed by Ojan Vafai.
    
            [chromium] Remove WebKit::areLayoutTestImagesOpaque since it's no longer needed
            https://bugs.webkit.org/show_bug.cgi?id=45768
    
            * public/WebKit.h:
            * src/WebKit.cpp:
    2010-09-14  Tony Chang  <tony at chromium.org>
    
            Reviewed by Ojan Vafai.
    
            [chromium] Remove WebKit::areLayoutTestImagesOpaque since it's no longer needed
            https://bugs.webkit.org/show_bug.cgi?id=45768
    
            * DumpRenderTree/chromium/TestShell.cpp:
            (TestShell::dumpImage): new baselines are checked in and Linux will match Windows going forward.
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@67521 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/chromium/ChangeLog b/WebKit/chromium/ChangeLog
index e5a1a7f..70d230e 100644
--- a/WebKit/chromium/ChangeLog
+++ b/WebKit/chromium/ChangeLog
@@ -1,3 +1,13 @@
+2010-09-14  Tony Chang  <tony at chromium.org>
+
+        Reviewed by Ojan Vafai.
+
+        [chromium] Remove WebKit::areLayoutTestImagesOpaque since it's no longer needed
+        https://bugs.webkit.org/show_bug.cgi?id=45768
+
+        * public/WebKit.h:
+        * src/WebKit.cpp:
+
 2010-09-14  Mihai Parparita  <mihaip at chromium.org>
 
         Reviewed by Tony Chang.
diff --git a/WebKit/chromium/public/WebKit.h b/WebKit/chromium/public/WebKit.h
index 5550db1..732cac6 100644
--- a/WebKit/chromium/public/WebKit.h
+++ b/WebKit/chromium/public/WebKit.h
@@ -55,11 +55,6 @@ 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 f3336ea..cadcb6c 100644
--- a/WebKit/chromium/src/WebKit.cpp
+++ b/WebKit/chromium/src/WebKit.cpp
@@ -103,11 +103,6 @@ bool layoutTestMode()
     return s_layoutTestMode;
 }
 
-bool areLayoutTestImagesOpaque()
-{
-    return true;
-}
-
 void enableLogChannel(const char* name)
 {
     WTFLogChannel* channel = WebCore::getChannelFromName(name);
diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index a5c6c8f..0f1eb50 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,13 @@
+2010-09-14  Tony Chang  <tony at chromium.org>
+
+        Reviewed by Ojan Vafai.
+
+        [chromium] Remove WebKit::areLayoutTestImagesOpaque since it's no longer needed
+        https://bugs.webkit.org/show_bug.cgi?id=45768
+
+        * DumpRenderTree/chromium/TestShell.cpp:
+        (TestShell::dumpImage): new baselines are checked in and Linux will match Windows going forward.
+
 2010-09-14  Kevin Ollivier  <kevino at theolliviers.com>
 
         [wx] Build fix, add newly added directories to the directory list.
diff --git a/WebKitTools/DumpRenderTree/chromium/TestShell.cpp b/WebKitTools/DumpRenderTree/chromium/TestShell.cpp
index fd169d0..4c8a567 100644
--- a/WebKitTools/DumpRenderTree/chromium/TestShell.cpp
+++ b/WebKitTools/DumpRenderTree/chromium/TestShell.cpp
@@ -584,23 +584,15 @@ void TestShell::dumpImage(skia::PlatformCanvas* canvas) const
     // to keep it. On Windows, the alpha channel is wrong since text/form control
     // drawing may have erased it in a few places. So on Windows we force it to
     // opaque and also don't write the alpha channel for the reference. Linux
-    // doesn't have the wrong alpha like Windows, but we ignore it anyway.
-#if OS(WINDOWS)
-    bool discardTransparency = true;
-    device.makeOpaque(0, 0, sourceBitmap.width(), sourceBitmap.height());
-#elif OS(MAC_OS_X)
+    // doesn't have the wrong alpha like Windows, but we match Windows.
+#if OS(MAC_OS_X)
     bool discardTransparency = false;
-#elif OS(UNIX)
+#else
     bool discardTransparency = true;
-    if (areLayoutTestImagesOpaque())
-        device.makeOpaque(0, 0, sourceBitmap.width(), sourceBitmap.height());
+    device.makeOpaque(0, 0, sourceBitmap.width(), sourceBitmap.height());
 #endif
 
-    // Compute MD5 sum.  We should have done this before calling
-    // device.makeOpaque on Windows.  Because we do it after the call, there are
-    // some images that are the pixel identical on windows and other platforms
-    // but have different MD5 sums.  At this point, rebaselining all the windows
-    // tests is too much of a pain, so we just check in different baselines.
+    // Compute MD5 sum.
     MD5 digester;
     Vector<uint8_t, 16> digestValue;
     digester.addBytes(reinterpret_cast<const uint8_t*>(sourceBitmap.getPixels()), sourceBitmap.getSize());

-- 
WebKit Debian packaging