summaryrefslogtreecommitdiffstats
path: root/webkit
diff options
context:
space:
mode:
authorukai@chromium.org <ukai@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-07-30 06:08:33 +0000
committerukai@chromium.org <ukai@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-07-30 06:08:33 +0000
commit340e050c09a44bcd25a54f9003186b8a95ef565e (patch)
tree851ba459ac5f15132576a5a5e5416e23fe73cea7 /webkit
parentadb2923ca85bd46112112df8d056308ad3798b0f (diff)
downloadchromium_src-340e050c09a44bcd25a54f9003186b8a95ef565e.zip
chromium_src-340e050c09a44bcd25a54f9003186b8a95ef565e.tar.gz
chromium_src-340e050c09a44bcd25a54f9003186b8a95ef565e.tar.bz2
Add expected data for new layout tests
webkit 46548 LayoutTests/http/tests/loading/redirect-methods.html webkit 46561 LayoutTests/fast/lists/ol-start-parsing.html Fixed in webkit 46567 LayoutTests/editing/style/remove-underline-from-stylesheet.html TBR=tony BUG=18014,18050,18051 TEST=none Review URL: http://codereview.chromium.org/159627 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@22042 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit')
-rw-r--r--webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/lists/ol-start-parsing-expected.checksum1
-rw-r--r--webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/lists/ol-start-parsing-expected.pngbin0 -> 21197 bytes
-rw-r--r--webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/lists/ol-start-parsing-expected.txt160
-rw-r--r--webkit/data/layout_tests/platform/chromium-linux/LayoutTests/http/tests/loading/redirect-methods-expected.txt99
-rw-r--r--webkit/data/layout_tests/platform/chromium-mac/LayoutTests/http/tests/loading/redirect-methods-expected.txt99
-rw-r--r--webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/lists/ol-start-parsing-expected.checksum1
-rw-r--r--webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/lists/ol-start-parsing-expected.pngbin0 -> 7563 bytes
-rw-r--r--webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/lists/ol-start-parsing-expected.txt160
-rw-r--r--webkit/data/layout_tests/platform/chromium-win/LayoutTests/http/tests/loading/redirect-methods-expected.txt99
-rw-r--r--webkit/tools/layout_tests/test_expectations.txt4
10 files changed, 620 insertions, 3 deletions
diff --git a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/lists/ol-start-parsing-expected.checksum b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/lists/ol-start-parsing-expected.checksum
new file mode 100644
index 0000000..8ccf92b
--- /dev/null
+++ b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/lists/ol-start-parsing-expected.checksum
@@ -0,0 +1 @@
+2d5a6fc987350c34a6471c4f0b72f045 \ No newline at end of file
diff --git a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/lists/ol-start-parsing-expected.png b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/lists/ol-start-parsing-expected.png
new file mode 100644
index 0000000..5d56b3d
--- /dev/null
+++ b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/lists/ol-start-parsing-expected.png
Binary files differ
diff --git a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/lists/ol-start-parsing-expected.txt b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/lists/ol-start-parsing-expected.txt
new file mode 100644
index 0000000..f763962
--- /dev/null
+++ b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/lists/ol-start-parsing-expected.txt
@@ -0,0 +1,160 @@
+layer at (0,0) size 785x1222
+ RenderView at (0,0) size 785x600
+layer at (0,0) size 785x1222
+ RenderBlock {HTML} at (0,0) size 785x1222
+ RenderBody {BODY} at (8,8) size 769x1206
+ RenderBlock (anonymous) at (0,0) size 769x20
+ RenderText {#text} at (0,0) size 107x19
+ text run at (0,0) width 107: "No start attribute."
+ RenderBlock {OL} at (0,36) size 769x40
+ RenderListItem {LI} at (40,0) size 729x20
+ RenderListMarker at (-21,0) size 16x19: "1"
+ RenderText {#text} at (0,0) size 73x19
+ text run at (0,0) width 73: "Should be 1"
+ RenderListItem {LI} at (40,20) size 729x20
+ RenderListMarker at (-21,0) size 16x19: "2"
+ RenderText {#text} at (0,0) size 73x19
+ text run at (0,0) width 73: "Should be 2"
+ RenderBlock {HR} at (0,92) size 769x2 [border: (1px inset #000000)]
+ RenderBlock (anonymous) at (0,102) size 769x20
+ RenderText {#text} at (0,0) size 26x19
+ text run at (0,0) width 26: "start"
+ RenderBlock {OL} at (0,138) size 769x40
+ RenderListItem {LI} at (40,0) size 729x20
+ RenderListMarker at (-21,0) size 16x19: "1"
+ RenderText {#text} at (0,0) size 73x19
+ text run at (0,0) width 73: "Should be 1"
+ RenderListItem {LI} at (40,20) size 729x20
+ RenderListMarker at (-21,0) size 16x19: "2"
+ RenderText {#text} at (0,0) size 73x19
+ text run at (0,0) width 73: "Should be 2"
+ RenderBlock {HR} at (0,194) size 769x2 [border: (1px inset #000000)]
+ RenderBlock (anonymous) at (0,204) size 769x20
+ RenderText {#text} at (0,0) size 45x19
+ text run at (0,0) width 45: "start=\"\""
+ RenderBlock {OL} at (0,240) size 769x40
+ RenderListItem {LI} at (40,0) size 729x20
+ RenderListMarker at (-21,0) size 16x19: "1"
+ RenderText {#text} at (0,0) size 73x19
+ text run at (0,0) width 73: "Should be 1"
+ RenderListItem {LI} at (40,20) size 729x20
+ RenderListMarker at (-21,0) size 16x19: "2"
+ RenderText {#text} at (0,0) size 73x19
+ text run at (0,0) width 73: "Should be 2"
+ RenderBlock {HR} at (0,296) size 769x2 [border: (1px inset #000000)]
+ RenderBlock (anonymous) at (0,306) size 769x20
+ RenderText {#text} at (0,0) size 61x19
+ text run at (0,0) width 61: "start=\" 2 \""
+ RenderBlock {OL} at (0,342) size 769x40
+ RenderListItem {LI} at (40,0) size 729x20
+ RenderListMarker at (-21,0) size 16x19: "2"
+ RenderText {#text} at (0,0) size 73x19
+ text run at (0,0) width 73: "Should be 2"
+ RenderListItem {LI} at (40,20) size 729x20
+ RenderListMarker at (-21,0) size 16x19: "3"
+ RenderText {#text} at (0,0) size 73x19
+ text run at (0,0) width 73: "Should be 3"
+ RenderBlock {HR} at (0,398) size 769x2 [border: (1px inset #000000)]
+ RenderBlock (anonymous) at (0,408) size 769x20
+ RenderText {#text} at (0,0) size 62x19
+ text run at (0,0) width 62: "start=\"+2\""
+ RenderBlock {OL} at (0,444) size 769x40
+ RenderListItem {LI} at (40,0) size 729x20
+ RenderListMarker at (-21,0) size 16x19: "2"
+ RenderText {#text} at (0,0) size 73x19
+ text run at (0,0) width 73: "Should be 2"
+ RenderListItem {LI} at (40,20) size 729x20
+ RenderListMarker at (-21,0) size 16x19: "3"
+ RenderText {#text} at (0,0) size 73x19
+ text run at (0,0) width 73: "Should be 3"
+ RenderBlock {HR} at (0,500) size 769x2 [border: (1px inset #000000)]
+ RenderBlock (anonymous) at (0,510) size 769x20
+ RenderText {#text} at (0,0) size 64x19
+ text run at (0,0) width 64: "start=\"A2\""
+ RenderBlock {OL} at (0,546) size 769x40
+ RenderListItem {LI} at (40,0) size 729x20
+ RenderListMarker at (-21,0) size 16x19: "1"
+ RenderText {#text} at (0,0) size 73x19
+ text run at (0,0) width 73: "Should be 1"
+ RenderListItem {LI} at (40,20) size 729x20
+ RenderListMarker at (-21,0) size 16x19: "2"
+ RenderText {#text} at (0,0) size 73x19
+ text run at (0,0) width 73: "Should be 2"
+ RenderBlock {HR} at (0,602) size 769x2 [border: (1px inset #000000)]
+ RenderBlock (anonymous) at (0,612) size 769x20
+ RenderText {#text} at (0,0) size 57x19
+ text run at (0,0) width 57: "start=\".2\""
+ RenderBlock {OL} at (0,648) size 769x40
+ RenderListItem {LI} at (40,0) size 729x20
+ RenderListMarker at (-21,0) size 16x19: "1"
+ RenderText {#text} at (0,0) size 73x19
+ text run at (0,0) width 73: "Should be 1"
+ RenderListItem {LI} at (40,20) size 729x20
+ RenderListMarker at (-21,0) size 16x19: "2"
+ RenderText {#text} at (0,0) size 73x19
+ text run at (0,0) width 73: "Should be 2"
+ RenderBlock {HR} at (0,704) size 769x2 [border: (1px inset #000000)]
+ RenderBlock (anonymous) at (0,714) size 769x20
+ RenderText {#text} at (0,0) size 61x19
+ text run at (0,0) width 61: "start=\"#2\""
+ RenderBlock {OL} at (0,750) size 769x40
+ RenderListItem {LI} at (40,0) size 729x20
+ RenderListMarker at (-21,0) size 16x19: "1"
+ RenderText {#text} at (0,0) size 73x19
+ text run at (0,0) width 73: "Should be 1"
+ RenderListItem {LI} at (40,20) size 729x20
+ RenderListMarker at (-21,0) size 16x19: "2"
+ RenderText {#text} at (0,0) size 73x19
+ text run at (0,0) width 73: "Should be 2"
+ RenderBlock (anonymous) at (0,806) size 769x20
+ RenderText {#text} at (0,0) size 53x19
+ text run at (0,0) width 53: "start=\"0\""
+ RenderBlock {OL} at (0,842) size 769x40
+ RenderListItem {LI} at (40,0) size 729x20
+ RenderListMarker at (-21,0) size 16x19: "0"
+ RenderText {#text} at (0,0) size 73x19
+ text run at (0,0) width 73: "Should be 0"
+ RenderListItem {LI} at (40,20) size 729x20
+ RenderListMarker at (-21,0) size 16x19: "1"
+ RenderText {#text} at (0,0) size 73x19
+ text run at (0,0) width 73: "Should be 1"
+ RenderBlock {HR} at (0,898) size 769x2 [border: (1px inset #000000)]
+ RenderBlock (anonymous) at (0,908) size 769x20
+ RenderText {#text} at (0,0) size 61x19
+ text run at (0,0) width 61: "start=\" 0 \""
+ RenderBlock {OL} at (0,944) size 769x40
+ RenderListItem {LI} at (40,0) size 729x20
+ RenderListMarker at (-21,0) size 16x19: "0"
+ RenderText {#text} at (0,0) size 73x19
+ text run at (0,0) width 73: "Should be 0"
+ RenderListItem {LI} at (40,20) size 729x20
+ RenderListMarker at (-21,0) size 16x19: "1"
+ RenderText {#text} at (0,0) size 73x19
+ text run at (0,0) width 73: "Should be 1"
+ RenderBlock {HR} at (0,1000) size 769x2 [border: (1px inset #000000)]
+ RenderBlock (anonymous) at (0,1010) size 769x20
+ RenderText {#text} at (0,0) size 53x19
+ text run at (0,0) width 53: "start=\"2\""
+ RenderBlock {OL} at (0,1046) size 769x40
+ RenderListItem {LI} at (40,0) size 729x20
+ RenderListMarker at (-21,0) size 16x19: "2"
+ RenderText {#text} at (0,0) size 73x19
+ text run at (0,0) width 73: "Should be 2"
+ RenderListItem {LI} at (40,20) size 729x20
+ RenderListMarker at (-21,0) size 16x19: "3"
+ RenderText {#text} at (0,0) size 73x19
+ text run at (0,0) width 73: "Should be 3"
+ RenderBlock {HR} at (0,1102) size 769x2 [border: (1px inset #000000)]
+ RenderBlock (anonymous) at (0,1112) size 769x20
+ RenderText {#text} at (0,0) size 59x19
+ text run at (0,0) width 59: "start=\"-2\""
+ RenderBlock {OL} at (0,1148) size 769x40
+ RenderListItem {LI} at (40,0) size 729x20
+ RenderListMarker at (-27,0) size 22x19: "-2"
+ RenderText {#text} at (0,0) size 79x19
+ text run at (0,0) width 79: "Should be -2"
+ RenderListItem {LI} at (40,20) size 729x20
+ RenderListMarker at (-27,0) size 22x19: "-1"
+ RenderText {#text} at (0,0) size 79x19
+ text run at (0,0) width 79: "Should be -1"
+ RenderBlock {HR} at (0,1204) size 769x2 [border: (1px inset #000000)]
diff --git a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/http/tests/loading/redirect-methods-expected.txt b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/http/tests/loading/redirect-methods-expected.txt
new file mode 100644
index 0000000..b00a006
--- /dev/null
+++ b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/http/tests/loading/redirect-methods-expected.txt
@@ -0,0 +1,99 @@
+main frame - didStartProvisionalLoadForFrame
+main frame - didCommitLoadForFrame
+main frame - didFinishDocumentLoadForFrame
+main frame - didHandleOnloadEventsForFrame
+main frame - didFinishLoadForFrame
+<unknown> - didFinishLoading
+frame "0" - didStartProvisionalLoadForFrame
+about:blank - willSendRequest <WebRequest URL "about:blank">
+frame "0" - didCommitLoadForFrame
+frame "0" - didFinishDocumentLoadForFrame
+frame "0" - didHandleOnloadEventsForFrame
+frame "0" - didFinishLoadForFrame
+about:blank - didFinishLoading
+frame "0" - didStartProvisionalLoadForFrame
+http://127.0.0.1:8000/loading/resources/redirect-methods-form.html - willSendRequest <WebRequest URL "http://127.0.0.1:8000/loading/resources/redirect-methods-form.html">
+frame "0" - didCancelClientRedirectForFrame
+frame "0" - didCommitLoadForFrame
+frame "0" - didFinishDocumentLoadForFrame
+frame "0" - didHandleOnloadEventsForFrame
+frame "0" - didFinishLoadForFrame
+http://127.0.0.1:8000/loading/resources/redirect-methods-form.html - didFinishLoading
+frame "0" - didStartProvisionalLoadForFrame
+http://127.0.0.1:8000/loading/resources/redirect-methods-result.php - willSendRequest <WebRequest URL "http://127.0.0.1:8000/loading/resources/redirect-methods-result.php">
+http://127.0.0.1:8000/loading/resources/redirect-methods-result.php - willSendRequest <WebRequest URL "http://127.0.0.1:8000/loading/resources/redirect-methods-result.php?redirected=true">
+frame "0" - didCommitLoadForFrame
+frame "0" - didFinishDocumentLoadForFrame
+frame "1" - didStartProvisionalLoadForFrame
+about:blank - willSendRequest <WebRequest URL "about:blank">
+frame "1" - didCommitLoadForFrame
+frame "1" - didFinishDocumentLoadForFrame
+frame "1" - didHandleOnloadEventsForFrame
+frame "1" - didFinishLoadForFrame
+about:blank - didFinishLoading
+frame "0" - didHandleOnloadEventsForFrame
+frame "0" - didFinishLoadForFrame
+http://127.0.0.1:8000/loading/resources/redirect-methods-result.php - didFinishLoading
+frame "1" - didStartProvisionalLoadForFrame
+http://127.0.0.1:8000/loading/resources/redirect-methods-form.html - willSendRequest <WebRequest URL "http://127.0.0.1:8000/loading/resources/redirect-methods-form.html">
+frame "1" - didCancelClientRedirectForFrame
+frame "1" - didCommitLoadForFrame
+frame "1" - didFinishDocumentLoadForFrame
+frame "1" - didHandleOnloadEventsForFrame
+frame "1" - didFinishLoadForFrame
+http://127.0.0.1:8000/loading/resources/redirect-methods-form.html - didFinishLoading
+frame "1" - didStartProvisionalLoadForFrame
+http://127.0.0.1:8000/loading/resources/redirect-methods-result.php - willSendRequest <WebRequest URL "http://127.0.0.1:8000/loading/resources/redirect-methods-result.php">
+http://127.0.0.1:8000/loading/resources/redirect-methods-result.php - willSendRequest <WebRequest URL "http://127.0.0.1:8000/loading/resources/redirect-methods-result.php?redirected=true">
+frame "1" - didCommitLoadForFrame
+frame "1" - didFinishDocumentLoadForFrame
+frame "2" - didStartProvisionalLoadForFrame
+about:blank - willSendRequest <WebRequest URL "about:blank">
+frame "2" - didCommitLoadForFrame
+frame "2" - didFinishDocumentLoadForFrame
+frame "2" - didHandleOnloadEventsForFrame
+frame "2" - didFinishLoadForFrame
+about:blank - didFinishLoading
+frame "1" - didHandleOnloadEventsForFrame
+frame "1" - didFinishLoadForFrame
+http://127.0.0.1:8000/loading/resources/redirect-methods-result.php - didFinishLoading
+frame "2" - didStartProvisionalLoadForFrame
+http://127.0.0.1:8000/loading/resources/redirect-methods-form.html - willSendRequest <WebRequest URL "http://127.0.0.1:8000/loading/resources/redirect-methods-form.html">
+frame "2" - didCancelClientRedirectForFrame
+frame "2" - didCommitLoadForFrame
+frame "2" - didFinishDocumentLoadForFrame
+frame "2" - didHandleOnloadEventsForFrame
+frame "2" - didFinishLoadForFrame
+http://127.0.0.1:8000/loading/resources/redirect-methods-form.html - didFinishLoading
+frame "2" - didStartProvisionalLoadForFrame
+http://127.0.0.1:8000/loading/resources/redirect-methods-result.php - willSendRequest <WebRequest URL "http://127.0.0.1:8000/loading/resources/redirect-methods-result.php">
+http://127.0.0.1:8000/loading/resources/redirect-methods-result.php - willSendRequest <WebRequest URL "http://127.0.0.1:8000/loading/resources/redirect-methods-result.php?redirected=true">
+frame "2" - didCommitLoadForFrame
+frame "2" - didFinishDocumentLoadForFrame
+frame "3" - didStartProvisionalLoadForFrame
+about:blank - willSendRequest <WebRequest URL "about:blank">
+frame "3" - didCommitLoadForFrame
+frame "3" - didFinishDocumentLoadForFrame
+frame "3" - didHandleOnloadEventsForFrame
+frame "3" - didFinishLoadForFrame
+about:blank - didFinishLoading
+frame "2" - didHandleOnloadEventsForFrame
+frame "2" - didFinishLoadForFrame
+http://127.0.0.1:8000/loading/resources/redirect-methods-result.php - didFinishLoading
+frame "3" - didStartProvisionalLoadForFrame
+http://127.0.0.1:8000/loading/resources/redirect-methods-form.html - willSendRequest <WebRequest URL "http://127.0.0.1:8000/loading/resources/redirect-methods-form.html">
+frame "3" - didCancelClientRedirectForFrame
+frame "3" - didCommitLoadForFrame
+frame "3" - didFinishDocumentLoadForFrame
+frame "3" - didHandleOnloadEventsForFrame
+frame "3" - didFinishLoadForFrame
+http://127.0.0.1:8000/loading/resources/redirect-methods-form.html - didFinishLoading
+frame "3" - didStartProvisionalLoadForFrame
+http://127.0.0.1:8000/loading/resources/redirect-methods-result.php - willSendRequest <WebRequest URL "http://127.0.0.1:8000/loading/resources/redirect-methods-result.php">
+http://127.0.0.1:8000/loading/resources/redirect-methods-result.php - willSendRequest <WebRequest URL "http://127.0.0.1:8000/loading/resources/redirect-methods-result.php?redirected=true">
+frame "3" - didCommitLoadForFrame
+frame "3" - didFinishDocumentLoadForFrame
+frame "3" - didHandleOnloadEventsForFrame
+frame "3" - didFinishLoadForFrame
+This test checks to see what HTTP method is used to fetch the final resource in the case where the first request results in a redirect.
+301, 302, 303, and 307 http redirects are all tested.
diff --git a/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/http/tests/loading/redirect-methods-expected.txt b/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/http/tests/loading/redirect-methods-expected.txt
new file mode 100644
index 0000000..b00a006
--- /dev/null
+++ b/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/http/tests/loading/redirect-methods-expected.txt
@@ -0,0 +1,99 @@
+main frame - didStartProvisionalLoadForFrame
+main frame - didCommitLoadForFrame
+main frame - didFinishDocumentLoadForFrame
+main frame - didHandleOnloadEventsForFrame
+main frame - didFinishLoadForFrame
+<unknown> - didFinishLoading
+frame "0" - didStartProvisionalLoadForFrame
+about:blank - willSendRequest <WebRequest URL "about:blank">
+frame "0" - didCommitLoadForFrame
+frame "0" - didFinishDocumentLoadForFrame
+frame "0" - didHandleOnloadEventsForFrame
+frame "0" - didFinishLoadForFrame
+about:blank - didFinishLoading
+frame "0" - didStartProvisionalLoadForFrame
+http://127.0.0.1:8000/loading/resources/redirect-methods-form.html - willSendRequest <WebRequest URL "http://127.0.0.1:8000/loading/resources/redirect-methods-form.html">
+frame "0" - didCancelClientRedirectForFrame
+frame "0" - didCommitLoadForFrame
+frame "0" - didFinishDocumentLoadForFrame
+frame "0" - didHandleOnloadEventsForFrame
+frame "0" - didFinishLoadForFrame
+http://127.0.0.1:8000/loading/resources/redirect-methods-form.html - didFinishLoading
+frame "0" - didStartProvisionalLoadForFrame
+http://127.0.0.1:8000/loading/resources/redirect-methods-result.php - willSendRequest <WebRequest URL "http://127.0.0.1:8000/loading/resources/redirect-methods-result.php">
+http://127.0.0.1:8000/loading/resources/redirect-methods-result.php - willSendRequest <WebRequest URL "http://127.0.0.1:8000/loading/resources/redirect-methods-result.php?redirected=true">
+frame "0" - didCommitLoadForFrame
+frame "0" - didFinishDocumentLoadForFrame
+frame "1" - didStartProvisionalLoadForFrame
+about:blank - willSendRequest <WebRequest URL "about:blank">
+frame "1" - didCommitLoadForFrame
+frame "1" - didFinishDocumentLoadForFrame
+frame "1" - didHandleOnloadEventsForFrame
+frame "1" - didFinishLoadForFrame
+about:blank - didFinishLoading
+frame "0" - didHandleOnloadEventsForFrame
+frame "0" - didFinishLoadForFrame
+http://127.0.0.1:8000/loading/resources/redirect-methods-result.php - didFinishLoading
+frame "1" - didStartProvisionalLoadForFrame
+http://127.0.0.1:8000/loading/resources/redirect-methods-form.html - willSendRequest <WebRequest URL "http://127.0.0.1:8000/loading/resources/redirect-methods-form.html">
+frame "1" - didCancelClientRedirectForFrame
+frame "1" - didCommitLoadForFrame
+frame "1" - didFinishDocumentLoadForFrame
+frame "1" - didHandleOnloadEventsForFrame
+frame "1" - didFinishLoadForFrame
+http://127.0.0.1:8000/loading/resources/redirect-methods-form.html - didFinishLoading
+frame "1" - didStartProvisionalLoadForFrame
+http://127.0.0.1:8000/loading/resources/redirect-methods-result.php - willSendRequest <WebRequest URL "http://127.0.0.1:8000/loading/resources/redirect-methods-result.php">
+http://127.0.0.1:8000/loading/resources/redirect-methods-result.php - willSendRequest <WebRequest URL "http://127.0.0.1:8000/loading/resources/redirect-methods-result.php?redirected=true">
+frame "1" - didCommitLoadForFrame
+frame "1" - didFinishDocumentLoadForFrame
+frame "2" - didStartProvisionalLoadForFrame
+about:blank - willSendRequest <WebRequest URL "about:blank">
+frame "2" - didCommitLoadForFrame
+frame "2" - didFinishDocumentLoadForFrame
+frame "2" - didHandleOnloadEventsForFrame
+frame "2" - didFinishLoadForFrame
+about:blank - didFinishLoading
+frame "1" - didHandleOnloadEventsForFrame
+frame "1" - didFinishLoadForFrame
+http://127.0.0.1:8000/loading/resources/redirect-methods-result.php - didFinishLoading
+frame "2" - didStartProvisionalLoadForFrame
+http://127.0.0.1:8000/loading/resources/redirect-methods-form.html - willSendRequest <WebRequest URL "http://127.0.0.1:8000/loading/resources/redirect-methods-form.html">
+frame "2" - didCancelClientRedirectForFrame
+frame "2" - didCommitLoadForFrame
+frame "2" - didFinishDocumentLoadForFrame
+frame "2" - didHandleOnloadEventsForFrame
+frame "2" - didFinishLoadForFrame
+http://127.0.0.1:8000/loading/resources/redirect-methods-form.html - didFinishLoading
+frame "2" - didStartProvisionalLoadForFrame
+http://127.0.0.1:8000/loading/resources/redirect-methods-result.php - willSendRequest <WebRequest URL "http://127.0.0.1:8000/loading/resources/redirect-methods-result.php">
+http://127.0.0.1:8000/loading/resources/redirect-methods-result.php - willSendRequest <WebRequest URL "http://127.0.0.1:8000/loading/resources/redirect-methods-result.php?redirected=true">
+frame "2" - didCommitLoadForFrame
+frame "2" - didFinishDocumentLoadForFrame
+frame "3" - didStartProvisionalLoadForFrame
+about:blank - willSendRequest <WebRequest URL "about:blank">
+frame "3" - didCommitLoadForFrame
+frame "3" - didFinishDocumentLoadForFrame
+frame "3" - didHandleOnloadEventsForFrame
+frame "3" - didFinishLoadForFrame
+about:blank - didFinishLoading
+frame "2" - didHandleOnloadEventsForFrame
+frame "2" - didFinishLoadForFrame
+http://127.0.0.1:8000/loading/resources/redirect-methods-result.php - didFinishLoading
+frame "3" - didStartProvisionalLoadForFrame
+http://127.0.0.1:8000/loading/resources/redirect-methods-form.html - willSendRequest <WebRequest URL "http://127.0.0.1:8000/loading/resources/redirect-methods-form.html">
+frame "3" - didCancelClientRedirectForFrame
+frame "3" - didCommitLoadForFrame
+frame "3" - didFinishDocumentLoadForFrame
+frame "3" - didHandleOnloadEventsForFrame
+frame "3" - didFinishLoadForFrame
+http://127.0.0.1:8000/loading/resources/redirect-methods-form.html - didFinishLoading
+frame "3" - didStartProvisionalLoadForFrame
+http://127.0.0.1:8000/loading/resources/redirect-methods-result.php - willSendRequest <WebRequest URL "http://127.0.0.1:8000/loading/resources/redirect-methods-result.php">
+http://127.0.0.1:8000/loading/resources/redirect-methods-result.php - willSendRequest <WebRequest URL "http://127.0.0.1:8000/loading/resources/redirect-methods-result.php?redirected=true">
+frame "3" - didCommitLoadForFrame
+frame "3" - didFinishDocumentLoadForFrame
+frame "3" - didHandleOnloadEventsForFrame
+frame "3" - didFinishLoadForFrame
+This test checks to see what HTTP method is used to fetch the final resource in the case where the first request results in a redirect.
+301, 302, 303, and 307 http redirects are all tested.
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/lists/ol-start-parsing-expected.checksum b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/lists/ol-start-parsing-expected.checksum
new file mode 100644
index 0000000..b0cfb9e
--- /dev/null
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/lists/ol-start-parsing-expected.checksum
@@ -0,0 +1 @@
+390251d0ab126b8e0f311e1d43692014 \ No newline at end of file
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/lists/ol-start-parsing-expected.png b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/lists/ol-start-parsing-expected.png
new file mode 100644
index 0000000..41ce9d8
--- /dev/null
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/lists/ol-start-parsing-expected.png
Binary files differ
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/lists/ol-start-parsing-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/lists/ol-start-parsing-expected.txt
new file mode 100644
index 0000000..f763962
--- /dev/null
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/lists/ol-start-parsing-expected.txt
@@ -0,0 +1,160 @@
+layer at (0,0) size 785x1222
+ RenderView at (0,0) size 785x600
+layer at (0,0) size 785x1222
+ RenderBlock {HTML} at (0,0) size 785x1222
+ RenderBody {BODY} at (8,8) size 769x1206
+ RenderBlock (anonymous) at (0,0) size 769x20
+ RenderText {#text} at (0,0) size 107x19
+ text run at (0,0) width 107: "No start attribute."
+ RenderBlock {OL} at (0,36) size 769x40
+ RenderListItem {LI} at (40,0) size 729x20
+ RenderListMarker at (-21,0) size 16x19: "1"
+ RenderText {#text} at (0,0) size 73x19
+ text run at (0,0) width 73: "Should be 1"
+ RenderListItem {LI} at (40,20) size 729x20
+ RenderListMarker at (-21,0) size 16x19: "2"
+ RenderText {#text} at (0,0) size 73x19
+ text run at (0,0) width 73: "Should be 2"
+ RenderBlock {HR} at (0,92) size 769x2 [border: (1px inset #000000)]
+ RenderBlock (anonymous) at (0,102) size 769x20
+ RenderText {#text} at (0,0) size 26x19
+ text run at (0,0) width 26: "start"
+ RenderBlock {OL} at (0,138) size 769x40
+ RenderListItem {LI} at (40,0) size 729x20
+ RenderListMarker at (-21,0) size 16x19: "1"
+ RenderText {#text} at (0,0) size 73x19
+ text run at (0,0) width 73: "Should be 1"
+ RenderListItem {LI} at (40,20) size 729x20
+ RenderListMarker at (-21,0) size 16x19: "2"
+ RenderText {#text} at (0,0) size 73x19
+ text run at (0,0) width 73: "Should be 2"
+ RenderBlock {HR} at (0,194) size 769x2 [border: (1px inset #000000)]
+ RenderBlock (anonymous) at (0,204) size 769x20
+ RenderText {#text} at (0,0) size 45x19
+ text run at (0,0) width 45: "start=\"\""
+ RenderBlock {OL} at (0,240) size 769x40
+ RenderListItem {LI} at (40,0) size 729x20
+ RenderListMarker at (-21,0) size 16x19: "1"
+ RenderText {#text} at (0,0) size 73x19
+ text run at (0,0) width 73: "Should be 1"
+ RenderListItem {LI} at (40,20) size 729x20
+ RenderListMarker at (-21,0) size 16x19: "2"
+ RenderText {#text} at (0,0) size 73x19
+ text run at (0,0) width 73: "Should be 2"
+ RenderBlock {HR} at (0,296) size 769x2 [border: (1px inset #000000)]
+ RenderBlock (anonymous) at (0,306) size 769x20
+ RenderText {#text} at (0,0) size 61x19
+ text run at (0,0) width 61: "start=\" 2 \""
+ RenderBlock {OL} at (0,342) size 769x40
+ RenderListItem {LI} at (40,0) size 729x20
+ RenderListMarker at (-21,0) size 16x19: "2"
+ RenderText {#text} at (0,0) size 73x19
+ text run at (0,0) width 73: "Should be 2"
+ RenderListItem {LI} at (40,20) size 729x20
+ RenderListMarker at (-21,0) size 16x19: "3"
+ RenderText {#text} at (0,0) size 73x19
+ text run at (0,0) width 73: "Should be 3"
+ RenderBlock {HR} at (0,398) size 769x2 [border: (1px inset #000000)]
+ RenderBlock (anonymous) at (0,408) size 769x20
+ RenderText {#text} at (0,0) size 62x19
+ text run at (0,0) width 62: "start=\"+2\""
+ RenderBlock {OL} at (0,444) size 769x40
+ RenderListItem {LI} at (40,0) size 729x20
+ RenderListMarker at (-21,0) size 16x19: "2"
+ RenderText {#text} at (0,0) size 73x19
+ text run at (0,0) width 73: "Should be 2"
+ RenderListItem {LI} at (40,20) size 729x20
+ RenderListMarker at (-21,0) size 16x19: "3"
+ RenderText {#text} at (0,0) size 73x19
+ text run at (0,0) width 73: "Should be 3"
+ RenderBlock {HR} at (0,500) size 769x2 [border: (1px inset #000000)]
+ RenderBlock (anonymous) at (0,510) size 769x20
+ RenderText {#text} at (0,0) size 64x19
+ text run at (0,0) width 64: "start=\"A2\""
+ RenderBlock {OL} at (0,546) size 769x40
+ RenderListItem {LI} at (40,0) size 729x20
+ RenderListMarker at (-21,0) size 16x19: "1"
+ RenderText {#text} at (0,0) size 73x19
+ text run at (0,0) width 73: "Should be 1"
+ RenderListItem {LI} at (40,20) size 729x20
+ RenderListMarker at (-21,0) size 16x19: "2"
+ RenderText {#text} at (0,0) size 73x19
+ text run at (0,0) width 73: "Should be 2"
+ RenderBlock {HR} at (0,602) size 769x2 [border: (1px inset #000000)]
+ RenderBlock (anonymous) at (0,612) size 769x20
+ RenderText {#text} at (0,0) size 57x19
+ text run at (0,0) width 57: "start=\".2\""
+ RenderBlock {OL} at (0,648) size 769x40
+ RenderListItem {LI} at (40,0) size 729x20
+ RenderListMarker at (-21,0) size 16x19: "1"
+ RenderText {#text} at (0,0) size 73x19
+ text run at (0,0) width 73: "Should be 1"
+ RenderListItem {LI} at (40,20) size 729x20
+ RenderListMarker at (-21,0) size 16x19: "2"
+ RenderText {#text} at (0,0) size 73x19
+ text run at (0,0) width 73: "Should be 2"
+ RenderBlock {HR} at (0,704) size 769x2 [border: (1px inset #000000)]
+ RenderBlock (anonymous) at (0,714) size 769x20
+ RenderText {#text} at (0,0) size 61x19
+ text run at (0,0) width 61: "start=\"#2\""
+ RenderBlock {OL} at (0,750) size 769x40
+ RenderListItem {LI} at (40,0) size 729x20
+ RenderListMarker at (-21,0) size 16x19: "1"
+ RenderText {#text} at (0,0) size 73x19
+ text run at (0,0) width 73: "Should be 1"
+ RenderListItem {LI} at (40,20) size 729x20
+ RenderListMarker at (-21,0) size 16x19: "2"
+ RenderText {#text} at (0,0) size 73x19
+ text run at (0,0) width 73: "Should be 2"
+ RenderBlock (anonymous) at (0,806) size 769x20
+ RenderText {#text} at (0,0) size 53x19
+ text run at (0,0) width 53: "start=\"0\""
+ RenderBlock {OL} at (0,842) size 769x40
+ RenderListItem {LI} at (40,0) size 729x20
+ RenderListMarker at (-21,0) size 16x19: "0"
+ RenderText {#text} at (0,0) size 73x19
+ text run at (0,0) width 73: "Should be 0"
+ RenderListItem {LI} at (40,20) size 729x20
+ RenderListMarker at (-21,0) size 16x19: "1"
+ RenderText {#text} at (0,0) size 73x19
+ text run at (0,0) width 73: "Should be 1"
+ RenderBlock {HR} at (0,898) size 769x2 [border: (1px inset #000000)]
+ RenderBlock (anonymous) at (0,908) size 769x20
+ RenderText {#text} at (0,0) size 61x19
+ text run at (0,0) width 61: "start=\" 0 \""
+ RenderBlock {OL} at (0,944) size 769x40
+ RenderListItem {LI} at (40,0) size 729x20
+ RenderListMarker at (-21,0) size 16x19: "0"
+ RenderText {#text} at (0,0) size 73x19
+ text run at (0,0) width 73: "Should be 0"
+ RenderListItem {LI} at (40,20) size 729x20
+ RenderListMarker at (-21,0) size 16x19: "1"
+ RenderText {#text} at (0,0) size 73x19
+ text run at (0,0) width 73: "Should be 1"
+ RenderBlock {HR} at (0,1000) size 769x2 [border: (1px inset #000000)]
+ RenderBlock (anonymous) at (0,1010) size 769x20
+ RenderText {#text} at (0,0) size 53x19
+ text run at (0,0) width 53: "start=\"2\""
+ RenderBlock {OL} at (0,1046) size 769x40
+ RenderListItem {LI} at (40,0) size 729x20
+ RenderListMarker at (-21,0) size 16x19: "2"
+ RenderText {#text} at (0,0) size 73x19
+ text run at (0,0) width 73: "Should be 2"
+ RenderListItem {LI} at (40,20) size 729x20
+ RenderListMarker at (-21,0) size 16x19: "3"
+ RenderText {#text} at (0,0) size 73x19
+ text run at (0,0) width 73: "Should be 3"
+ RenderBlock {HR} at (0,1102) size 769x2 [border: (1px inset #000000)]
+ RenderBlock (anonymous) at (0,1112) size 769x20
+ RenderText {#text} at (0,0) size 59x19
+ text run at (0,0) width 59: "start=\"-2\""
+ RenderBlock {OL} at (0,1148) size 769x40
+ RenderListItem {LI} at (40,0) size 729x20
+ RenderListMarker at (-27,0) size 22x19: "-2"
+ RenderText {#text} at (0,0) size 79x19
+ text run at (0,0) width 79: "Should be -2"
+ RenderListItem {LI} at (40,20) size 729x20
+ RenderListMarker at (-27,0) size 22x19: "-1"
+ RenderText {#text} at (0,0) size 79x19
+ text run at (0,0) width 79: "Should be -1"
+ RenderBlock {HR} at (0,1204) size 769x2 [border: (1px inset #000000)]
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/http/tests/loading/redirect-methods-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/http/tests/loading/redirect-methods-expected.txt
new file mode 100644
index 0000000..b00a006
--- /dev/null
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/http/tests/loading/redirect-methods-expected.txt
@@ -0,0 +1,99 @@
+main frame - didStartProvisionalLoadForFrame
+main frame - didCommitLoadForFrame
+main frame - didFinishDocumentLoadForFrame
+main frame - didHandleOnloadEventsForFrame
+main frame - didFinishLoadForFrame
+<unknown> - didFinishLoading
+frame "0" - didStartProvisionalLoadForFrame
+about:blank - willSendRequest <WebRequest URL "about:blank">
+frame "0" - didCommitLoadForFrame
+frame "0" - didFinishDocumentLoadForFrame
+frame "0" - didHandleOnloadEventsForFrame
+frame "0" - didFinishLoadForFrame
+about:blank - didFinishLoading
+frame "0" - didStartProvisionalLoadForFrame
+http://127.0.0.1:8000/loading/resources/redirect-methods-form.html - willSendRequest <WebRequest URL "http://127.0.0.1:8000/loading/resources/redirect-methods-form.html">
+frame "0" - didCancelClientRedirectForFrame
+frame "0" - didCommitLoadForFrame
+frame "0" - didFinishDocumentLoadForFrame
+frame "0" - didHandleOnloadEventsForFrame
+frame "0" - didFinishLoadForFrame
+http://127.0.0.1:8000/loading/resources/redirect-methods-form.html - didFinishLoading
+frame "0" - didStartProvisionalLoadForFrame
+http://127.0.0.1:8000/loading/resources/redirect-methods-result.php - willSendRequest <WebRequest URL "http://127.0.0.1:8000/loading/resources/redirect-methods-result.php">
+http://127.0.0.1:8000/loading/resources/redirect-methods-result.php - willSendRequest <WebRequest URL "http://127.0.0.1:8000/loading/resources/redirect-methods-result.php?redirected=true">
+frame "0" - didCommitLoadForFrame
+frame "0" - didFinishDocumentLoadForFrame
+frame "1" - didStartProvisionalLoadForFrame
+about:blank - willSendRequest <WebRequest URL "about:blank">
+frame "1" - didCommitLoadForFrame
+frame "1" - didFinishDocumentLoadForFrame
+frame "1" - didHandleOnloadEventsForFrame
+frame "1" - didFinishLoadForFrame
+about:blank - didFinishLoading
+frame "0" - didHandleOnloadEventsForFrame
+frame "0" - didFinishLoadForFrame
+http://127.0.0.1:8000/loading/resources/redirect-methods-result.php - didFinishLoading
+frame "1" - didStartProvisionalLoadForFrame
+http://127.0.0.1:8000/loading/resources/redirect-methods-form.html - willSendRequest <WebRequest URL "http://127.0.0.1:8000/loading/resources/redirect-methods-form.html">
+frame "1" - didCancelClientRedirectForFrame
+frame "1" - didCommitLoadForFrame
+frame "1" - didFinishDocumentLoadForFrame
+frame "1" - didHandleOnloadEventsForFrame
+frame "1" - didFinishLoadForFrame
+http://127.0.0.1:8000/loading/resources/redirect-methods-form.html - didFinishLoading
+frame "1" - didStartProvisionalLoadForFrame
+http://127.0.0.1:8000/loading/resources/redirect-methods-result.php - willSendRequest <WebRequest URL "http://127.0.0.1:8000/loading/resources/redirect-methods-result.php">
+http://127.0.0.1:8000/loading/resources/redirect-methods-result.php - willSendRequest <WebRequest URL "http://127.0.0.1:8000/loading/resources/redirect-methods-result.php?redirected=true">
+frame "1" - didCommitLoadForFrame
+frame "1" - didFinishDocumentLoadForFrame
+frame "2" - didStartProvisionalLoadForFrame
+about:blank - willSendRequest <WebRequest URL "about:blank">
+frame "2" - didCommitLoadForFrame
+frame "2" - didFinishDocumentLoadForFrame
+frame "2" - didHandleOnloadEventsForFrame
+frame "2" - didFinishLoadForFrame
+about:blank - didFinishLoading
+frame "1" - didHandleOnloadEventsForFrame
+frame "1" - didFinishLoadForFrame
+http://127.0.0.1:8000/loading/resources/redirect-methods-result.php - didFinishLoading
+frame "2" - didStartProvisionalLoadForFrame
+http://127.0.0.1:8000/loading/resources/redirect-methods-form.html - willSendRequest <WebRequest URL "http://127.0.0.1:8000/loading/resources/redirect-methods-form.html">
+frame "2" - didCancelClientRedirectForFrame
+frame "2" - didCommitLoadForFrame
+frame "2" - didFinishDocumentLoadForFrame
+frame "2" - didHandleOnloadEventsForFrame
+frame "2" - didFinishLoadForFrame
+http://127.0.0.1:8000/loading/resources/redirect-methods-form.html - didFinishLoading
+frame "2" - didStartProvisionalLoadForFrame
+http://127.0.0.1:8000/loading/resources/redirect-methods-result.php - willSendRequest <WebRequest URL "http://127.0.0.1:8000/loading/resources/redirect-methods-result.php">
+http://127.0.0.1:8000/loading/resources/redirect-methods-result.php - willSendRequest <WebRequest URL "http://127.0.0.1:8000/loading/resources/redirect-methods-result.php?redirected=true">
+frame "2" - didCommitLoadForFrame
+frame "2" - didFinishDocumentLoadForFrame
+frame "3" - didStartProvisionalLoadForFrame
+about:blank - willSendRequest <WebRequest URL "about:blank">
+frame "3" - didCommitLoadForFrame
+frame "3" - didFinishDocumentLoadForFrame
+frame "3" - didHandleOnloadEventsForFrame
+frame "3" - didFinishLoadForFrame
+about:blank - didFinishLoading
+frame "2" - didHandleOnloadEventsForFrame
+frame "2" - didFinishLoadForFrame
+http://127.0.0.1:8000/loading/resources/redirect-methods-result.php - didFinishLoading
+frame "3" - didStartProvisionalLoadForFrame
+http://127.0.0.1:8000/loading/resources/redirect-methods-form.html - willSendRequest <WebRequest URL "http://127.0.0.1:8000/loading/resources/redirect-methods-form.html">
+frame "3" - didCancelClientRedirectForFrame
+frame "3" - didCommitLoadForFrame
+frame "3" - didFinishDocumentLoadForFrame
+frame "3" - didHandleOnloadEventsForFrame
+frame "3" - didFinishLoadForFrame
+http://127.0.0.1:8000/loading/resources/redirect-methods-form.html - didFinishLoading
+frame "3" - didStartProvisionalLoadForFrame
+http://127.0.0.1:8000/loading/resources/redirect-methods-result.php - willSendRequest <WebRequest URL "http://127.0.0.1:8000/loading/resources/redirect-methods-result.php">
+http://127.0.0.1:8000/loading/resources/redirect-methods-result.php - willSendRequest <WebRequest URL "http://127.0.0.1:8000/loading/resources/redirect-methods-result.php?redirected=true">
+frame "3" - didCommitLoadForFrame
+frame "3" - didFinishDocumentLoadForFrame
+frame "3" - didHandleOnloadEventsForFrame
+frame "3" - didFinishLoadForFrame
+This test checks to see what HTTP method is used to fetch the final resource in the case where the first request results in a redirect.
+301, 302, 303, and 307 http redirects are all tested.
diff --git a/webkit/tools/layout_tests/test_expectations.txt b/webkit/tools/layout_tests/test_expectations.txt
index 7649c83..b25cfdc 100644
--- a/webkit/tools/layout_tests/test_expectations.txt
+++ b/webkit/tools/layout_tests/test_expectations.txt
@@ -3001,7 +3001,6 @@ BUG17942 WIN DEBUG : LayoutTests/svg/dom/SVGScriptElement/script-load-and-error-
BUG17942 WIN LINUX : LayoutTests/fast/box-shadow/inset.html = FAIL
// Test failures from WebKit merge 46369 to 46426
-BUG18014 WIN LINUX : LayoutTests/editing/style/remove-underline-from-stylesheet.html = FAIL
BUG18016 WIN LINUX : LayoutTests/fast/canvas/image-pattern-rotate.html = FAIL
BUG17845 DEBUG : LayoutTests/svg/W3C-SVG-1.1/struct-dom-01-b.svg = CRASH
BUG17845 DEBUG : LayoutTests/svg/custom/baseval-animval-equality.svg = CRASH
@@ -3083,5 +3082,4 @@ BUG17974 WIN MAC: LayoutTests/svg/custom/svg-fonts-in-html.html = FAIL
BUG17974 WIN: LyoutTests/transtions/cancel-transitions.html = FAIL
// Test failure from WebKit merge 46536 to 46570
-BUG18050 : LayoutTests/http/loading/redirect-methods.html = FAIL
-BUG18051 : LayoutTests/fast/lists/ol-start-parsing.html = FAIL
+BUG18051 MAC : LayoutTests/fast/lists/ol-start-parsing.html = FAIL