[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc
robert at webkit.org
robert at webkit.org
Wed Dec 22 14:27:44 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit ebf9629dfd453c9651c4c1f970f1fb463b7a96c8
Author: robert at webkit.org <robert at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Sat Oct 9 18:25:55 2010 +0000
2010-10-09 Robert Hogan <robert at webkit.org>
Reviewed by Andreas Kling.
[Qt] Fix url conversion in QWebHistory
Add results for:
http/tests/navigation/error404-basic.html
http/tests/navigation/error404-goback.html
http/tests/navigation/error404-subframeload.html
http/tests/navigation/javascriptlink-frames.html
http/tests/navigation/postredirect-basic.html
http/tests/navigation/postredirect-frames.html
http/tests/navigation/postredirect-goback1.html
https://bugs.webkit.org/show_bug.cgi?id=47048
* platform/qt/http/tests/navigation/error404-basic-expected.txt: Added.
* platform/qt/http/tests/navigation/error404-goback-expected.txt: Added.
* platform/qt/http/tests/navigation/error404-subframeload-expected.txt: Added.
* platform/qt/http/tests/navigation/javascriptlink-frames-expected.txt: Added.
* platform/qt/http/tests/navigation/postredirect-basic-expected.txt: Added.
* platform/qt/http/tests/navigation/postredirect-frames-expected.txt: Added.
* platform/qt/http/tests/navigation/postredirect-goback1-expected.txt: Added.
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@69451 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 805b9ae..1d7aafa 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,29 @@
+2010-10-09 Robert Hogan <robert at webkit.org>
+
+ Reviewed by Andreas Kling.
+
+ [Qt] Fix url conversion in QWebHistory
+
+ Add results for:
+ http/tests/navigation/error404-basic.html
+ http/tests/navigation/error404-goback.html
+ http/tests/navigation/error404-subframeload.html
+ http/tests/navigation/javascriptlink-frames.html
+ http/tests/navigation/postredirect-basic.html
+ http/tests/navigation/postredirect-frames.html
+ http/tests/navigation/postredirect-goback1.html
+
+ https://bugs.webkit.org/show_bug.cgi?id=47048
+
+
+ * platform/qt/http/tests/navigation/error404-basic-expected.txt: Added.
+ * platform/qt/http/tests/navigation/error404-goback-expected.txt: Added.
+ * platform/qt/http/tests/navigation/error404-subframeload-expected.txt: Added.
+ * platform/qt/http/tests/navigation/javascriptlink-frames-expected.txt: Added.
+ * platform/qt/http/tests/navigation/postredirect-basic-expected.txt: Added.
+ * platform/qt/http/tests/navigation/postredirect-frames-expected.txt: Added.
+ * platform/qt/http/tests/navigation/postredirect-goback1-expected.txt: Added.
+
2010-10-09 Martin Robinson <mrobinson at igalia.com>
Reviewed by Xan Lopez.
diff --git a/LayoutTests/platform/qt/http/tests/navigation/error404-basic-expected.txt b/LayoutTests/platform/qt/http/tests/navigation/error404-basic-expected.txt
new file mode 100644
index 0000000..6db2ec8
--- /dev/null
+++ b/LayoutTests/platform/qt/http/tests/navigation/error404-basic-expected.txt
@@ -0,0 +1,12 @@
+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 784x584
+ RenderText {#text} at (0,0) size 475x25
+ text run at (0,0) width 475: "This 404 error was intentionally generated by a test script."
+
+============== Back Forward List ==============
+ http://127.0.0.1:8000/navigation/error404-basic.html **nav target**
+curr-> http://127.0.0.1:8000/navigation/resources/error404.pl **nav target**
+===============================================
diff --git a/LayoutTests/platform/qt/http/tests/navigation/error404-goback-expected.txt b/LayoutTests/platform/qt/http/tests/navigation/error404-goback-expected.txt
new file mode 100644
index 0000000..bafe6d1
--- /dev/null
+++ b/LayoutTests/platform/qt/http/tests/navigation/error404-goback-expected.txt
@@ -0,0 +1,15 @@
+CONSOLE MESSAGE: line 1: ReferenceError: Can't find variable: fillTestForm
+CONSOLE MESSAGE: line 1: ReferenceError: Can't find variable: scrollDocDown
+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 784x584
+ RenderText {#text} at (0,0) size 475x25
+ text run at (0,0) width 475: "This 404 error was intentionally generated by a test script."
+
+============== Back Forward List ==============
+ http://127.0.0.1:8000/navigation/error404-goback.html **nav target**
+curr-> http://127.0.0.1:8000/navigation/resources/error404.pl **nav target**
+ http://127.0.0.1:8000/navigation/resources/otherpage.html **nav target**
+===============================================
diff --git a/LayoutTests/platform/qt/http/tests/navigation/error404-subframeload-expected.txt b/LayoutTests/platform/qt/http/tests/navigation/error404-subframeload-expected.txt
new file mode 100644
index 0000000..b3f55b4
--- /dev/null
+++ b/LayoutTests/platform/qt/http/tests/navigation/error404-subframeload-expected.txt
@@ -0,0 +1,32 @@
+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 475x25
+ text run at (0,0) width 475: "This 404 error was intentionally generated by a test script."
+ RenderFrame {FRAME} at (0,540) size 800x60
+ layer at (0,0) size 784x114
+ RenderView at (0,0) size 784x60
+ layer at (0,0) size 784x114
+ RenderBlock {HTML} at (0,0) size 784x114
+ RenderBody {BODY} at (8,8) size 768x98
+ RenderText {#text} at (0,0) size 762x98
+ text run at (0,0) width 762: "This is just a minimal page that we navigate to"
+ text run at (0,49) width 517: "as part of testing back/forward."
+
+============== Back Forward List ==============
+ http://127.0.0.1:8000/navigation/error404-subframeload.html **nav target**
+ http://127.0.0.1:8000/navigation/resources/frameset.pl?frameURL=otherpage.html **nav target**
+ http://127.0.0.1:8000/navigation/resources/otherpage.html (in frame "footer")
+ http://127.0.0.1:8000/navigation/resources/otherpage.html (in frame "main")
+curr-> http://127.0.0.1:8000/navigation/resources/frameset.pl?frameURL=otherpage.html
+ 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") **nav target**
+===============================================
diff --git a/LayoutTests/platform/qt/http/tests/navigation/javascriptlink-frames-expected.txt b/LayoutTests/platform/qt/http/tests/navigation/javascriptlink-frames-expected.txt
new file mode 100644
index 0000000..b5e7150
--- /dev/null
+++ b/LayoutTests/platform/qt/http/tests/navigation/javascriptlink-frames-expected.txt
@@ -0,0 +1,129 @@
+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 784x2564
+ RenderView at (0,0) size 784x534
+ layer at (0,0) size 784x2564
+ RenderBlock {HTML} at (0,0) size 784x2564
+ RenderBody {BODY} at (8,8) size 768x2518
+ RenderBlock (anonymous) at (0,0) size 768x392
+ RenderText {#text} at (0,0) size 748x294
+ text run at (0,0) width 748: "This is test page that we navigate to as part of"
+ text run at (0,49) width 542: "testing various navigation styles. "
+ text run at (542,49) width 201: "It includes a"
+ text run at (0,98) width 734: "form so that we can test saving and restoring"
+ text run at (0,147) width 719: "of form data, and it needs to be long enough"
+ text run at (0,196) width 741: "that we can test saving and restoring of scroll"
+ text run at (0,245) width 150: "position. "
+ RenderBR {BR} at (150,282) size 0x0
+ RenderBR {BR} at (0,294) size 0x49
+ RenderBR {BR} at (0,343) size 0x49
+ RenderBlock {HR} at (0,411) size 768x2 [border: (1px inset #000000)]
+ RenderBlock {FORM} at (0,432) size 768x1089
+ RenderButton {INPUT} at (2,2) size 322x58 [bgcolor=#C0C0C0]
+ RenderBlock (anonymous) at (6,6) size 310x47
+ RenderText at (0,0) size 310x47
+ text run at (0,0) width 310: "Submit with POST"
+ RenderBR {BR} at (326,45) size 0x0
+ RenderButton {INPUT} at (2,64) size 692x58 [bgcolor=#C0C0C0]
+ RenderBlock (anonymous) at (6,6) size 680x47
+ RenderText at (0,0) size 680x47
+ text run at (0,0) width 680: "Submit with POST followed by a redirect"
+ RenderBR {BR} at (696,107) size 0x0
+ RenderText {#text} at (0,124) size 481x49
+ text run at (0,124) width 481: "Here are some form elements"
+ RenderTextControl {INPUT} at (2,175) size 386x53
+ RenderBR {BR} at (390,214) size 0x0
+ RenderText {#text} at (0,230) size 428x49
+ text run at (0,230) width 428: "that we can use for testing"
+ RenderTextControl {INPUT} at (2,281) size 386x53
+ RenderBR {BR} at (390,320) size 0x0
+ RenderBlock {INPUT} at (9,363) size 12x12
+ RenderText {#text} at (30,336) size 93x49
+ text run at (30,336) width 93: " Male"
+ RenderBR {BR} at (123,373) size 0x0
+ RenderBlock {INPUT} at (9,412) size 12x12
+ RenderText {#text} at (30,385) size 129x49
+ text run at (30,385) width 129: " Female"
+ RenderBR {BR} at (159,422) size 0x0
+ RenderBlock {INPUT} at (9,460) size 13x13
+ RenderText {#text} at (31,434) size 162x49
+ text run at (31,434) width 162: " option #1"
+ RenderBR {BR} at (193,471) size 0x0
+ RenderBlock {INPUT} at (9,509) size 13x13
+ RenderText {#text} at (31,483) size 162x49
+ text run at (31,483) width 162: " option #2"
+ RenderBR {BR} at (193,520) size 0x0
+ RenderMenuList {SELECT} at (2,534) size 716x55 [bgcolor=#FFFFFF]
+ RenderBlock (anonymous) at (8,4) size 684x49
+ RenderText at (0,0) size 206x49
+ text run at (0,0) width 206: "Initial Value"
+ RenderBR {BR} at (720,575) size 0x0
+ RenderText {#text} at (0,0) size 0x0
+ RenderBlock {HR} at (0,1559) size 768x2 [border: (1px inset #000000)]
+ RenderBlock {P} at (0,1599) size 768x49
+ RenderText {#text} at (0,0) size 73x49
+ text run at (0,0) width 73: "Now"
+ RenderBlock {P} at (0,1686) size 768x49
+ RenderText {#text} at (0,0) size 83x49
+ text run at (0,0) width 83: "some"
+ RenderBlock {P} at (0,1773) size 768x49
+ RenderText {#text} at (0,0) size 80x49
+ text run at (0,0) width 80: "filler"
+ RenderBlock {P} at (0,1860) size 768x49
+ RenderText {#text} at (0,0) size 34x49
+ text run at (0,0) width 34: "so"
+ RenderBlock {P} at (0,1947) size 768x49
+ RenderText {#text} at (0,0) size 51x49
+ text run at (0,0) width 51: "the"
+ RenderBlock {P} at (0,2034) size 768x49
+ RenderText {#text} at (0,0) size 57x49
+ text run at (0,0) width 57: "doc"
+ RenderBlock {P} at (0,2121) size 768x49
+ RenderText {#text} at (0,0) size 26x49
+ text run at (0,0) width 26: "is"
+ RenderBlock {P} at (0,2208) size 768x49
+ RenderText {#text} at (0,0) size 70x49
+ text run at (0,0) width 70: "long"
+ RenderBlock {P} at (0,2295) size 768x49
+ RenderText {#text} at (0,0) size 118x49
+ text run at (0,0) width 118: "enough"
+ RenderBlock {P} at (0,2382) size 768x49
+ RenderText {#text} at (0,0) size 142x49
+ text run at (0,0) width 142: "to scroll."
+ RenderBlock {P} at (0,2469) size 768x49
+ RenderInline {A} at (0,0) size 692x49
+ RenderText {#text} at (0,0) size 692x49
+ text run at (0,0) width 692: "This is an anchor point named \"anchor1\"."
+ layer at (12,617) size 382x49 scrollWidth 466
+ RenderBlock {DIV} at (2,2) size 382x49
+ RenderText {#text} at (1,0) size 464x49
+ text run at (1,0) width 464: "Initial text before user input"
+ layer at (12,723) size 382x49
+ RenderBlock {DIV} at (2,2) size 382x49
+ layer at (10,1033) size 590x494
+ RenderTextControl {TEXTAREA} at (2,593) size 590x494
+ RenderBlock {DIV} at (2,2) size 586x98
+ RenderText {#text} at (0,0) size 569x49
+ text run at (0,0) width 569: "More initial text before user input."
+ text run at (569,0) width 0: " "
+ RenderBR {BR} at (0,49) size 0x49
+ RenderFrame {FRAME} at (0,540) size 800x60
+ layer at (0,0) size 784x114
+ RenderView at (0,0) size 784x60
+ layer at (0,0) size 784x114
+ RenderBlock {HTML} at (0,0) size 784x114
+ RenderBody {BODY} at (8,8) size 768x98
+ RenderText {#text} at (0,0) size 762x98
+ text run at (0,0) width 762: "This is just a minimal page that we navigate to"
+ text run at (0,49) width 517: "as part of testing back/forward."
+
+============== Back Forward List ==============
+ http://127.0.0.1:8000/navigation/javascriptlink-frames.html **nav target**
+curr-> http://127.0.0.1:8000/navigation/resources/frameset.pl?frameURL=javascriptlink.html **nav target**
+ http://127.0.0.1:8000/navigation/resources/otherpage.html (in frame "footer")
+ http://127.0.0.1:8000/navigation/resources/success200.html (in frame "main")
+===============================================
diff --git a/LayoutTests/platform/qt/http/tests/navigation/postredirect-basic-expected.txt b/LayoutTests/platform/qt/http/tests/navigation/postredirect-basic-expected.txt
new file mode 100644
index 0000000..d5bfb68
--- /dev/null
+++ b/LayoutTests/platform/qt/http/tests/navigation/postredirect-basic-expected.txt
@@ -0,0 +1,30 @@
+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 784x584
+ RenderText {#text} at (0,0) size 762x98
+ text run at (0,0) width 762: "This is just a minimal page that we navigate in"
+ text run at (0,49) width 476: "response to an HTTP POST. "
+ RenderBR {BR} at (0,0) size 0x0
+ RenderBR {BR} at (0,98) size 0x49
+ RenderText {#text} at (0,147) size 753x196
+ text run at (0,147) width 678: "If the next line is empty after the colon, it"
+ text run at (0,196) width 501: "probably means that we made "
+ text run at (501,196) width 228: "a mistake and"
+ text run at (0,245) width 753: "requested this page with a GET with no query"
+ text run at (0,294) width 317: "instead of a POST. "
+ RenderBR {BR} at (0,0) size 0x0
+ RenderBR {BR} at (0,343) size 0x49
+ RenderText {#text} at (0,392) size 723x98
+ text run at (0,392) width 723: "The first text field contained: New form text"
+ text run at (0,441) width 171: "from user "
+ RenderBR {BR} at (0,0) size 0x0
+ RenderText {#text} at (0,490) size 733x49
+ text run at (0,490) width 733: "This page was requested with an HTTP GET"
+
+============== Back Forward List ==============
+ http://127.0.0.1:8000/navigation/postredirect-basic.html **nav target**
+ http://127.0.0.1:8000/navigation/resources/success200.html **nav target**
+curr-> http://127.0.0.1:8000/navigation/resources/postresult.pl?submitwithpostredirect=Submit%20with%20POST%20followed%20by%20a%20redirect&textfield1=New%20form%20text%20from%20user&textfield2=&radiogroup1=female&checkbox2=on&selectgroup1=fiat&textarea1=More%20new%20form%20text%20from%20user%2C%20which%20should%20be%20restored%20when%20we%20return%20to%20this%20page.&redirectHappened=true **nav target**
+===============================================
diff --git a/LayoutTests/platform/qt/http/tests/navigation/postredirect-frames-expected.txt b/LayoutTests/platform/qt/http/tests/navigation/postredirect-frames-expected.txt
new file mode 100644
index 0000000..1fc2e03
--- /dev/null
+++ b/LayoutTests/platform/qt/http/tests/navigation/postredirect-frames-expected.txt
@@ -0,0 +1,49 @@
+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 784x555
+ RenderView at (0,0) size 784x534
+ layer at (0,0) size 784x555
+ RenderBlock {HTML} at (0,0) size 784x555
+ RenderBody {BODY} at (8,8) size 768x539
+ RenderText {#text} at (0,0) size 762x98
+ text run at (0,0) width 762: "This is just a minimal page that we navigate in"
+ text run at (0,49) width 476: "response to an HTTP POST. "
+ RenderBR {BR} at (0,0) size 0x0
+ RenderBR {BR} at (0,98) size 0x49
+ RenderText {#text} at (0,147) size 753x196
+ text run at (0,147) width 678: "If the next line is empty after the colon, it"
+ text run at (0,196) width 501: "probably means that we made "
+ text run at (501,196) width 228: "a mistake and"
+ text run at (0,245) width 753: "requested this page with a GET with no query"
+ text run at (0,294) width 317: "instead of a POST. "
+ RenderBR {BR} at (0,0) size 0x0
+ RenderBR {BR} at (0,343) size 0x49
+ RenderText {#text} at (0,392) size 723x98
+ text run at (0,392) width 723: "The first text field contained: New form text"
+ text run at (0,441) width 171: "from user "
+ RenderBR {BR} at (0,0) size 0x0
+ RenderText {#text} at (0,490) size 733x49
+ text run at (0,490) width 733: "This page was requested with an HTTP GET"
+ RenderFrame {FRAME} at (0,540) size 800x60
+ layer at (0,0) size 784x114
+ RenderView at (0,0) size 784x60
+ layer at (0,0) size 784x114
+ RenderBlock {HTML} at (0,0) size 784x114
+ RenderBody {BODY} at (8,8) size 768x98
+ RenderText {#text} at (0,0) size 762x98
+ text run at (0,0) width 762: "This is just a minimal page that we navigate to"
+ text run at (0,49) width 517: "as part of testing back/forward."
+
+============== Back Forward List ==============
+ http://127.0.0.1:8000/navigation/postredirect-frames.html **nav target**
+ http://127.0.0.1:8000/navigation/resources/frameset.pl?frameURL=success200.html **nav target**
+ http://127.0.0.1:8000/navigation/resources/otherpage.html (in frame "footer")
+ http://127.0.0.1:8000/navigation/resources/success200.html (in frame "main")
+curr-> http://127.0.0.1:8000/navigation/resources/frameset.pl?frameURL=success200.html
+ http://127.0.0.1:8000/navigation/resources/otherpage.html (in frame "footer")
+ http://127.0.0.1:8000/navigation/resources/postresult.pl (in frame "main") **nav target**
+===============================================
diff --git a/LayoutTests/platform/qt/http/tests/navigation/postredirect-goback1-expected.txt b/LayoutTests/platform/qt/http/tests/navigation/postredirect-goback1-expected.txt
new file mode 100644
index 0000000..ba1c024
--- /dev/null
+++ b/LayoutTests/platform/qt/http/tests/navigation/postredirect-goback1-expected.txt
@@ -0,0 +1,31 @@
+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 784x584
+ RenderText {#text} at (0,0) size 762x98
+ text run at (0,0) width 762: "This is just a minimal page that we navigate in"
+ text run at (0,49) width 476: "response to an HTTP POST. "
+ RenderBR {BR} at (0,0) size 0x0
+ RenderBR {BR} at (0,98) size 0x49
+ RenderText {#text} at (0,147) size 753x196
+ text run at (0,147) width 678: "If the next line is empty after the colon, it"
+ text run at (0,196) width 501: "probably means that we made "
+ text run at (501,196) width 228: "a mistake and"
+ text run at (0,245) width 753: "requested this page with a GET with no query"
+ text run at (0,294) width 317: "instead of a POST. "
+ RenderBR {BR} at (0,0) size 0x0
+ RenderBR {BR} at (0,343) size 0x49
+ RenderText {#text} at (0,392) size 723x98
+ text run at (0,392) width 723: "The first text field contained: New form text"
+ text run at (0,441) width 171: "from user "
+ RenderBR {BR} at (0,0) size 0x0
+ RenderText {#text} at (0,490) size 733x49
+ text run at (0,490) width 733: "This page was requested with an HTTP GET"
+
+============== Back Forward List ==============
+ http://127.0.0.1:8000/navigation/postredirect-goback1.html **nav target**
+ http://127.0.0.1:8000/navigation/resources/success200.html **nav target**
+curr-> http://127.0.0.1:8000/navigation/resources/postresult.pl?submitwithpostredirect=Submit%20with%20POST%20followed%20by%20a%20redirect&textfield1=New%20form%20text%20from%20user&textfield2=&radiogroup1=female&checkbox2=on&selectgroup1=fiat&textarea1=More%20new%20form%20text%20from%20user%2C%20which%20should%20be%20restored%20when%20we%20return%20to%20this%20page.&redirectHappened=true **nav target**
+ http://127.0.0.1:8000/navigation/resources/otherpage.html **nav target**
+===============================================
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list