[SCM] WebKit Debian packaging branch, webkit-1.2, updated. upstream/1.1.90-6072-g9a69373

[eric at webkit.org]

The following commit has been merged in the webkit-1.2 branch:
commit 9d8409aa9a9af2e8231adaf977d70af24025216a
Author: eric at webkit.org <eric at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Nov 12 03:02:12 2009 +0000

    2009-11-11  Dirk Pranke  <dpranke at 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.
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@50857 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 1adb6f4..80f7db7 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,16 @@
+2009-11-11  Dirk Pranke  <dpranke at 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 at apple.com>
 
         Reviewed by Simon Fraser.
diff --git a/LayoutTests/fast/dom/Window/window-screen-properties-expected.txt b/LayoutTests/fast/dom/Window/window-screen-properties-expected.txt
index 17e676c..f54e028 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 @@
-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
diff --git a/LayoutTests/fast/dom/Window/window-screen-properties.html b/LayoutTests/fast/dom/Window/window-screen-properties.html
index 1620ae2..88b1399 100644
--- a/LayoutTests/fast/dom/Window/window-screen-properties.html
+++ b/LayoutTests/fast/dom/Window/window-screen-properties.html
@@ -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
index d476164..0000000
--- a/LayoutTests/platform/win/fast/dom/Window/window-screen-properties-expected.txt
+++ /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

-- 
WebKit Debian packaging