Diff
Modified: trunk/LayoutTests/ChangeLog (89993 => 89994)
--- trunk/LayoutTests/ChangeLog 2011-06-29 06:54:22 UTC (rev 89993)
+++ trunk/LayoutTests/ChangeLog 2011-06-29 07:11:50 UTC (rev 89994)
@@ -1,3 +1,21 @@
+2011-06-29 Darin Adler <[email protected]>
+
+ Reviewed by Adam Barth.
+
+ Consolidate the fast/loader and fast/loading directories
+ https://bugs.webkit.org/show_bug.cgi?id=63587
+
+ * fast/loader/resources/subframe-that-removes-itself.html: Copied from LayoutTests/fast/loading/resources/subframe-that-removes-itself.html.
+ * fast/loader/subframe-removes-itself-expected.txt: Copied from LayoutTests/fast/loading/subframe-removes-itself-expected.txt.
+ * fast/loader/subframe-removes-itself.html: Copied from LayoutTests/fast/loading/subframe-removes-itself.html.
+ * fast/loading/resources/subframe-that-removes-itself.html: Removed.
+ * fast/loading/subframe-removes-itself-expected.txt: Removed.
+ * fast/loading/subframe-removes-itself.html: Removed.
+
+ * platform/gtk/Skipped: Updated for new location of test.
+ * platform/mac-wk2/Skipped: Ditto.
+ * platform/qt-wk2/Skipped: Ditto.
+
2011-06-28 Dirk Schulze <[email protected]>
Reviewed by Nikolas Zimmermann.
Copied: trunk/LayoutTests/fast/loader/resources/subframe-that-removes-itself.html (from rev 89993, trunk/LayoutTests/fast/loading/resources/subframe-that-removes-itself.html) (0 => 89994)
--- trunk/LayoutTests/fast/loader/resources/subframe-that-removes-itself.html (rev 0)
+++ trunk/LayoutTests/fast/loader/resources/subframe-that-removes-itself.html 2011-06-29 07:11:50 UTC (rev 89994)
@@ -0,0 +1,3 @@
+<script>
+parent.document.body.removeChild(parent.document.getElementsByTagName("iframe")[0]);
+</script>
Copied: trunk/LayoutTests/fast/loader/subframe-removes-itself-expected.txt (from rev 89993, trunk/LayoutTests/fast/loading/subframe-removes-itself-expected.txt) (0 => 89994)
--- trunk/LayoutTests/fast/loader/subframe-removes-itself-expected.txt (rev 0)
+++ trunk/LayoutTests/fast/loader/subframe-removes-itself-expected.txt 2011-06-29 07:11:50 UTC (rev 89994)
@@ -0,0 +1,7 @@
+frame "<!--framePath //<!--frame0-->-->" - didStartProvisionalLoadForFrame
+main frame - didFinishDocumentLoadForFrame
+frame "<!--framePath //<!--frame0-->-->" - didCommitLoadForFrame
+frame "<!--framePath //<!--frame0-->-->" - didFinishDocumentLoadForFrame
+frame "<!--framePath //<!--frame0-->-->" - didFailLoadWithError
+main frame - didFinishLoadForFrame
+This tests a subframe that removes itself to make sure a delegate message to indicate the interrupted load fires.
Copied: trunk/LayoutTests/fast/loader/subframe-removes-itself.html (from rev 89993, trunk/LayoutTests/fast/loading/subframe-removes-itself.html) (0 => 89994)
--- trunk/LayoutTests/fast/loader/subframe-removes-itself.html (rev 0)
+++ trunk/LayoutTests/fast/loader/subframe-removes-itself.html 2011-06-29 07:11:50 UTC (rev 89994)
@@ -0,0 +1,8 @@
+This tests a subframe that removes itself to make sure a delegate message to indicate the interrupted load fires.
+<script>
+if (window.layoutTestController) {
+ layoutTestController.dumpAsText();
+ layoutTestController.dumpFrameLoadCallbacks();
+}
+</script>
+<iframe src=""
Deleted: trunk/LayoutTests/fast/loading/resources/subframe-that-removes-itself.html (89993 => 89994)
--- trunk/LayoutTests/fast/loading/resources/subframe-that-removes-itself.html 2011-06-29 06:54:22 UTC (rev 89993)
+++ trunk/LayoutTests/fast/loading/resources/subframe-that-removes-itself.html 2011-06-29 07:11:50 UTC (rev 89994)
@@ -1,3 +0,0 @@
-<script>
-parent.document.body.removeChild(parent.document.getElementsByTagName("iframe")[0]);
-</script>
Deleted: trunk/LayoutTests/fast/loading/subframe-removes-itself-expected.txt (89993 => 89994)
--- trunk/LayoutTests/fast/loading/subframe-removes-itself-expected.txt 2011-06-29 06:54:22 UTC (rev 89993)
+++ trunk/LayoutTests/fast/loading/subframe-removes-itself-expected.txt 2011-06-29 07:11:50 UTC (rev 89994)
@@ -1,9 +0,0 @@
-main frame - didStartProvisionalLoadForFrame
-main frame - didCommitLoadForFrame
-frame "<!--framePath //<!--frame0-->-->" - didStartProvisionalLoadForFrame
-main frame - didFinishDocumentLoadForFrame
-frame "<!--framePath //<!--frame0-->-->" - didCommitLoadForFrame
-frame "<!--framePath //<!--frame0-->-->" - didFinishDocumentLoadForFrame
-frame "<!--framePath //<!--frame0-->-->" - didFailLoadWithError
-main frame - didFinishLoadForFrame
-This tests a subframe that removes itself to make sure a delegate message to indicate the interrupted load fires.
Deleted: trunk/LayoutTests/fast/loading/subframe-removes-itself.html (89993 => 89994)
--- trunk/LayoutTests/fast/loading/subframe-removes-itself.html 2011-06-29 06:54:22 UTC (rev 89993)
+++ trunk/LayoutTests/fast/loading/subframe-removes-itself.html 2011-06-29 07:11:50 UTC (rev 89994)
@@ -1,6 +0,0 @@
-This tests a subframe that removes itself to make sure a delegate message to indicate the interrupted load fires.
-<script>
-if (window.layoutTestController)
- layoutTestController.dumpAsText();
-</script>
-<iframe src=""
Modified: trunk/LayoutTests/platform/gtk/Skipped (89993 => 89994)
--- trunk/LayoutTests/platform/gtk/Skipped 2011-06-29 06:54:22 UTC (rev 89993)
+++ trunk/LayoutTests/platform/gtk/Skipped 2011-06-29 07:11:50 UTC (rev 89994)
@@ -481,7 +481,7 @@
fast/loader/policy-delegate-action-hit-test-zoomed.html
fast/loader/reload-policy-delegate.html
fast/loader/stop-provisional-loads.html
-fast/loading/subframe-removes-itself.html
+fast/loader/subframe-removes-itself.html
# This policy delegate is implemented, but it needs the DOM node path in the output.
fast/encoding/mailto-always-utf-8.html
# Missing output when page icon changes. We need some API exposing this event.
Modified: trunk/LayoutTests/platform/mac-wk2/Skipped (89993 => 89994)
--- trunk/LayoutTests/platform/mac-wk2/Skipped 2011-06-29 06:54:22 UTC (rev 89993)
+++ trunk/LayoutTests/platform/mac-wk2/Skipped 2011-06-29 07:11:50 UTC (rev 89994)
@@ -1481,7 +1481,7 @@
# WebKitTestRunner needs to print frame load delegate information
# <https://bugs.webkit.org/show_bug.cgi?id=42705>
-fast/loading/subframe-removes-itself.html
+fast/loader/subframe-removes-itself.html
http/tests/loading/bad-scheme-subframe.html
http/tests/loading/bad-server-subframe.html
http/tests/loading/basic.html
Modified: trunk/LayoutTests/platform/qt-wk2/Skipped (89993 => 89994)
--- trunk/LayoutTests/platform/qt-wk2/Skipped 2011-06-29 06:54:22 UTC (rev 89993)
+++ trunk/LayoutTests/platform/qt-wk2/Skipped 2011-06-29 07:11:50 UTC (rev 89994)
@@ -1251,7 +1251,7 @@
# WebKitTestRunner needs to print frame load delegate information
# <https://bugs.webkit.org/show_bug.cgi?id=42705>
-fast/loading/subframe-removes-itself.html
+fast/loader/subframe-removes-itself.html
http/tests/loading/bad-scheme-subframe.html
http/tests/loading/bad-server-subframe.html
http/tests/loading/basic.html
