Not reviewed - test case fixes.

        - fix some test cases where expected results were altered by the last change
        (I reviewed all the new results.)

        * fast/events/focusingUnloadedFrame-expected.txt:
        * http/tests/loading/simple-subframe-expected.txt:
        * tables/mozilla_expected_failures/bugs/bug137388-1-expected.txt:
        * tables/mozilla_expected_failures/bugs/bug137388-2-expected.txt:
        * webarchive/loading/test-loading-archive-expected.txt:

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

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 33150f52b132296bb904bc9ab885e93abd21747f..0b593a8f1c6447a818e9c4b55ee159488b368753 100644 (file)
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,16 @@
+2007-08-19  Maciej Stachowiak  <mjs@apple.com>
+
+        Not reviewed - test case fixes.
+        
+        - fix some test cases where expected results were altered by the last change
+        (I reviewed all the new results.)
+
+        * fast/events/focusingUnloadedFrame-expected.txt:
+        * http/tests/loading/simple-subframe-expected.txt:
+        * tables/mozilla_expected_failures/bugs/bug137388-1-expected.txt:
+        * tables/mozilla_expected_failures/bugs/bug137388-2-expected.txt:
+        * webarchive/loading/test-loading-archive-expected.txt:
+
 2007-08-18  Maciej Stachowiak  <mjs@apple.com>
 
         Reviewed by Darin.

