summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorajwong@chromium.org <ajwong@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-01-22 20:59:03 +0000
committerajwong@chromium.org <ajwong@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-01-22 20:59:03 +0000
commitd4d412afb596aac85bf3bceef852dcb6954bcc92 (patch)
tree9913746d9a40f996de1acafb042e20f7374298c2
parent1b4aa833e5abdb113cb034196b0f1c463a38b3d9 (diff)
downloadchromium_src-d4d412afb596aac85bf3bceef852dcb6954bcc92.zip
chromium_src-d4d412afb596aac85bf3bceef852dcb6954bcc92.tar.gz
chromium_src-d4d412afb596aac85bf3bceef852dcb6954bcc92.tar.bz2
Webkill roll 53655 -> 53704.
Rebaselines and new expectations. 2 new regressions: fast/loader/history-forward-in-head.html = TEXT http/tests/misc/slow-loading-mask.html = IMAGE+TEXT Review URL: http://codereview.chromium.org/552113 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@36893 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--DEPS2
-rw-r--r--webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/css/css1_forward_compatible_parsing-expected.checksum1
-rw-r--r--webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/css/css1_forward_compatible_parsing-expected.pngbin0 -> 52124 bytes
-rw-r--r--webkit/data/layout_tests/platform/chromium-linux/LayoutTests/svg/custom/relative-sized-shadow-tree-content-with-symbol-expected.checksum1
-rw-r--r--webkit/data/layout_tests/platform/chromium-linux/LayoutTests/svg/custom/relative-sized-shadow-tree-content-with-symbol-expected.pngbin0 -> 11170 bytes
-rw-r--r--webkit/data/layout_tests/platform/chromium-linux/LayoutTests/svg/custom/relative-sized-use-on-symbol-expected.checksum1
-rw-r--r--webkit/data/layout_tests/platform/chromium-linux/LayoutTests/svg/custom/relative-sized-use-on-symbol-expected.pngbin0 -> 12621 bytes
-rw-r--r--webkit/data/layout_tests/platform/chromium-mac/LayoutTests/http/tests/misc/slow-loading-mask-expected.checksum1
-rw-r--r--webkit/data/layout_tests/platform/chromium-mac/LayoutTests/http/tests/misc/slow-loading-mask-expected.pngbin0 -> 10436 bytes
-rw-r--r--webkit/data/layout_tests/platform/chromium-mac/LayoutTests/websocket/tests/bad-sub-protocol-control-chars-expected.txt17
-rw-r--r--webkit/data/layout_tests/platform/chromium-mac/LayoutTests/websocket/tests/bad-sub-protocol-non-ascii-expected.txt21
-rw-r--r--webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/css/css1_forward_compatible_parsing-expected.checksum1
-rw-r--r--webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/css/css1_forward_compatible_parsing-expected.pngbin0 -> 17394 bytes
-rw-r--r--webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/css/css1_forward_compatible_parsing-expected.txt44
-rw-r--r--webkit/data/layout_tests/platform/chromium-win/LayoutTests/svg/custom/relative-sized-shadow-tree-content-with-symbol-expected.checksum1
-rw-r--r--webkit/data/layout_tests/platform/chromium-win/LayoutTests/svg/custom/relative-sized-shadow-tree-content-with-symbol-expected.pngbin0 -> 5414 bytes
-rw-r--r--webkit/data/layout_tests/platform/chromium-win/LayoutTests/svg/custom/relative-sized-shadow-tree-content-with-symbol-expected.txt18
-rw-r--r--webkit/data/layout_tests/platform/chromium-win/LayoutTests/svg/custom/relative-sized-use-on-symbol-expected.checksum1
-rw-r--r--webkit/data/layout_tests/platform/chromium-win/LayoutTests/svg/custom/relative-sized-use-on-symbol-expected.pngbin0 -> 9942 bytes
-rw-r--r--webkit/data/layout_tests/platform/chromium-win/LayoutTests/svg/custom/relative-sized-use-on-symbol-expected.txt16
-rw-r--r--webkit/data/layout_tests/platform/chromium-win/LayoutTests/svg/custom/text-zoom-expected.txt12
-rw-r--r--webkit/data/layout_tests/platform/chromium-win/LayoutTests/svg/custom/use-dynamic-append-expected.txt12
-rw-r--r--webkit/data/layout_tests/platform/chromium-win/LayoutTests/svg/custom/use-recursion-4-expected.txt1
-rw-r--r--webkit/data/layout_tests/platform/chromium-win/LayoutTests/svg/hixie/error/017-expected.txt3
-rw-r--r--webkit/data/layout_tests/platform/chromium-win/LayoutTests/websocket/tests/bad-sub-protocol-control-chars-expected.txt17
-rw-r--r--webkit/data/layout_tests/platform/chromium-win/LayoutTests/websocket/tests/bad-sub-protocol-non-ascii-expected.txt21
-rw-r--r--webkit/tools/layout_tests/test_expectations.txt4
27 files changed, 185 insertions, 10 deletions
diff --git a/DEPS b/DEPS
index cd3bed6..2ce3818 100644
--- a/DEPS
+++ b/DEPS
@@ -1,7 +1,7 @@
vars = {
"webkit_trunk":
"http://svn.webkit.org/repository/webkit/trunk",
- "webkit_revision": "53655",
+ "webkit_revision": "53704",
"ffmpeg_revision": "34297",
"skia_revision": "475",
"chromium_git": "http://src.chromium.org/git",
diff --git a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/css/css1_forward_compatible_parsing-expected.checksum b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/css/css1_forward_compatible_parsing-expected.checksum
new file mode 100644
index 0000000..a1f6485
--- /dev/null
+++ b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/css/css1_forward_compatible_parsing-expected.checksum
@@ -0,0 +1 @@
+929c770540eed174371e4c7ab7543f28 \ No newline at end of file
diff --git a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/css/css1_forward_compatible_parsing-expected.png b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/css/css1_forward_compatible_parsing-expected.png
new file mode 100644
index 0000000..951c815
--- /dev/null
+++ b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/css/css1_forward_compatible_parsing-expected.png
Binary files differ
diff --git a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/svg/custom/relative-sized-shadow-tree-content-with-symbol-expected.checksum b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/svg/custom/relative-sized-shadow-tree-content-with-symbol-expected.checksum
new file mode 100644
index 0000000..92dd772
--- /dev/null
+++ b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/svg/custom/relative-sized-shadow-tree-content-with-symbol-expected.checksum
@@ -0,0 +1 @@
+48cab7ca26df1fa84b08857fde658d3d \ No newline at end of file
diff --git a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/svg/custom/relative-sized-shadow-tree-content-with-symbol-expected.png b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/svg/custom/relative-sized-shadow-tree-content-with-symbol-expected.png
new file mode 100644
index 0000000..56a03ab
--- /dev/null
+++ b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/svg/custom/relative-sized-shadow-tree-content-with-symbol-expected.png
Binary files differ
diff --git a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/svg/custom/relative-sized-use-on-symbol-expected.checksum b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/svg/custom/relative-sized-use-on-symbol-expected.checksum
new file mode 100644
index 0000000..1155c79
--- /dev/null
+++ b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/svg/custom/relative-sized-use-on-symbol-expected.checksum
@@ -0,0 +1 @@
+78ffcef9ddd6b5c2386850e1d425ed00 \ No newline at end of file
diff --git a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/svg/custom/relative-sized-use-on-symbol-expected.png b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/svg/custom/relative-sized-use-on-symbol-expected.png
new file mode 100644
index 0000000..e5af3bf
--- /dev/null
+++ b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/svg/custom/relative-sized-use-on-symbol-expected.png
Binary files differ
diff --git a/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/http/tests/misc/slow-loading-mask-expected.checksum b/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/http/tests/misc/slow-loading-mask-expected.checksum
new file mode 100644
index 0000000..702ffe6
--- /dev/null
+++ b/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/http/tests/misc/slow-loading-mask-expected.checksum
@@ -0,0 +1 @@
+8a3aa3a6b1f9d31a60e56f993e6d1ba1 \ No newline at end of file
diff --git a/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/http/tests/misc/slow-loading-mask-expected.png b/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/http/tests/misc/slow-loading-mask-expected.png
new file mode 100644
index 0000000..a8b4896
--- /dev/null
+++ b/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/http/tests/misc/slow-loading-mask-expected.png
Binary files differ
diff --git a/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/websocket/tests/bad-sub-protocol-control-chars-expected.txt b/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/websocket/tests/bad-sub-protocol-control-chars-expected.txt
new file mode 100644
index 0000000..94e18a3
--- /dev/null
+++ b/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/websocket/tests/bad-sub-protocol-control-chars-expected.txt
@@ -0,0 +1,17 @@
+CONSOLE MESSAGE: line 0: Wrong protocol for WebSocket '\u0000'
+CONSOLE MESSAGE: line 0: Wrong protocol for WebSocket '\u0009'
+CONSOLE MESSAGE: line 0: Wrong protocol for WebSocket '\u001B'
+Test WebSocket bad sub-protocol names by control characters.
+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+PASS new WebSocket("ws://127.0.0.1:8880/simple", "") threw exception Error: SYNTAX_ERR: DOM Exception 12.
+PASS new WebSocket("ws://127.0.0.1:8880/simple", " ") threw exception Error: SYNTAX_ERR: DOM Exception 12.
+PASS new WebSocket("ws://127.0.0.1:8880/simple", "
+") threw exception SyntaxError: Unexpected token ILLEGAL.
+PASS new WebSocket("ws://127.0.0.1:8880/simple", "
+") threw exception SyntaxError: Unexpected token ILLEGAL.
+PASS new WebSocket("ws://127.0.0.1:8880/simple", "") threw exception Error: SYNTAX_ERR: DOM Exception 12.
+PASS successfullyParsed is true
+
+TEST COMPLETE
diff --git a/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/websocket/tests/bad-sub-protocol-non-ascii-expected.txt b/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/websocket/tests/bad-sub-protocol-non-ascii-expected.txt
new file mode 100644
index 0000000..8a2dfec
--- /dev/null
+++ b/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/websocket/tests/bad-sub-protocol-non-ascii-expected.txt
@@ -0,0 +1,21 @@
+CONSOLE MESSAGE: line 0: Wrong protocol for WebSocket '\u007F'
+CONSOLE MESSAGE: line 0: Wrong protocol for WebSocket '\u0080'
+CONSOLE MESSAGE: line 0: Wrong protocol for WebSocket '\u3042'
+CONSOLE MESSAGE: line 0: Wrong protocol for WebSocket '\uFFFF'
+CONSOLE MESSAGE: line 0: Wrong protocol for WebSocket '\uFEFF'
+CONSOLE MESSAGE: line 0: Wrong protocol for WebSocket '\uFFFE'
+CONSOLE MESSAGE: line 0: Wrong protocol for WebSocket '\uD840\uDC0B'
+Test WebSocket bad sub-protocol names by non-ASCII chars.
+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+PASS new WebSocket("ws://127.0.0.1:8880/simple", "") threw exception Error: SYNTAX_ERR: DOM Exception 12.
+PASS new WebSocket("ws://127.0.0.1:8880/simple", "€") threw exception Error: SYNTAX_ERR: DOM Exception 12.
+PASS new WebSocket("ws://127.0.0.1:8880/simple", "あ") threw exception Error: SYNTAX_ERR: DOM Exception 12.
+PASS new WebSocket("ws://127.0.0.1:8880/simple", "￿") threw exception Error: SYNTAX_ERR: DOM Exception 12.
+PASS new WebSocket("ws://127.0.0.1:8880/simple", "") threw exception Error: SYNTAX_ERR: DOM Exception 12.
+PASS new WebSocket("ws://127.0.0.1:8880/simple", "￾") threw exception Error: SYNTAX_ERR: DOM Exception 12.
+PASS new WebSocket("ws://127.0.0.1:8880/simple", "𠀋") threw exception Error: SYNTAX_ERR: DOM Exception 12.
+PASS successfullyParsed is true
+
+TEST COMPLETE
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/css/css1_forward_compatible_parsing-expected.checksum b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/css/css1_forward_compatible_parsing-expected.checksum
new file mode 100644
index 0000000..52b79a7
--- /dev/null
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/css/css1_forward_compatible_parsing-expected.checksum
@@ -0,0 +1 @@
+0450815c7f65a5b059b46d8e61f588a6 \ No newline at end of file
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/css/css1_forward_compatible_parsing-expected.png b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/css/css1_forward_compatible_parsing-expected.png
new file mode 100644
index 0000000..e7e38cb8
--- /dev/null
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/css/css1_forward_compatible_parsing-expected.png
Binary files differ
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/css/css1_forward_compatible_parsing-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/css/css1_forward_compatible_parsing-expected.txt
new file mode 100644
index 0000000..400955d
--- /dev/null
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/css/css1_forward_compatible_parsing-expected.txt
@@ -0,0 +1,44 @@
+layer at (0,0) size 800x600
+ RenderView at (0,0) size 800x600
+layer at (0,0) size 800x425
+ RenderBlock {HTML} at (0,0) size 800x425
+ RenderBody {BODY} at (8,16) size 784x393
+ RenderBlock {DIV} at (0,0) size 784x40 [color=#008000] [bgcolor=#FFFFFF]
+ RenderBlock {P} at (0,0) size 784x40
+ RenderText {#text} at (0,0) size 753x39
+ text run at (0,0) width 753: "First sentence: this text should be green. The markup code is invalid according to W3C HTML validator and the CSS code is"
+ text run at (0,20) width 248: "invalid according to W3C CSS validator."
+ RenderBlock {DIV} at (0,56) size 784x40 [color=#008000] [bgcolor=#FFFFFF]
+ RenderBlock {P} at (0,0) size 784x40 [color=#FF0000]
+ RenderText {#text} at (0,0) size 762x39
+ text run at (0,0) width 762: "Second sentence: this text should be green according to CSS 1 but it should be red according to CSS 2.1. The markup code is"
+ text run at (0,20) width 709: "also invalid according to W3C HTML validator but the CSS code is perfectly valid according to W3C CSS validator."
+ RenderBlock {H3} at (0,114) size 784x46 [color=#008000] [bgcolor=#FFFFFF]
+ RenderText {#text} at (0,0) size 761x45
+ text run at (0,0) width 761: "Third sentence: this text should be green. The markup code is valid according to W3C HTML"
+ text run at (0,23) width 574: "validator but the CSS code is invalid according to W3C CSS validator."
+ RenderBlock {H4} at (0,181) size 784x60 [color=#FF0000] [bgcolor=#FFFFFF]
+ RenderText {#text} at (0,0) size 784x59
+ text run at (0,0) width 760: "Fourth sentence: this text should be green according to CSS 1 (class name can not start with a dash in CSS 1) but it"
+ text run at (0,20) width 784: "should be red according to CSS 2.1 and the markup code is valid according to W3C HTML validator and the CSS code"
+ text run at (0,40) width 333: "is perfectly valid according to W3C CSS validator."
+ RenderBlock {H5} at (0,267) size 784x80 [color=#800080] [bgcolor=#FFFFFF]
+ RenderText {#text} at (0,0) size 780x79
+ text run at (0,0) width 747: "Fifth sentence: this text should be green according to CSS 1 (class name can not start with a dash in CSS 1) but it"
+ text run at (0,20) width 780: "should be purple according to latest CSS 2.1 WD (class name can not start with a dash unless immediately followed by"
+ text run at (0,40) width 775: "[_A-Za-z] character in CSS 2.1) and the markup code is valid according to W3C HTML validator and the CSS code is"
+ text run at (0,60) width 344: "perfectly valid according to the W3C CSS validator!"
+ RenderBlock {P} at (0,373) size 784x20
+ RenderText {#text} at (0,0) size 27x19
+ text run at (0,0) width 27: "See "
+ RenderInline {A} at (0,0) size 68x19 [color=#0000EE]
+ RenderText {#text} at (27,0) size 68x19
+ text run at (27,0) width 68: "Bug 14373"
+ RenderInline {A} at (0,0) size 4x19
+ RenderText {#text} at (95,0) size 4x19
+ text run at (95,0) width 4: "."
+ RenderBlock (anonymous) at (0,409) size 784x0
+ RenderInline {A} at (0,0) size 0x0
+ RenderText {#text} at (0,0) size 0x0
+ RenderText {#text} at (0,0) size 0x0
+ RenderText {#text} at (0,0) size 0x0
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/svg/custom/relative-sized-shadow-tree-content-with-symbol-expected.checksum b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/svg/custom/relative-sized-shadow-tree-content-with-symbol-expected.checksum
new file mode 100644
index 0000000..a5485fb
--- /dev/null
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/svg/custom/relative-sized-shadow-tree-content-with-symbol-expected.checksum
@@ -0,0 +1 @@
+f8f2a522be1cb799a4e6c5f137ecff83 \ No newline at end of file
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/svg/custom/relative-sized-shadow-tree-content-with-symbol-expected.png b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/svg/custom/relative-sized-shadow-tree-content-with-symbol-expected.png
new file mode 100644
index 0000000..58a07b3
--- /dev/null
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/svg/custom/relative-sized-shadow-tree-content-with-symbol-expected.png
Binary files differ
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/svg/custom/relative-sized-shadow-tree-content-with-symbol-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/svg/custom/relative-sized-shadow-tree-content-with-symbol-expected.txt
new file mode 100644
index 0000000..5442325
--- /dev/null
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/svg/custom/relative-sized-shadow-tree-content-with-symbol-expected.txt
@@ -0,0 +1,18 @@
+layer at (0,0) size 800x600
+ RenderView at (0,0) size 800x600
+layer at (0,0) size 800x482
+ RenderBlock {html} at (0,0) size 800x482
+ RenderBody {body} at (8,16) size 784x458
+ RenderBlock {p} at (0,0) size 784x40
+ RenderText {#text} at (0,0) size 761x39
+ text run at (0,0) width 761: "The svg area contained in the div element (red box), should fill out the whole area (two blue rectangles, first: (0,0)-(50%,50%),"
+ text run at (0,20) width 569: "second: (50%,50%)-(100%,100%)), especially after resizing the content box to a different size"
+ RenderBlock {div} at (0,56) size 402x402 [border: (1px solid #FF0000)]
+ RenderSVGRoot {svg} at (9,73) size 400x400
+ RenderSVGHiddenContainer {defs} at (0,0) size 0x0
+ RenderSVGContainer {use} at (9,73) size 400x400
+ RenderSVGContainer {g} at (9,73) size 400x400
+ RenderSVGViewportContainer {svg} at (9,73) size 400x400
+ RenderPath {rect} at (209,273) size 200x200 [fill={[type=SOLID] [color=#008000]}] [data="M100.00,100.00 L200.00,100.00 L200.00,200.00 L100.00,200.00 Z"]
+ RenderPath {rect} at (9,73) size 200x200 [fill={[type=SOLID] [color=#008000]}] [data="M0.00,0.00 L100.00,0.00 L100.00,100.00 L0.00,100.00 Z"]
+ RenderText {#text} at (0,0) size 0x0
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/svg/custom/relative-sized-use-on-symbol-expected.checksum b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/svg/custom/relative-sized-use-on-symbol-expected.checksum
new file mode 100644
index 0000000..1bc3c33
--- /dev/null
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/svg/custom/relative-sized-use-on-symbol-expected.checksum
@@ -0,0 +1 @@
+bc59a3267b73682af6ba6995557eec6d \ No newline at end of file
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/svg/custom/relative-sized-use-on-symbol-expected.png b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/svg/custom/relative-sized-use-on-symbol-expected.png
new file mode 100644
index 0000000..25c5643
--- /dev/null
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/svg/custom/relative-sized-use-on-symbol-expected.png
Binary files differ
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/svg/custom/relative-sized-use-on-symbol-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/svg/custom/relative-sized-use-on-symbol-expected.txt
new file mode 100644
index 0000000..c05c5a8
--- /dev/null
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/svg/custom/relative-sized-use-on-symbol-expected.txt
@@ -0,0 +1,16 @@
+layer at (0,0) size 800x600
+ RenderView at (0,0) size 800x600
+layer at (0,0) size 800x462
+ RenderBlock {html} at (0,0) size 800x462
+ RenderBody {body} at (8,16) size 784x438
+ RenderBlock {p} at (0,0) size 784x20
+ RenderText {#text} at (0,0) size 641x19
+ text run at (0,0) width 641: "The svg area contained in the div element (red box), should fill out the whole area with a green shaped path"
+ RenderBlock {div} at (0,36) size 402x402 [border: (1px solid #FF0000)]
+ RenderSVGRoot {svg} at (45.80,87.63) size 326.40x326.62
+ RenderSVGHiddenContainer {defs} at (0,0) size 0x0
+ RenderSVGContainer {use} at (45.80,87.63) size 326.40x326.62
+ RenderSVGContainer {g} at (45.80,87.63) size 326.40x326.62 [transform={m=((1.00,0.00)(0.00,1.00)) t=(20.00,20.00)}]
+ RenderSVGViewportContainer {svg} at (45.80,87.63) size 326.40x326.62
+ RenderPath {path} at (45.80,87.63) size 326.40x326.62 [fill={[type=SOLID] [color=#008000]}] [data="M143.00,103.00 L143.00,117.00 C143.00,130.91,112.56,142.19,75.00,142.19 C37.44,142.19,7.00,130.91,7.00,117.00 L7.00,117.00 L7.00,103.00 C7.00,89.09,37.44,77.81,75.00,77.81 C112.56,77.81,143.00,89.09,143.00,103.00 L52.00,72.00 C34.31,70.66,20.85,55.57,21.52,37.84 C22.20,20.12,36.76,6.09,54.50,6.09 C72.24,6.09,86.80,20.12,87.48,37.84 C88.15,55.57,74.69,70.66,57.00,72.00"]
+ RenderText {#text} at (0,0) size 0x0
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/svg/custom/text-zoom-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/svg/custom/text-zoom-expected.txt
new file mode 100644
index 0000000..7f02997
--- /dev/null
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/svg/custom/text-zoom-expected.txt
@@ -0,0 +1,12 @@
+layer at (0,0) size 800x600
+ RenderView at (0,0) size 800x600
+layer at (0,0) size 800x8
+ RenderBlock {html} at (0,0) size 800x8
+ RenderBody {body} at (8,8) size 784x0
+layer at (0,30) size 100x100
+ RenderBlock (positioned) {div} at (0,30) size 100x100 [bgcolor=#FF0000]
+layer at (0,30) size 200x205
+ RenderBlock (positioned) {div} at (0,30) size 200x200
+ RenderSVGRoot {svg} at (8,38) size 100x100
+ RenderPath {rect} at (8,38) size 100x100 [fill={[type=SOLID] [color=#008000]}] [data="M0.00,0.00 L50.00,0.00 L50.00,50.00 L0.00,50.00 Z"]
+ RenderText {#text} at (0,0) size 0x0
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/svg/custom/use-dynamic-append-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/svg/custom/use-dynamic-append-expected.txt
index 442a5c6..8c9eaa5 100644
--- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/svg/custom/use-dynamic-append-expected.txt
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/svg/custom/use-dynamic-append-expected.txt
@@ -2,11 +2,13 @@ layer at (0,0) size 800x600
RenderView at (0,0) size 800x600
layer at (0,0) size 800x600
RenderSVGRoot {svg} at (0,0) size 394x144
- RenderSVGContainer {g} at (0,0) size 100x100
- RenderPath {rect} at (0,0) size 100x100 [fill={[type=SOLID] [color=#008000]}] [data="M0.00,0.00 L100.00,0.00 L100.00,100.00 L0.00,100.00 Z"]
- RenderSVGContainer {use} at (0,0) size 0x0
- RenderSVGContainer {g} at (0,0) size 0x0
- RenderSVGContainer {g} at (0,0) size 0x0
+ RenderSVGHiddenContainer {defs} at (0,0) size 0x0
+ RenderSVGContainer {g} at (0,0) size 100x100
+ RenderPath {rect} at (0,0) size 100x100 [fill={[type=SOLID] [color=#008000]}] [data="M0.00,0.00 L100.00,0.00 L100.00,100.00 L0.00,100.00 Z"]
+ RenderSVGContainer {use} at (0,0) size 100x100
+ RenderSVGContainer {g} at (0,0) size 100x100
+ RenderSVGContainer {g} at (0,0) size 100x100
+ RenderPath {rect} at (0,0) size 100x100 [fill={[type=SOLID] [color=#008000]}] [data="M0.00,0.00 L100.00,0.00 L100.00,100.00 L0.00,100.00 Z"]
RenderSVGText {text} at (10,120) size 350x17 contains 1 chunk(s)
RenderSVGInlineText {#text} at (0,-13) size 350x17
chunk 1 text run 1 at (10.00,120.00) startOffset 0 endOffset 60 width 350.00: "This test tries to change a container referenced by a <use>."
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/svg/custom/use-recursion-4-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/svg/custom/use-recursion-4-expected.txt
index 8a4969b..9a6c61ff 100644
--- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/svg/custom/use-recursion-4-expected.txt
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/svg/custom/use-recursion-4-expected.txt
@@ -6,7 +6,6 @@ layer at (0,0) size 800x600
RenderSVGContainer {g} at (0,0) size 0x0
RenderSVGContainer {use} at (0,0) size 0x0
RenderSVGContainer {g} at (0,0) size 0x0
- RenderSVGContainer {g} at (0,0) size 0x0
RenderSVGContainer {g} at (-2.50,-2.50) size 65x15
RenderPath {rect} at (-2.50,-2.50) size 65x15 [stroke={[type=SOLID] [color=#000080] [stroke width=5.00]}] [fill={[type=SOLID] [color=#FF0000]}] [data="M0.00,0.00 L60.00,0.00 L60.00,10.00 L0.00,10.00 Z"]
RenderSVGContainer {use} at (0,0) size 0x0
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/svg/hixie/error/017-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/svg/hixie/error/017-expected.txt
index b78815f..8112c4d 100644
--- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/svg/hixie/error/017-expected.txt
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/svg/hixie/error/017-expected.txt
@@ -6,15 +6,12 @@ layer at (0,0) size 800x600
RenderSVGContainer {g} at (0,0) size 0x0
RenderSVGContainer {use} at (0,0) size 0x0
RenderSVGContainer {g} at (0,0) size 0x0
- RenderSVGContainer {g} at (0,0) size 0x0
RenderSVGContainer {g} at (0,0) size 0x0
RenderSVGContainer {use} at (0,0) size 0x0
RenderSVGContainer {g} at (0,0) size 0x0
- RenderSVGContainer {g} at (0,0) size 0x0
RenderSVGContainer {g} at (0,0) size 0x0
RenderSVGContainer {use} at (0,0) size 0x0
RenderSVGContainer {g} at (0,0) size 0x0
- RenderSVGContainer {g} at (0,0) size 0x0
RenderSVGContainer {g} at (0,0) size 0x0
RenderSVGContainer {use} at (0,0) size 0x0
RenderSVGContainer {g} at (0,0) size 0x0
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/websocket/tests/bad-sub-protocol-control-chars-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/websocket/tests/bad-sub-protocol-control-chars-expected.txt
new file mode 100644
index 0000000..94e18a3
--- /dev/null
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/websocket/tests/bad-sub-protocol-control-chars-expected.txt
@@ -0,0 +1,17 @@
+CONSOLE MESSAGE: line 0: Wrong protocol for WebSocket '\u0000'
+CONSOLE MESSAGE: line 0: Wrong protocol for WebSocket '\u0009'
+CONSOLE MESSAGE: line 0: Wrong protocol for WebSocket '\u001B'
+Test WebSocket bad sub-protocol names by control characters.
+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+PASS new WebSocket("ws://127.0.0.1:8880/simple", "") threw exception Error: SYNTAX_ERR: DOM Exception 12.
+PASS new WebSocket("ws://127.0.0.1:8880/simple", " ") threw exception Error: SYNTAX_ERR: DOM Exception 12.
+PASS new WebSocket("ws://127.0.0.1:8880/simple", "
+") threw exception SyntaxError: Unexpected token ILLEGAL.
+PASS new WebSocket("ws://127.0.0.1:8880/simple", "
+") threw exception SyntaxError: Unexpected token ILLEGAL.
+PASS new WebSocket("ws://127.0.0.1:8880/simple", "") threw exception Error: SYNTAX_ERR: DOM Exception 12.
+PASS successfullyParsed is true
+
+TEST COMPLETE
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/websocket/tests/bad-sub-protocol-non-ascii-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/websocket/tests/bad-sub-protocol-non-ascii-expected.txt
new file mode 100644
index 0000000..8a2dfec
--- /dev/null
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/websocket/tests/bad-sub-protocol-non-ascii-expected.txt
@@ -0,0 +1,21 @@
+CONSOLE MESSAGE: line 0: Wrong protocol for WebSocket '\u007F'
+CONSOLE MESSAGE: line 0: Wrong protocol for WebSocket '\u0080'
+CONSOLE MESSAGE: line 0: Wrong protocol for WebSocket '\u3042'
+CONSOLE MESSAGE: line 0: Wrong protocol for WebSocket '\uFFFF'
+CONSOLE MESSAGE: line 0: Wrong protocol for WebSocket '\uFEFF'
+CONSOLE MESSAGE: line 0: Wrong protocol for WebSocket '\uFFFE'
+CONSOLE MESSAGE: line 0: Wrong protocol for WebSocket '\uD840\uDC0B'
+Test WebSocket bad sub-protocol names by non-ASCII chars.
+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+PASS new WebSocket("ws://127.0.0.1:8880/simple", "") threw exception Error: SYNTAX_ERR: DOM Exception 12.
+PASS new WebSocket("ws://127.0.0.1:8880/simple", "€") threw exception Error: SYNTAX_ERR: DOM Exception 12.
+PASS new WebSocket("ws://127.0.0.1:8880/simple", "あ") threw exception Error: SYNTAX_ERR: DOM Exception 12.
+PASS new WebSocket("ws://127.0.0.1:8880/simple", "￿") threw exception Error: SYNTAX_ERR: DOM Exception 12.
+PASS new WebSocket("ws://127.0.0.1:8880/simple", "") threw exception Error: SYNTAX_ERR: DOM Exception 12.
+PASS new WebSocket("ws://127.0.0.1:8880/simple", "￾") threw exception Error: SYNTAX_ERR: DOM Exception 12.
+PASS new WebSocket("ws://127.0.0.1:8880/simple", "𠀋") threw exception Error: SYNTAX_ERR: DOM Exception 12.
+PASS successfullyParsed is true
+
+TEST COMPLETE
diff --git a/webkit/tools/layout_tests/test_expectations.txt b/webkit/tools/layout_tests/test_expectations.txt
index bac80eb..3cc0c05 100644
--- a/webkit/tools/layout_tests/test_expectations.txt
+++ b/webkit/tools/layout_tests/test_expectations.txt
@@ -3050,3 +3050,7 @@ BUG_DPRANKE WIN : storage/domstorage/sessionstorage/delete-removal.html = PASS C
// WebKit roll 53585 -> 53655
BUG32863 WIN LINUX MAC : websocket/tests/url-no-trailing-slash.html = TEXT
BUG32864 WIN LINUX MAC : plugins/mouse-events-fixedpos.html = TEXT
+
+// WebKit roll 53655 -> 53704
+BUG32898 WIN LINUX MAC : fast/loader/history-forward-in-head.html = TEXT
+BUG32900 WIN LINUX : http/tests/misc/slow-loading-mask.html = IMAGE+TEXT