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

[aroben at apple.com]

The following commit has been merged in the debian/experimental branch:
commit 8967a63782071fa1b609586f2a62cc20fac0774d
Author: aroben at apple.com <aroben at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Oct 1 13:30:29 2010 +0000

    Make regression tests pass on machines with 16-bit displays
    
    I made these tests require 24-bit displays in r68808 and r68809,
    thinking that we didn't have any testers that had 16-bit displays. But
    apparently I was wrong; at least one Windows tester has a 16-bit
    display.
    
    Fixes <http://webkit.org/b/46980>
    fast/media/color-does-not-include-alpha.html failing on Windows
    
    Reviewed by Nikolas Zimmermann.
    
    * fast/dom/Window/window-screen-properties-expected.txt: Updated
    results.
    * fast/dom/Window/window-screen-properties.html: Changed to allow
    either 16 or 24 bits.
    * fast/media/color-does-not-include-alpha.html: Changed to allow
    either 5 or 8 bits per channel.
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@68884 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index f97dffe..70f982a 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,24 @@
+2010-10-01  Adam Roben  <aroben at apple.com>
+
+        Make regression tests pass on machines with 16-bit displays
+
+        I made these tests require 24-bit displays in r68808 and r68809,
+        thinking that we didn't have any testers that had 16-bit displays. But
+        apparently I was wrong; at least one Windows tester has a 16-bit
+        display.
+
+        Fixes <http://webkit.org/b/46980>
+        fast/media/color-does-not-include-alpha.html failing on Windows
+
+        Reviewed by Nikolas Zimmermann.
+
+        * fast/dom/Window/window-screen-properties-expected.txt: Updated
+        results.
+        * fast/dom/Window/window-screen-properties.html: Changed to allow
+        either 16 or 24 bits.
+        * fast/media/color-does-not-include-alpha.html: Changed to allow
+        either 5 or 8 bits per channel.
+
 2010-10-01  Csaba Osztrogonác  <ossy at webkit.org>
 
         Unreviewed rolling out r68633, because we don't need Qt specific expected results any more.
diff --git a/LayoutTests/fast/dom/Window/window-screen-properties-expected.txt b/LayoutTests/fast/dom/Window/window-screen-properties-expected.txt
index ef15ee6..a27e189 100644
--- a/LayoutTests/fast/dom/Window/window-screen-properties-expected.txt
+++ b/LayoutTests/fast/dom/Window/window-screen-properties-expected.txt
@@ -1,2 +1,2 @@
-PASS: window.screen.pixelDepth is 24
-PASS: window.screen.colorDepth is 24
+PASS: window.screen.pixelDepth is either 16 or 24
+PASS: window.screen.colorDepth is either 16 or 24
diff --git a/LayoutTests/fast/dom/Window/window-screen-properties.html b/LayoutTests/fast/dom/Window/window-screen-properties.html
index 7d2c9a7..3e3ba8e 100644
--- a/LayoutTests/fast/dom/Window/window-screen-properties.html
+++ b/LayoutTests/fast/dom/Window/window-screen-properties.html
@@ -2,16 +2,16 @@
 if (window.layoutTestController)
     layoutTestController.dumpAsText();
 depth = window.screen.pixelDepth;
-if (depth == 24) {
-  document.write("PASS: window.screen.pixelDepth is 24");
+if (depth == 16 || depth == 24) {
+  document.write("PASS: window.screen.pixelDepth is either 16 or 24");
 }  else {
-  document.write("FAIL: window.screen.pixelDepth is " + depth + ", expected 24");
+  document.write("FAIL: window.screen.pixelDepth is " + depth + ", expected 16 or 24");
 }
 document.write("<br />");
 depth = window.screen.colorDepth;
-if (depth == 24) {
-  document.write("PASS: window.screen.colorDepth is 24");
+if (depth == 16 || depth == 24) {
+  document.write("PASS: window.screen.colorDepth is either 16 or 24");
 }  else {
-  document.write("FAIL: window.screen.colorDepth is " + depth + ", expected 24");
+  document.write("FAIL: window.screen.colorDepth is " + depth + ", expected 16 or 24");
 }
 </script>
diff --git a/LayoutTests/fast/media/color-does-not-include-alpha.html b/LayoutTests/fast/media/color-does-not-include-alpha.html
index 4f6e508..3f369e2 100644
--- a/LayoutTests/fast/media/color-does-not-include-alpha.html
+++ b/LayoutTests/fast/media/color-does-not-include-alpha.html
@@ -5,7 +5,7 @@
         height: 300px;
         background-color: red;
     }
-    @media (color:8) {
+    @media (color:5), (color:8) {
         #test {
             background-color: green;
         }

-- 
WebKit Debian packaging