Reviewed by Adam.

        Make this a text-only test.

        * fast/dom/Window/window-onFocus-expected.txt: Added.
        * fast/dom/Window/window-onFocus.html:
        * platform/mac/fast/dom/Window/window-onFocus-expected.checksum: Removed.
        * platform/mac/fast/dom/Window/window-onFocus-expected.png: Removed.
        * platform/mac/fast/dom/Window/window-onFocus-expected.txt: Removed.

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

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 50763135e4d3a7e082947c6f7029b143e365ed46..729b0eb1c22af86960f02f053da83216e8b5d390 100644 (file)
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,15 @@
+2007-11-13  Anders Carlsson  <andersca@apple.com>
+
+        Reviewed by Adam.
+        
+        Make this a text-only test.
+        
+        * fast/dom/Window/window-onFocus-expected.txt: Added.
+        * fast/dom/Window/window-onFocus.html:
+        * platform/mac/fast/dom/Window/window-onFocus-expected.checksum: Removed.
+        * platform/mac/fast/dom/Window/window-onFocus-expected.png: Removed.
+        * platform/mac/fast/dom/Window/window-onFocus-expected.txt: Removed.
+
 2007-11-12  Antti Koivisto  <antti@apple.com>
 
         Reviewed by Adele.

diff --git a/LayoutTests/fast/dom/Window/window-onFocus-expected.txt b/LayoutTests/fast/dom/Window/window-onFocus-expected.txt
new file mode 100644 (file)
index 0000000..5bb9819
--- /dev/null
+++ b/LayoutTests/fast/dom/Window/window-onFocus-expected.txt
@@ -0,0 +1,6 @@
+This tests window.onFocus and window.onBlur handlers. It uses the layoutTestControllers ability to mimic bringing the window to the front and pushing it to the back.
+It is not intended to be run interactively: when you run it interactively, you should see 'Window was blurred' and 'Window was focused' messages as you push the window to the back and bring it to the front, respectively.
+
+Window was blurred
+Window was focused
+Window was blurred

diff --git a/LayoutTests/fast/dom/Window/window-onFocus.html b/LayoutTests/fast/dom/Window/window-onFocus.html
index 1875a8ec0d7f8d0f1de9ce34c53c5af1e61e0b2b..0b497fb36fca37859d7a4285644a054b0b2701fe 100644 (file)
--- a/LayoutTests/fast/dom/Window/window-onFocus.html
+++ b/LayoutTests/fast/dom/Window/window-onFocus.html
@@ -6,6 +6,7 @@ function runTest() {
     window.onblur = windowBlurred;
     
     if (window.layoutTestController) {
+        window.layoutTestController.dumpAsText();
         window.layoutTestController.setMainFrameIsFirstResponder(false);
         
         window.layoutTestController.setWindowIsKey(false);

diff --git a/LayoutTests/platform/mac/fast/dom/Window/window-onFocus-expected.checksum b/LayoutTests/platform/mac/fast/dom/Window/window-onFocus-expected.checksum
deleted file mode 100644 (file)
index 77e3a27..0000000
--- a/LayoutTests/platform/mac/fast/dom/Window/window-onFocus-expected.checksum
+++ /dev/null
@@ -1 +0,0 @@
-cc4fbf25c4356c5af6e619d13abdf5ca
\ No newline at end of file

diff --git a/LayoutTests/platform/mac/fast/dom/Window/window-onFocus-expected.png b/LayoutTests/platform/mac/fast/dom/Window/window-onFocus-expected.png
deleted file mode 100644 (file)
index dfc5a5d..0000000
Binary files a/LayoutTests/platform/mac/fast/dom/Window/window-onFocus-expected.png and /dev/null differ

diff --git a/LayoutTests/platform/mac/fast/dom/Window/window-onFocus-expected.txt b/LayoutTests/platform/mac/fast/dom/Window/window-onFocus-expected.txt
deleted file mode 100644 (file)
index 8c43c8b..0000000
--- a/LayoutTests/platform/mac/fast/dom/Window/window-onFocus-expected.txt
+++ /dev/null
@@ -1,30 +0,0 @@
-layer at (0,0) size 800x600
-  RenderView at (0,0) size 800x600
-layer at (0,0) size 800x600
-  RenderBlock {HTML} at (0,0) size 800x600
-    RenderBody {BODY} at (8,8) size 784x576
-      RenderBlock (anonymous) at (0,0) size 784x36
-        RenderText {#text} at (0,0) size 754x36
-          text run at (0,0) width 369: "This tests window.onFocus and window.onBlur handlers. "
-          text run at (369,0) width 385: "It uses the layoutTestControllers ability to mimic bringing the"
-          text run at (0,18) width 295: "window to the front and pushing it to the back."
-      RenderBlock {P} at (0,52) size 784x36
-        RenderInline {B} at (0,0) size 272x18
-          RenderText {#text} at (0,0) size 272x18
-            text run at (0,0) width 272: "It is not intended to be run interactively:"
-        RenderText {#text} at (272,0) size 729x36
-          text run at (272,0) width 457: " when you run it interactively, you should see 'Window was blurred' and"
-          text run at (0,18) width 673: "'Window was focused' messages as you push the window to the back and bring it to the front, respectively."
-      RenderBlock {UL} at (0,104) size 784x54
-        RenderListItem {LI} at (40,0) size 744x18
-          RenderListMarker at (-17,0) size 7x18: bullet
-          RenderText {#text} at (0,0) size 133x18
-            text run at (0,0) width 133: "Window was blurred"
-        RenderListItem {LI} at (40,18) size 744x18
-          RenderListMarker at (-17,0) size 7x18: bullet
-          RenderText {#text} at (0,0) size 137x18
-            text run at (0,0) width 137: "Window was focused"
-        RenderListItem {LI} at (40,36) size 744x18
-          RenderListMarker at (-17,0) size 7x18: bullet
-          RenderText {#text} at (0,0) size 133x18
-            text run at (0,0) width 133: "Window was blurred"