2009-11-11 Dirk Pranke <dpranke@chromium.org>
authoreric@webkit.org <eric@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 12 Nov 2009 03:02:12 +0000 (03:02 +0000)
committereric@webkit.org <eric@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 12 Nov 2009 03:02:12 +0000 (03:02 +0000)
        Reviewed by Dmitry Titov.

        Rewrite the test to run on a wider variety of screen configurations
        (and pixel depths).

        https://bugs.webkit.org/show_bug.cgi?id=31373

        * fast/dom/Window/window-screen-properties-expected.txt:
        * fast/dom/Window/window-screen-properties.html:
        * platform/win/fast/dom/Window/window-screen-properties-expected.txt: Removed.

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@50857 268f45cc-cd09-0410-ab3c-d52691b4dbfc

LayoutTests/ChangeLog
LayoutTests/fast/dom/Window/window-screen-properties-expected.txt
LayoutTests/fast/dom/Window/window-screen-properties.html
LayoutTests/platform/win/fast/dom/Window/window-screen-properties-expected.txt [deleted file]

index 1adb6f454af3f765384bce13466ef082d416d95a..80f7db72c2cac21d5750a7078850474496ab5365 100644 (file)
@@ -1,3 +1,16 @@
+2009-11-11  Dirk Pranke  <dpranke@chromium.org>
+
+        Reviewed by Dmitry Titov.
+
+        Rewrite the test to run on a wider variety of screen configurations
+        (and pixel depths).
+
+        https://bugs.webkit.org/show_bug.cgi?id=31373
+
+        * fast/dom/Window/window-screen-properties-expected.txt:
+        * fast/dom/Window/window-screen-properties.html:
+        * platform/win/fast/dom/Window/window-screen-properties-expected.txt: Removed.
+
 2009-11-11  Beth Dakin  <bdakin@apple.com>
 
         Reviewed by Simon Fraser.
index 17e676cd119349ba2608b213370f7f49e99fc0b7..f54e028d22342b14b4e2ae19714995f2e332bc0e 100644 (file)
@@ -1,2 +1,2 @@
-The current pixel depth returned by window.screen.pixelDepth is: 24 
-The current color depth returned by window.screen.colorDepth is: 24
+PASS: window.screen.pixelDepth is either 16, 24, or 32
+PASS: window.screen.colorDepth is either 16, 24, or 32
index 1620ae24f06252ec5075ac8fc6a698234ba9fa30..88b1399cc80d403bbd42321031377d69bc0d6d6d 100644 (file)
@@ -1,13 +1,19 @@
 <script>
 if (window.layoutTestController)
     layoutTestController.dumpAsText();
-</script>
-The current pixel depth returned by window.screen.pixelDepth is:
-<script>
-document.write(window.screen.pixelDepth);
-</script>
-<br>
-The current color depth returned by window.screen.colorDepth is:
-<script>
-document.write(window.screen.colorDepth);
+depth = window.screen.pixelDepth;
+if (depth == 16 || depth == 24 || depth == 32) {
+  document.write("PASS: window.screen.pixelDepth is either 16, 24, or 32");
+}  else {
+  document.write("FAIL: window.screen.pixelDepth is " + depth +
+                 ", expected either 16, 24, or 32");
+}
+document.write("<br />");
+depth = window.screen.colorDepth;
+if (depth == 16 || depth == 24 || depth == 32) {
+  document.write("PASS: window.screen.colorDepth is either 16, 24, or 32");
+}  else {
+  document.write("FAIL: window.screen.colorDepth is " + depth +
+                 ", expected either 16, 24, or 32");
+}
 </script>
diff --git a/LayoutTests/platform/win/fast/dom/Window/window-screen-properties-expected.txt b/LayoutTests/platform/win/fast/dom/Window/window-screen-properties-expected.txt
deleted file mode 100644 (file)
index d476164..0000000
+++ /dev/null
@@ -1,2 +0,0 @@
-The current pixel depth returned by window.screen.pixelDepth is: 32 
-The current color depth returned by window.screen.colorDepth is: 32