diff --git a/LayoutTests/fast/events/focusingUnloadedFrame-expected.txt b/LayoutTests/fast/events/focusingUnloadedFrame-expected.txt
index a663c917a887fe1bca8e31155811cfc7cb34473b..b0e9217e9f0e40f4e49ceb4946bbb7946c05e66e 100644 (file)
--- a/LayoutTests/fast/events/focusingUnloadedFrame-expected.txt
+++ b/LayoutTests/fast/events/focusingUnloadedFrame-expected.txt
@@ -21,8 +21,7 @@ layer at (0,0) size 800x600
               RenderText {#text} at (0,0) size 0x0
               RenderText {#text} at (0,0) size 0x0
       RenderFrame {FRAME} at (0,0) size 0x0
-        layer at (0,0) size 8x8
+        layer at (0,0) size 0x0
           RenderView at (0,0) size 0x0
-        layer at (0,0) size 8x8
-          RenderBlock {HTML} at (0,0) size 0x8
-            RenderBody {BODY} at (8,8) size 0x0
+        layer at (0,0) size 0x0
+          RenderBlock {HTML} at (0,0) size 0x0

diff --git a/LayoutTests/http/tests/loading/simple-subframe-expected.txt b/LayoutTests/http/tests/loading/simple-subframe-expected.txt
index b25e91784af88a1e5881a0dcfa17ec4d74f741ad..6d20dedde5269988f64d0184c6134bead1a72b27 100644 (file)
--- a/LayoutTests/http/tests/loading/simple-subframe-expected.txt
+++ b/LayoutTests/http/tests/loading/simple-subframe-expected.txt
@@ -3,12 +3,10 @@ frame "f1" - willCloseFrame
 main frame - willCloseFrame
 main frame - didCommitLoadForFrame
 main frame - didClearWindowObjectForFrame
-frame "f1" - didClearWindowObjectForFrame
 frame "f1" - didStartProvisionalLoadForFrame
 main frame - didFinishDocumentLoadForFrame
 frame "f1" - willCloseFrame
 frame "f1" - didCommitLoadForFrame
-frame "f1" - didClearWindowObjectForFrame
 frame "f1" - didHandleOnloadEventsForFrame
 main frame - didHandleOnloadEventsForFrame
 frame "f1" - didFinishDocumentLoadForFrame

diff --git a/LayoutTests/tables/mozilla_expected_failures/bugs/bug137388-1-expected.txt b/LayoutTests/tables/mozilla_expected_failures/bugs/bug137388-1-expected.txt
index a3e2ac00749e5b212142a3920389bfc019a8ced1..98f5f098e7927f25099fe6e86f7e2780a5895396 100644 (file)
--- a/LayoutTests/tables/mozilla_expected_failures/bugs/bug137388-1-expected.txt
+++ b/LayoutTests/tables/mozilla_expected_failures/bugs/bug137388-1-expected.txt
@@ -8,9 +8,8 @@ layer at (0,0) size 800x600
           RenderTableRow {TR} at (0,2) size 310x6
             RenderTableCell {TD} at (2,2) size 306x6 [r=0 c=0 rs=1 cs=1]
               RenderPartObject {IFRAME} at (1,1) size 308x4 [border: (2px inset #000000)]
-                layer at (0,0) size 289x8
-                  RenderView at (0,0) size 289x0
-                layer at (0,0) size 289x8
-                  RenderBlock {HTML} at (0,0) size 289x8
-                    RenderBody {BODY} at (8,8) size 273x0
+                layer at (0,0) size 304x0
+                  RenderView at (0,0) size 304x0
+                layer at (0,0) size 304x0
+                  RenderBlock {HTML} at (0,0) size 304x0
               RenderText {#text} at (0,0) size 0x0

diff --git a/LayoutTests/tables/mozilla_expected_failures/bugs/bug137388-2-expected.txt b/LayoutTests/tables/mozilla_expected_failures/bugs/bug137388-2-expected.txt
index 4de8b8b70ff6f0dab3ec433c9fd7c1213d192c48..eb8f18f3ce54e63774ac6c0ede9122cca3e2b184 100644 (file)
--- a/LayoutTests/tables/mozilla_expected_failures/bugs/bug137388-2-expected.txt
+++ b/LayoutTests/tables/mozilla_expected_failures/bugs/bug137388-2-expected.txt
@@ -10,9 +10,8 @@ layer at (0,0) size 785x648
               RenderPartObject {IFRAME} at (1,1) size 308x304 [border: (2px inset #000000)]
                 layer at (0,0) size 304x300
                   RenderView at (0,0) size 304x300
-                layer at (0,0) size 304x300
-                  RenderBlock {HTML} at (0,0) size 304x300
-                    RenderBody {BODY} at (8,8) size 288x284
+                layer at (0,0) size 304x0
+                  RenderBlock {HTML} at (0,0) size 304x0
               RenderText {#text} at (0,0) size 0x0
       RenderTable {TABLE} at (0,310) size 606x306
         RenderTableSection {TBODY} at (0,0) size 606x306
@@ -25,11 +24,10 @@ layer at (0,0) size 785x648
           RenderTableRow {TR} at (0,2) size 310x6
             RenderTableCell {TD} at (2,2) size 306x6 [r=0 c=0 rs=1 cs=1]
               RenderPartObject {IFRAME} at (1,1) size 308x4 [border: (2px inset #000000)]
-                layer at (0,0) size 289x8
-                  RenderView at (0,0) size 289x0
-                layer at (0,0) size 289x8
-                  RenderBlock {HTML} at (0,0) size 289x8
-                    RenderBody {BODY} at (8,8) size 273x0
+                layer at (0,0) size 304x0
+                  RenderView at (0,0) size 304x0
+                layer at (0,0) size 304x0
+                  RenderBlock {HTML} at (0,0) size 304x0
               RenderText {#text} at (0,0) size 0x0
       RenderTable {TABLE} at (0,626) size 606x6
         RenderTableSection {TBODY} at (0,0) size 606x6

diff --git a/LayoutTests/webarchive/loading/test-loading-archive-expected.txt b/LayoutTests/webarchive/loading/test-loading-archive-expected.txt
index 3231dfb47d5ae9b6048ff709b66e732c4d74afc8..cad172294d6b7d40810ee61d56b3ac418a636ea9 100644 (file)
--- a/LayoutTests/webarchive/loading/test-loading-archive-expected.txt
+++ b/LayoutTests/webarchive/loading/test-loading-archive-expected.txt
@@ -2,7 +2,6 @@ main frame - didStartProvisionalLoadForFrame
 main frame - willCloseFrame
 main frame - didCommitLoadForFrame
 main frame - didClearWindowObjectForFrame
-frame "<!--framePath //<!--frame0-->-->" - didClearWindowObjectForFrame
 frame "<!--framePath //<!--frame0-->-->" - didStartProvisionalLoadForFrame
 resources/helloworld.webarchive - willSendRequest <NSURLRequest resources/helloworld.webarchive> redirectResponse (null)
 main frame - didFinishDocumentLoadForFrame
@@ -10,7 +9,6 @@ main frame - didFinishDocumentLoadForFrame
 resources/helloworld.webarchive - didReceiveResponse <NSURLResponse resources/helloworld.webarchive>
 frame "<!--framePath //<!--frame0-->-->" - willCloseFrame
 frame "<!--framePath //<!--frame0-->-->" - didCommitLoadForFrame
-frame "<!--framePath //<!--frame0-->-->" - didClearWindowObjectForFrame
 frame "<!--framePath //<!--frame0-->-->" - didHandleOnloadEventsForFrame
 main frame - didHandleOnloadEventsForFrame
 frame "<!--framePath //<!--frame0-->-->" - didFinishDocumentLoadForFrame