[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc
mihaip at chromium.org
mihaip at chromium.org
Wed Dec 22 13:43:11 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit 78979d65a4b9fc5689034afb6b70a55700c88c2b
Author: mihaip at chromium.org <mihaip at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Thu Sep 23 23:58:33 2010 +0000
2010-09-23 Mihai Parparita <mihaip at chromium.org>
Reviewed by Dimitri Glazkov.
Convert http/tests/navigation/error404-frames.html to dumpAsText
https://bugs.webkit.org/show_bug.cgi?id=46341
* http/tests/navigation/error404-frames-expected.txt: Added.
* http/tests/navigation/error404-frames.html:
* platform/chromium-linux/http/tests/navigation/error404-frames-expected.checksum: Removed.
* platform/chromium-linux/http/tests/navigation/error404-frames-expected.png: Removed.
* platform/chromium-win/http/tests/navigation/error404-frames-expected.checksum: Removed.
* platform/chromium-win/http/tests/navigation/error404-frames-expected.png: Removed.
* platform/chromium-win/http/tests/navigation/error404-frames-expected.txt: Removed.
* platform/chromium/test_expectations.txt:
* platform/mac/http/tests/navigation/error404-frames-expected.checksum: Removed.
* platform/mac/http/tests/navigation/error404-frames-expected.png: Removed.
* platform/mac/http/tests/navigation/error404-frames-expected.txt: Removed.
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@68217 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 84920da..dcc077d 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,22 @@
+2010-09-23 Mihai Parparita <mihaip at chromium.org>
+
+ Reviewed by Dimitri Glazkov.
+
+ Convert http/tests/navigation/error404-frames.html to dumpAsText
+ https://bugs.webkit.org/show_bug.cgi?id=46341
+
+ * http/tests/navigation/error404-frames-expected.txt: Added.
+ * http/tests/navigation/error404-frames.html:
+ * platform/chromium-linux/http/tests/navigation/error404-frames-expected.checksum: Removed.
+ * platform/chromium-linux/http/tests/navigation/error404-frames-expected.png: Removed.
+ * platform/chromium-win/http/tests/navigation/error404-frames-expected.checksum: Removed.
+ * platform/chromium-win/http/tests/navigation/error404-frames-expected.png: Removed.
+ * platform/chromium-win/http/tests/navigation/error404-frames-expected.txt: Removed.
+ * platform/chromium/test_expectations.txt:
+ * platform/mac/http/tests/navigation/error404-frames-expected.checksum: Removed.
+ * platform/mac/http/tests/navigation/error404-frames-expected.png: Removed.
+ * platform/mac/http/tests/navigation/error404-frames-expected.txt: Removed.
+
2010-09-23 Tony Chang <tony at chromium.org>
Reviewed by Dimitri Glazkov.
diff --git a/LayoutTests/http/tests/navigation/error404-frames-expected.txt b/LayoutTests/http/tests/navigation/error404-frames-expected.txt
new file mode 100644
index 0000000..588c0be
--- /dev/null
+++ b/LayoutTests/http/tests/navigation/error404-frames-expected.txt
@@ -0,0 +1,17 @@
+
+
+--------
+Frame: 'main'
+--------
+This 404 error was intentionally generated by a test script.
+
+--------
+Frame: 'footer'
+--------
+This is just a minimal page that we navigate to as part of testing back/forward.
+
+============== Back Forward List ==============
+curr-> http://127.0.0.1:8000/navigation/error404-frames.html **nav target**
+ http://127.0.0.1:8000/navigation/resources/otherpage.html (in frame "footer")
+ http://127.0.0.1:8000/navigation/resources/error404.pl (in frame "main")
+===============================================
diff --git a/LayoutTests/http/tests/navigation/error404-frames.html b/LayoutTests/http/tests/navigation/error404-frames.html
index 623560e..c83d96f 100644
--- a/LayoutTests/http/tests/navigation/error404-frames.html
+++ b/LayoutTests/http/tests/navigation/error404-frames.html
@@ -1,6 +1,15 @@
-<script type="text/javascript" src="resources/testcode.js"></script>
-<script>
- runBasicTest("resources/frameset.pl?frameURL=error404.pl", "none");
-</script>
-This page just kicks off a test, and should not appear in the expected test output.
-The files in the resources dir have comments about the tests.
+<html>
+ <!-- Tests that 404s in frames are handled correctly -->
+ <script>
+ if (window.layoutTestController) {
+ layoutTestController.dumpAsText();
+ layoutTestController.dumpChildFramesAsText();
+ layoutTestController.clearBackForwardList();
+ layoutTestController.dumpBackForwardList();
+ }
+ </script>
+ <frameset rows="90%,10%">
+ <frame src="resources/error404.pl" name="main">
+ <frame src="resources/otherpage.html" name="footer">
+ </frameset>
+</html>
\ No newline at end of file
diff --git a/LayoutTests/platform/chromium-linux/http/tests/navigation/error404-frames-expected.checksum b/LayoutTests/platform/chromium-linux/http/tests/navigation/error404-frames-expected.checksum
deleted file mode 100644
index a7d9731..0000000
--- a/LayoutTests/platform/chromium-linux/http/tests/navigation/error404-frames-expected.checksum
+++ /dev/null
@@ -1 +0,0 @@
-d668fa3a8f25b084d86516d27f6464a7
\ No newline at end of file
diff --git a/LayoutTests/platform/chromium-linux/http/tests/navigation/error404-frames-expected.png b/LayoutTests/platform/chromium-linux/http/tests/navigation/error404-frames-expected.png
deleted file mode 100644
index 90533da..0000000
Binary files a/LayoutTests/platform/chromium-linux/http/tests/navigation/error404-frames-expected.png and /dev/null differ
diff --git a/LayoutTests/platform/chromium-win/http/tests/navigation/error404-frames-expected.checksum b/LayoutTests/platform/chromium-win/http/tests/navigation/error404-frames-expected.checksum
deleted file mode 100644
index 7da0234..0000000
--- a/LayoutTests/platform/chromium-win/http/tests/navigation/error404-frames-expected.checksum
+++ /dev/null
@@ -1 +0,0 @@
-149f1acf38bd15129c619e23eabd3e1a
\ No newline at end of file
diff --git a/LayoutTests/platform/chromium-win/http/tests/navigation/error404-frames-expected.png b/LayoutTests/platform/chromium-win/http/tests/navigation/error404-frames-expected.png
deleted file mode 100644
index cf7ec66..0000000
Binary files a/LayoutTests/platform/chromium-win/http/tests/navigation/error404-frames-expected.png and /dev/null differ
diff --git a/LayoutTests/platform/chromium-win/http/tests/navigation/error404-frames-expected.txt b/LayoutTests/platform/chromium-win/http/tests/navigation/error404-frames-expected.txt
deleted file mode 100644
index 96568a5..0000000
--- a/LayoutTests/platform/chromium-win/http/tests/navigation/error404-frames-expected.txt
+++ /dev/null
@@ -1,29 +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
- RenderFrameSet {FRAMESET} at (0,0) size 800x600
- RenderFrame {FRAME} at (0,0) size 800x534
- layer at (0,0) size 800x534
- RenderView at (0,0) size 800x534
- layer at (0,0) size 800x534
- RenderBlock {HTML} at (0,0) size 800x534
- RenderBody {BODY} at (8,8) size 784x518
- RenderText {#text} at (0,0) size 348x19
- text run at (0,0) width 348: "This 404 error was intentionally generated by a test script."
- RenderFrame {FRAME} at (0,540) size 800x60
- layer at (0,0) size 785x90
- RenderView at (0,0) size 785x60
- layer at (0,0) size 785x90
- RenderBlock {HTML} at (0,0) size 785x90
- RenderBody {BODY} at (8,8) size 769x74
- RenderText {#text} at (0,0) size 704x73
- text run at (0,0) width 704: "This is just a minimal page that we navigate to as part of"
- text run at (0,37) width 268: "testing back/forward."
-
-============== Back Forward List ==============
- http://127.0.0.1:8000/navigation/error404-frames.html **nav target**
-curr-> http://127.0.0.1:8000/navigation/resources/frameset.pl?frameURL=error404.pl **nav target**
- http://127.0.0.1:8000/navigation/resources/otherpage.html (in frame "footer")
- http://127.0.0.1:8000/navigation/resources/error404.pl (in frame "main")
-===============================================
diff --git a/LayoutTests/platform/chromium/test_expectations.txt b/LayoutTests/platform/chromium/test_expectations.txt
index 2e86552..93d50e6 100644
--- a/LayoutTests/platform/chromium/test_expectations.txt
+++ b/LayoutTests/platform/chromium/test_expectations.txt
@@ -1365,8 +1365,6 @@ BUG23498 MAC : fonts/fantasy.html = IMAGE
BUG23498 MAC : fonts/monospace.html = IMAGE
BUG23498 MAC : fonts/sans-serif.html = IMAGE
BUG23498 MAC : fonts/serif.html = IMAGE
-BUG9798 BUG23498 MAC DEBUG : http/tests/navigation/error404-frames.html = TIMEOUT IMAGE
-BUG9798 BUG23498 MAC RELEASE : http/tests/navigation/error404-frames.html = IMAGE
BUG23498 MAC : http/tests/navigation/error404-subframeload.html = IMAGE
BUG23498 MAC : svg/custom/altglyph.svg = IMAGE
BUG23498 MAC : svg/hixie/links/003-broken.xml = IMAGE
diff --git a/LayoutTests/platform/mac/http/tests/navigation/error404-frames-expected.checksum b/LayoutTests/platform/mac/http/tests/navigation/error404-frames-expected.checksum
deleted file mode 100644
index ff59589..0000000
--- a/LayoutTests/platform/mac/http/tests/navigation/error404-frames-expected.checksum
+++ /dev/null
@@ -1 +0,0 @@
-e46982e0a36f5cc7202ee7701779837a
\ No newline at end of file
diff --git a/LayoutTests/platform/mac/http/tests/navigation/error404-frames-expected.png b/LayoutTests/platform/mac/http/tests/navigation/error404-frames-expected.png
deleted file mode 100644
index 3b4ddd8..0000000
Binary files a/LayoutTests/platform/mac/http/tests/navigation/error404-frames-expected.png and /dev/null differ
diff --git a/LayoutTests/platform/mac/http/tests/navigation/error404-frames-expected.txt b/LayoutTests/platform/mac/http/tests/navigation/error404-frames-expected.txt
deleted file mode 100644
index 88fcedb..0000000
--- a/LayoutTests/platform/mac/http/tests/navigation/error404-frames-expected.txt
+++ /dev/null
@@ -1,29 +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
- RenderFrameSet {FRAMESET} at (0,0) size 800x600
- RenderFrame {FRAME} at (0,0) size 800x534
- layer at (0,0) size 800x534
- RenderView at (0,0) size 800x534
- layer at (0,0) size 800x534
- RenderBlock {HTML} at (0,0) size 800x534
- RenderBody {BODY} at (8,8) size 784x518
- RenderText {#text} at (0,0) size 364x18
- text run at (0,0) width 364: "This 404 error was intentionally generated by a test script."
- RenderFrame {FRAME} at (0,540) size 800x60
- layer at (0,0) size 785x90
- RenderView at (0,0) size 785x60
- layer at (0,0) size 785x90
- RenderBlock {HTML} at (0,0) size 785x90
- RenderBody {BODY} at (8,8) size 769x74
- RenderText {#text} at (0,0) size 722x74
- text run at (0,0) width 722: "This is just a minimal page that we navigate to as part of"
- text run at (0,37) width 272: "testing back/forward."
-
-============== Back Forward List ==============
- http://127.0.0.1:8000/navigation/error404-frames.html **nav target**
-curr-> http://127.0.0.1:8000/navigation/resources/frameset.pl?frameURL=error404.pl **nav target**
- http://127.0.0.1:8000/navigation/resources/otherpage.html (in frame "footer")
- http://127.0.0.1:8000/navigation/resources/error404.pl (in frame "main")
-===============================================
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list