Changeset 68884 in webkit

Timestamp:

Oct 1, 2010 6:30:29 AM (14 years ago)

Author:

Adam Roben

Message:

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.

Location:

trunk/LayoutTests

Files:

• ChangeLog (modified) (1 diff)
• fast/dom/Window/window-screen-properties-expected.txt (modified) (1 diff)
• fast/dom/Window/window-screen-properties.html (modified) (1 diff)
• fast/media/color-does-not-include-alpha.html (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2010-10-01  Adam Roben  <aroben@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@webkit.org>
 

trunk/LayoutTests/fast/dom/Window/window-screen-properties-expected.txt

@@ -1 @@
-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

trunk/LayoutTests/fast/dom/Window/window-screen-properties.html

@@ -3 +3 @@
     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>

trunk/LayoutTests/fast/media/color-does-not-include-alpha.html

@@ -6 +6 @@
         background-color: red;
     }
-    @media (color:8) {
+    @media (color:5), (color:8) {
         #test {
             background-color: green;