diff options
| author | ajwong@chromium.org <ajwong@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-01-22 06:33:40 +0000 |
|---|---|---|
| committer | ajwong@chromium.org <ajwong@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-01-22 06:33:40 +0000 |
| commit | d0de4b73adbd564fc0daffa4971fabfedd809050 (patch) | |
| tree | e69e5183a29cd19fe7e0b568909a3b67b9c7d329 | |
| parent | ee6fcf68dc1080e1e777841b4fe618bb6481a23a (diff) | |
| download | chromium_src-d0de4b73adbd564fc0daffa4971fabfedd809050.zip chromium_src-d0de4b73adbd564fc0daffa4971fabfedd809050.tar.gz chromium_src-d0de4b73adbd564fc0daffa4971fabfedd809050.tar.bz2 | |
Rollling 53585 -> 53655.
Rebaseline ruby tests, and mark 2 consistent failures.
BUG=32863,32864
Review URL: http://codereview.chromium.org/553055
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@36853 0039d316-1c4b-4281-b951-d872f2087c98
108 files changed, 548 insertions, 1176 deletions
@@ -1,7 +1,7 @@ vars = { "webkit_trunk": "http://svn.webkit.org/repository/webkit/trunk", - "webkit_revision": "53585", + "webkit_revision": "53655", "ffmpeg_revision": "34297", "skia_revision": "475", "chromium_git": "http://src.chromium.org/git", diff --git a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/editing/selection/extend-by-word-002-expected.checksum b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/editing/selection/extend-by-word-002-expected.checksum index 7309ee2..51a8990 100644 --- a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/editing/selection/extend-by-word-002-expected.checksum +++ b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/editing/selection/extend-by-word-002-expected.checksum @@ -1 +1 @@ -02564b55ef3ea4c46589477bdcf16aa7
\ No newline at end of file +8cc788a19128e8231ab16840e0d3255b
\ No newline at end of file diff --git a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/editing/selection/extend-by-word-002-expected.png b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/editing/selection/extend-by-word-002-expected.png Binary files differindex 9726c16..fd8f3db 100644 --- a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/editing/selection/extend-by-word-002-expected.png +++ b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/editing/selection/extend-by-word-002-expected.png diff --git a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/lists/markers-in-selection-expected.checksum b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/lists/markers-in-selection-expected.checksum index d7e3bbb..7f30d4b 100644 --- a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/lists/markers-in-selection-expected.checksum +++ b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/lists/markers-in-selection-expected.checksum @@ -1 +1 @@ -7d3d74646f91c7ed7543d3bfc9a309de
\ No newline at end of file +c2a447a0607da652d677b59d80b9bac9
\ No newline at end of file diff --git a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/lists/markers-in-selection-expected.png b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/lists/markers-in-selection-expected.png Binary files differindex 03ba681..8c560bb 100644 --- a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/lists/markers-in-selection-expected.png +++ b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/lists/markers-in-selection-expected.png diff --git a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/ruby/ruby-empty-rt-expected.checksum b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/ruby/ruby-empty-rt-expected.checksum index 00dc6c8..71beb15 100644 --- a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/ruby/ruby-empty-rt-expected.checksum +++ b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/ruby/ruby-empty-rt-expected.checksum @@ -1 +1 @@ -2ba882d0e8f5e0dc4979b3a2fa3f0b9c
\ No newline at end of file +899552f4b82935845ebcd8b7c0385ca6
\ No newline at end of file diff --git a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/ruby/ruby-empty-rt-expected.png b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/ruby/ruby-empty-rt-expected.png Binary files differindex 1a4957c..54419da 100644 --- a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/ruby/ruby-empty-rt-expected.png +++ b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/ruby/ruby-empty-rt-expected.png diff --git a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/ruby/ruby-empty-rt-expected.txt b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/ruby/ruby-empty-rt-expected.txt deleted file mode 100644 index 6c4e81a..0000000 --- a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/ruby/ruby-empty-rt-expected.txt +++ /dev/null @@ -1,37 +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 - RenderBody {BODY} at (8,8) size 784x576 - RenderBlock {P} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 421x19 - text run at (0,0) width 421: "The following is a test for having a <rt> immediately following another." - RenderBlock (anonymous) at (0,36) size 784x40 - RenderBR {BR} at (0,0) size 0x19 - RenderBR {BR} at (0,20) size 0x19 - RenderBlock {P} at (0,92) size 784x32 - RenderText {#text} at (0,12) size 64x19 - text run at (0,12) width 64: "\x{6E96}\x{592A}\x{90CE}\x{306F}" - RenderRuby (inline) {RUBY} at (0,0) size 154x19 - RenderRubyRun (anonymous) at (64,0) size 50x32 - RenderRubyText {RT} at (0,0) size 50x12 - RenderText {#text} at (0,0) size 50x12 - text run at (0,0) width 50: "\x{3068}\x{3046}\x{304D}\x{3087}\x{3046}" - RenderRubyBase (anonymous) at (0,12) size 50x20 - RenderText {#text} at (9,0) size 32x19 - text run at (9,0) width 32: "\x{6771}\x{4EAC}" - RenderRubyRun (anonymous) at (114,0) size 64x32 - RenderRubyText {RT} at (0,0) size 64x12 - RenderText {#text} at (7,0) size 50x12 - text run at (7,0) width 50: "\x{3053}\x{3046}\x{304E}\x{3087}\x{3046}" - RenderRubyBase (anonymous) at (0,12) size 64x20 - RenderText {#text} at (0,0) size 64x19 - text run at (0,0) width 64: "\x{5DE5}\x{696D}\x{5927}\x{5B66}" - RenderRubyRun (anonymous) at (178,17) size 40x12 - RenderRubyText {RT} at (0,0) size 40x12 - RenderText {#text} at (0,0) size 40x12 - text run at (0,0) width 40: "\x{3060}\x{3044}\x{304C}\x{304F}" - RenderText {#text} at (218,12) size 144x19 - text run at (218,12) width 144: "\x{304B}\x{3089}\x{5352}\x{696D}\x{3057}\x{307E}\x{3057}\x{305F}\x{3002}" - RenderText {#text} at (0,0) size 0x0 - RenderText {#text} at (0,0) size 0x0 diff --git a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/ruby/ruby-length-expected.checksum b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/ruby/ruby-length-expected.checksum index 744b036..36a9ccc 100644 --- a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/ruby/ruby-length-expected.checksum +++ b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/ruby/ruby-length-expected.checksum @@ -1 +1 @@ -0931daf536be90770be7facc5d9def99
\ No newline at end of file +58a24a48dfcf5b83ce86eaf96c3811c5
\ No newline at end of file diff --git a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/ruby/ruby-length-expected.png b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/ruby/ruby-length-expected.png Binary files differindex 2d7407d..3177b62 100644 --- a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/ruby/ruby-length-expected.png +++ b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/ruby/ruby-length-expected.png diff --git a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/ruby/ruby-length-expected.txt b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/ruby/ruby-length-expected.txt deleted file mode 100644 index 54c2df9..0000000 --- a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/ruby/ruby-length-expected.txt +++ /dev/null @@ -1,33 +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 - RenderBody {BODY} at (8,8) size 784x584 - RenderText {#text} at (0,0) size 766x39 - text run at (0,0) width 766: "This is a initial test for simple ruby. There should be 2 ruby annotations on below line, one with a ruby text shorter than the base," - text run at (0,20) width 277: "and one with a ruby text longer than the base. " - RenderBR {BR} at (277,35) size 0x0 - RenderBR {BR} at (0,40) size 0x19 - RenderText {#text} at (0,72) size 224x19 - text run at (0,72) width 224: "\x{FF23}\x{FF33}\x{FF33}\x{FF13}\x{FF0F}\x{FF28}\x{FF34}\x{FF2D}\x{FF2C}\x{FF15}\x{306E}\x{30EB}\x{30D3}\x{306F}" - RenderRuby (inline) {RUBY} at (0,0) size 75x19 - RenderRubyRun (anonymous) at (224,60) size 75x32 - RenderRubyText {RT} at (0,0) size 75x12 - RenderText {#text} at (0,0) size 75x12 - text run at (0,0) width 75: "Japanese Langauge" - RenderRubyBase (anonymous) at (0,12) size 75x20 - RenderText {#text} at (13,0) size 48x19 - text run at (13,0) width 48: "\x{65E5}\x{672C}\x{8A9E}" - RenderText {#text} at (299,72) size 48x19 - text run at (299,72) width 48: "\x{306B}\x{3088}\x{304F}" - RenderRuby (inline) {RUBY} at (0,0) size 64x19 - RenderRubyRun (anonymous) at (347,60) size 64x32 - RenderRubyText {RT} at (0,0) size 64x12 - RenderText {#text} at (23,0) size 18x12 - text run at (23,0) width 18: "used" - RenderRubyBase (anonymous) at (0,12) size 64x20 - RenderText {#text} at (0,0) size 64x19 - text run at (0,0) width 64: "\x{4F7F}\x{308F}\x{308C}\x{3066}" - RenderText {#text} at (411,72) size 64x19 - text run at (411,72) width 64: "\x{3044}\x{307E}\x{3059}\x{3002}" - RenderText {#text} at (0,0) size 0x0 diff --git a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/ruby/ruby-run-break-expected.checksum b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/ruby/ruby-run-break-expected.checksum index 4c73bd2..69a7654 100644 --- a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/ruby/ruby-run-break-expected.checksum +++ b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/ruby/ruby-run-break-expected.checksum @@ -1 +1 @@ -0ee611081991e22cb51ffee5b5317af5
\ No newline at end of file +89b98dad591f216bef846703a030b087
\ No newline at end of file diff --git a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/ruby/ruby-run-break-expected.png b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/ruby/ruby-run-break-expected.png Binary files differindex 272fa6c..0b8b88a 100644 --- a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/ruby/ruby-run-break-expected.png +++ b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/ruby/ruby-run-break-expected.png diff --git a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/ruby/ruby-run-break-expected.txt b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/ruby/ruby-run-break-expected.txt deleted file mode 100644 index cf4d55e..0000000 --- a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/ruby/ruby-run-break-expected.txt +++ /dev/null @@ -1,40 +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 - RenderBody {BODY} at (8,8) size 784x584 - RenderBlock (anonymous) at (0,0) size 784x80 - RenderText {#text} at (0,0) size 770x59 - text run at (0,0) width 750: "This is a test for multiple ruby runs and line breaks. There is a div with a blue border and 10px padding. This contains a single" - text run at (0,20) width 437: "<ruby> markup in the text contained in the block, broken across 2 lines. " - text run at (437,20) width 333: "Part of it should be on the first line, the rest on the other" - text run at (0,40) width 28: "line. " - RenderBR {BR} at (28,55) size 0x0 - RenderBR {BR} at (0,60) size 0x19 - RenderBlock {DIV} at (0,80) size 284x88 [border: (2px solid #0000FF)] - RenderText {#text} at (12,24) size 224x19 - text run at (12,24) width 224: "\x{FF23}\x{FF33}\x{FF33}\x{FF13}\x{FF0F}\x{FF28}\x{FF34}\x{FF2D}\x{FF2C}\x{FF15}\x{306E}\x{30EB}\x{30D3}\x{306F}" - RenderRuby (inline) {RUBY} at (0,0) size 260x51 - RenderRubyRun (anonymous) at (236,12) size 16x32 - RenderRubyText {RT} at (0,0) size 16x12 - RenderText {#text} at (3,0) size 10x12 - text run at (3,0) width 10: "\x{306B}" - RenderRubyBase (anonymous) at (0,12) size 16x20 - RenderText {#text} at (0,0) size 16x19 - text run at (0,0) width 16: "\x{65E5}" - RenderRubyRun (anonymous) at (252,12) size 20x32 - RenderRubyText {RT} at (0,0) size 20x12 - RenderText {#text} at (0,0) size 20x12 - text run at (0,0) width 20: "\x{307B}\x{3093}" - RenderRubyBase (anonymous) at (0,12) size 20x20 - RenderText {#text} at (2,0) size 16x19 - text run at (2,0) width 16: "\x{672C}" - RenderRubyRun (anonymous) at (12,44) size 16x32 - RenderRubyText {RT} at (0,0) size 16x12 - RenderText {#text} at (3,0) size 10x12 - text run at (3,0) width 10: "\x{3054}" - RenderRubyBase (anonymous) at (0,12) size 16x20 - RenderText {#text} at (0,0) size 16x19 - text run at (0,0) width 16: "\x{8A9E}" - RenderText {#text} at (28,56) size 176x19 - text run at (28,56) width 176: "\x{306B}\x{3088}\x{304F}\x{4F7F}\x{308F}\x{308C}\x{3066}\x{3044}\x{307E}\x{3059}\x{3002}" diff --git a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/ruby/ruby-runs-expected.checksum b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/ruby/ruby-runs-expected.checksum index 8a296bdb..ecab40f 100644 --- a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/ruby/ruby-runs-expected.checksum +++ b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/ruby/ruby-runs-expected.checksum @@ -1 +1 @@ -7b89bcaa87887b6600265dca1fe15658
\ No newline at end of file +a81760a05b29aaf0d589bdb0da1d4609
\ No newline at end of file diff --git a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/ruby/ruby-runs-expected.png b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/ruby/ruby-runs-expected.png Binary files differindex 2a3c616..2dabddc 100644 --- a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/ruby/ruby-runs-expected.png +++ b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/ruby/ruby-runs-expected.png diff --git a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/ruby/ruby-runs-expected.txt b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/ruby/ruby-runs-expected.txt deleted file mode 100644 index 22373be..0000000 --- a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/ruby/ruby-runs-expected.txt +++ /dev/null @@ -1,36 +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 - RenderBody {BODY} at (8,8) size 784x584 - RenderText {#text} at (0,0) size 213x19 - text run at (0,0) width 213: "This is a test for multiple ruby runs. " - RenderBR {BR} at (213,15) size 0x0 - RenderBR {BR} at (0,20) size 0x19 - RenderText {#text} at (0,52) size 224x19 - text run at (0,52) width 224: "\x{FF23}\x{FF33}\x{FF33}\x{FF13}\x{FF0F}\x{FF28}\x{FF34}\x{FF2D}\x{FF2C}\x{FF15}\x{306E}\x{30EB}\x{30D3}\x{306F}" - RenderRuby (inline) {RUBY} at (0,0) size 52x19 - RenderRubyRun (anonymous) at (224,40) size 16x32 - RenderRubyText {RT} at (0,0) size 16x12 - RenderText {#text} at (3,0) size 10x12 - text run at (3,0) width 10: "\x{306B}" - RenderRubyBase (anonymous) at (0,12) size 16x20 - RenderText {#text} at (0,0) size 16x19 - text run at (0,0) width 16: "\x{65E5}" - RenderRubyRun (anonymous) at (240,40) size 20x32 - RenderRubyText {RT} at (0,0) size 20x12 - RenderText {#text} at (0,0) size 20x12 - text run at (0,0) width 20: "\x{307B}\x{3093}" - RenderRubyBase (anonymous) at (0,12) size 20x20 - RenderText {#text} at (2,0) size 16x19 - text run at (2,0) width 16: "\x{672C}" - RenderRubyRun (anonymous) at (260,40) size 16x32 - RenderRubyText {RT} at (0,0) size 16x12 - RenderText {#text} at (3,0) size 10x12 - text run at (3,0) width 10: "\x{3054}" - RenderRubyBase (anonymous) at (0,12) size 16x20 - RenderText {#text} at (0,0) size 16x19 - text run at (0,0) width 16: "\x{8A9E}" - RenderText {#text} at (276,52) size 176x19 - text run at (276,52) width 176: "\x{306B}\x{3088}\x{304F}\x{4F7F}\x{308F}\x{308C}\x{3066}\x{3044}\x{307E}\x{3059}\x{3002}" - RenderText {#text} at (0,0) size 0x0 diff --git a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/ruby/ruby-runs-spans-expected.checksum b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/ruby/ruby-runs-spans-expected.checksum index 82c7bbc..3b4631f 100644 --- a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/ruby/ruby-runs-spans-expected.checksum +++ b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/ruby/ruby-runs-spans-expected.checksum @@ -1 +1 @@ -902669b968f820a9651183a18e340140
\ No newline at end of file +5d783635679f182062e4fe18cf36a3fd
\ No newline at end of file diff --git a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/ruby/ruby-runs-spans-expected.png b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/ruby/ruby-runs-spans-expected.png Binary files differindex 347d858..be0d6bc 100644 --- a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/ruby/ruby-runs-spans-expected.png +++ b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/ruby/ruby-runs-spans-expected.png diff --git a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/ruby/ruby-runs-spans-expected.txt b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/ruby/ruby-runs-spans-expected.txt deleted file mode 100644 index dfb0af8..0000000 --- a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/ruby/ruby-runs-spans-expected.txt +++ /dev/null @@ -1,35 +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 - RenderBody {BODY} at (8,8) size 784x576 - RenderBlock {P} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 464x19 - text run at (0,0) width 464: "The following is a test for having non-text inline elements as base in a <ruby>." - RenderBlock {P} at (0,36) size 784x32 - RenderText {#text} at (0,12) size 64x19 - text run at (0,12) width 64: "\x{6E96}\x{592A}\x{90CE}\x{306F}" - RenderRuby (inline) {RUBY} at (0,0) size 140x19 - RenderRubyRun (anonymous) at (64,0) size 50x32 - RenderRubyText {RT} at (0,0) size 50x12 - RenderText {#text} at (0,0) size 50x12 - text run at (0,0) width 50: "\x{3068}\x{3046}\x{304D}\x{3087}\x{3046}" - RenderRubyBase (anonymous) at (0,12) size 50x20 - RenderInline {SPAN} at (0,0) size 32x19 - RenderText {#text} at (9,0) size 32x19 - text run at (9,0) width 32: "\x{6771}\x{4EAC}" - RenderRubyRun (anonymous) at (114,0) size 90x32 - RenderRubyText {RT} at (0,0) size 90x12 - RenderText {#text} at (0,0) size 90x12 - text run at (0,0) width 90: "\x{3053}\x{3046}\x{304E}\x{3087}\x{3046}\x{3060}\x{3044}\x{304C}\x{304F}" - RenderRubyBase (anonymous) at (0,12) size 90x20 - RenderInline {SPAN} at (0,0) size 32x19 - RenderText {#text} at (13,0) size 32x19 - text run at (13,0) width 32: "\x{5DE5}\x{696D}" - RenderInline {SPAN} at (0,0) size 32x19 - RenderText {#text} at (45,0) size 32x19 - text run at (45,0) width 32: "\x{5927}\x{5B66}" - RenderText {#text} at (204,12) size 144x19 - text run at (204,12) width 144: "\x{304B}\x{3089}\x{5352}\x{696D}\x{3057}\x{307E}\x{3057}\x{305F}\x{3002}" - RenderText {#text} at (0,0) size 0x0 - RenderText {#text} at (0,0) size 0x0 diff --git a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/ruby/ruby-simple-expected.checksum b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/ruby/ruby-simple-expected.checksum index 24443f5..098cc22 100644 --- a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/ruby/ruby-simple-expected.checksum +++ b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/ruby/ruby-simple-expected.checksum @@ -1 +1 @@ -2a7d08a80431be239b9b050b2e5e0e60
\ No newline at end of file +94f236010e911659c67780fbcade8fa1
\ No newline at end of file diff --git a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/ruby/ruby-simple-expected.png b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/ruby/ruby-simple-expected.png Binary files differindex cf57f29..0c66fd5 100644 --- a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/ruby/ruby-simple-expected.png +++ b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/ruby/ruby-simple-expected.png diff --git a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/ruby/ruby-simple-expected.txt b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/ruby/ruby-simple-expected.txt deleted file mode 100644 index bd81b68..0000000 --- a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/ruby/ruby-simple-expected.txt +++ /dev/null @@ -1,22 +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 - RenderBody {BODY} at (8,8) size 784x584 - RenderText {#text} at (0,0) size 210x19 - text run at (0,0) width 210: "This is a initial test for simple ruby. " - RenderBR {BR} at (210,15) size 0x0 - RenderBR {BR} at (0,20) size 0x19 - RenderText {#text} at (0,52) size 224x19 - text run at (0,52) width 224: "\x{FF23}\x{FF33}\x{FF33}\x{FF13}\x{FF0F}\x{FF28}\x{FF34}\x{FF2D}\x{FF2C}\x{FF15}\x{306E}\x{30EB}\x{30D3}\x{306F}" - RenderRuby (inline) {RUBY} at (0,0) size 48x19 - RenderRubyRun (anonymous) at (224,40) size 48x32 - RenderRubyText {RT} at (0,0) size 48x12 - RenderText {#text} at (4,0) size 40x12 - text run at (4,0) width 40: "\x{306B}\x{307B}\x{3093}\x{3054}" - RenderRubyBase (anonymous) at (0,12) size 48x20 - RenderText {#text} at (0,0) size 48x19 - text run at (0,0) width 48: "\x{65E5}\x{672C}\x{8A9E}" - RenderText {#text} at (272,52) size 176x19 - text run at (272,52) width 176: "\x{306B}\x{3088}\x{304F}\x{4F7F}\x{308F}\x{308C}\x{3066}\x{3044}\x{307E}\x{3059}\x{3002}" - RenderText {#text} at (0,0) size 0x0 diff --git a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/ruby/ruby-simple-rp-expected.checksum b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/ruby/ruby-simple-rp-expected.checksum index 850b68b..7127dd9 100644 --- a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/ruby/ruby-simple-rp-expected.checksum +++ b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/ruby/ruby-simple-rp-expected.checksum @@ -1 +1 @@ -3eab7efdb8e380414cf3d75ce6751a5b
\ No newline at end of file +b241f597dce5c0e0d7baa5bca43294f0
\ No newline at end of file diff --git a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/ruby/ruby-simple-rp-expected.png b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/ruby/ruby-simple-rp-expected.png Binary files differindex 8ef0f0e..92820b0 100644 --- a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/ruby/ruby-simple-rp-expected.png +++ b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/ruby/ruby-simple-rp-expected.png diff --git a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/ruby/ruby-simple-rp-expected.txt b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/ruby/ruby-simple-rp-expected.txt deleted file mode 100644 index 878e0e8..0000000 --- a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/ruby/ruby-simple-rp-expected.txt +++ /dev/null @@ -1,24 +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 - RenderBody {BODY} at (8,8) size 784x584 - RenderText {#text} at (0,0) size 763x39 - text run at (0,0) width 318: "This is a test for simple ruby that contains <rp> tags. " - text run at (318,0) width 445: "Contents of the <rp> tags (opening and closing brackets) should not show" - text run at (0,20) width 157: "when ruby is suppoorted. " - RenderBR {BR} at (157,35) size 0x0 - RenderBR {BR} at (0,40) size 0x19 - RenderText {#text} at (0,72) size 224x19 - text run at (0,72) width 224: "\x{FF23}\x{FF33}\x{FF33}\x{FF13}\x{FF0F}\x{FF28}\x{FF34}\x{FF2D}\x{FF2C}\x{FF15}\x{306E}\x{30EB}\x{30D3}\x{306F}" - RenderRuby (inline) {RUBY} at (0,0) size 48x19 - RenderRubyRun (anonymous) at (224,60) size 48x32 - RenderRubyText {RT} at (0,0) size 48x12 - RenderText {#text} at (4,0) size 40x12 - text run at (4,0) width 40: "\x{306B}\x{307B}\x{3093}\x{3054}" - RenderRubyBase (anonymous) at (0,12) size 48x20 - RenderText {#text} at (0,0) size 48x19 - text run at (0,0) width 48: "\x{65E5}\x{672C}\x{8A9E}" - RenderText {#text} at (272,72) size 176x19 - text run at (272,72) width 176: "\x{306B}\x{3088}\x{304F}\x{4F7F}\x{308F}\x{308C}\x{3066}\x{3044}\x{307E}\x{3059}\x{3002}" - RenderText {#text} at (0,0) size 0x0 diff --git a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/ruby/ruby-trailing-expected.checksum b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/ruby/ruby-trailing-expected.checksum index 1cd9065..779b92c 100644 --- a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/ruby/ruby-trailing-expected.checksum +++ b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/ruby/ruby-trailing-expected.checksum @@ -1 +1 @@ -709b3512a33882f99c5c712aa54b2876
\ No newline at end of file +77ae9f17cf0db1743024683a83994403
\ No newline at end of file diff --git a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/ruby/ruby-trailing-expected.png b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/ruby/ruby-trailing-expected.png Binary files differindex 403f6af..608b4e4 100644 --- a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/ruby/ruby-trailing-expected.png +++ b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/ruby/ruby-trailing-expected.png diff --git a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/ruby/ruby-trailing-expected.txt b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/ruby/ruby-trailing-expected.txt deleted file mode 100644 index 08358f3..0000000 --- a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/ruby/ruby-trailing-expected.txt +++ /dev/null @@ -1,37 +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 - RenderBody {BODY} at (8,8) size 784x576 - RenderBlock {P} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 554x19 - text run at (0,0) width 554: "The following is a test for having a trailing base within a <ruby> with no associated ruby text." - RenderBlock (anonymous) at (0,36) size 784x40 - RenderBR {BR} at (0,0) size 0x19 - RenderBR {BR} at (0,20) size 0x19 - RenderBlock {P} at (0,92) size 784x32 - RenderText {#text} at (0,12) size 64x19 - text run at (0,12) width 64: "\x{6E96}\x{592A}\x{90CE}\x{306F}" - RenderRuby (inline) {RUBY} at (0,0) size 132x19 - RenderRubyRun (anonymous) at (64,0) size 50x32 - RenderRubyText {RT} at (0,0) size 50x12 - RenderText {#text} at (0,0) size 50x12 - text run at (0,0) width 50: "\x{3068}\x{3046}\x{304D}\x{3087}\x{3046}" - RenderRubyBase (anonymous) at (0,12) size 50x20 - RenderText {#text} at (9,0) size 32x19 - text run at (9,0) width 32: "\x{6771}\x{4EAC}" - RenderRubyRun (anonymous) at (114,0) size 50x32 - RenderRubyText {RT} at (0,0) size 50x12 - RenderText {#text} at (0,0) size 50x12 - text run at (0,0) width 50: "\x{3053}\x{3046}\x{304E}\x{3087}\x{3046}" - RenderRubyBase (anonymous) at (0,12) size 50x20 - RenderText {#text} at (9,0) size 32x19 - text run at (9,0) width 32: "\x{5DE5}\x{696D}" - RenderRubyRun (anonymous) at (164,12) size 32x20 - RenderRubyBase (anonymous) at (0,0) size 32x20 - RenderText {#text} at (0,0) size 32x19 - text run at (0,0) width 32: "\x{5927}\x{5B66}" - RenderText {#text} at (196,12) size 144x19 - text run at (196,12) width 144: "\x{304B}\x{3089}\x{5352}\x{696D}\x{3057}\x{307E}\x{3057}\x{305F}\x{3002}" - RenderText {#text} at (0,0) size 0x0 - RenderText {#text} at (0,0) size 0x0 diff --git a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/ruby/rubyDOM-insert-rt-expected.checksum b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/ruby/rubyDOM-insert-rt-expected.checksum index 5274690..a21c916 100644 --- a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/ruby/rubyDOM-insert-rt-expected.checksum +++ b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/ruby/rubyDOM-insert-rt-expected.checksum @@ -1 +1 @@ -803daa15315a6aaaa4f4e149b58709e0
\ No newline at end of file +991d2c03a2151287d74f58d0a2b4e8cf
\ No newline at end of file diff --git a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/ruby/rubyDOM-insert-rt-expected.png b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/ruby/rubyDOM-insert-rt-expected.png Binary files differindex a072b9f..9026236 100644 --- a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/ruby/rubyDOM-insert-rt-expected.png +++ b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/ruby/rubyDOM-insert-rt-expected.png diff --git a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/ruby/rubyDOM-insert-rt-expected.txt b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/ruby/rubyDOM-insert-rt-expected.txt deleted file mode 100644 index e9efff1..0000000 --- a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/ruby/rubyDOM-insert-rt-expected.txt +++ /dev/null @@ -1,74 +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 - RenderBody {BODY} at (8,8) size 784x576 - RenderBlock {P} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 538x19 - text run at (0,0) width 538: "The following is a test for DOM manipulation within <ruby>: Inserting a new <rt> element" - RenderBlock {P} at (0,36) size 784x20 - RenderText {#text} at (0,0) size 409x19 - text run at (0,0) width 409: "Both lines should look identical (the first line is the one manipulated)." - RenderBlock (anonymous) at (0,72) size 784x40 - RenderBR {BR} at (0,0) size 0x19 - RenderBR {BR} at (0,20) size 0x19 - RenderBlock {P} at (0,128) size 784x32 - RenderText {#text} at (0,12) size 64x19 - text run at (0,12) width 64: "\x{6E96}\x{592A}\x{90CE}\x{306F}" - RenderRuby (inline) {RUBY} at (0,0) size 140x19 - RenderRubyRun (anonymous) at (64,0) size 50x32 - RenderRubyText {RT} at (0,0) size 50x12 - RenderText {#text} at (0,0) size 50x12 - text run at (0,0) width 50: "\x{3068}\x{3046}\x{304D}\x{3087}\x{3046}" - RenderRubyBase (anonymous) at (0,12) size 50x20 - RenderInline {SPAN} at (0,0) size 32x19 - RenderText {#text} at (9,0) size 32x19 - text run at (9,0) width 32: "\x{6771}\x{4EAC}" - RenderRubyRun (anonymous) at (114,0) size 50x32 - RenderRubyText {RT} at (0,0) size 50x12 - RenderText {#text} at (0,0) size 50x12 - text run at (0,0) width 50: "\x{3053}\x{3046}\x{304E}\x{3087}\x{3046}" - RenderRubyBase (anonymous) at (0,12) size 50x20 - RenderInline {SPAN} at (0,0) size 32x19 - RenderText {#text} at (9,0) size 32x19 - text run at (9,0) width 32: "\x{5DE5}\x{696D}" - RenderRubyRun (anonymous) at (164,0) size 40x32 - RenderRubyText {RT} at (0,0) size 40x12 - RenderText {#text} at (0,0) size 40x12 - text run at (0,0) width 40: "\x{3060}\x{3044}\x{304C}\x{304F}" - RenderRubyBase (anonymous) at (0,12) size 40x20 - RenderInline {SPAN} at (0,0) size 32x19 - RenderText {#text} at (4,0) size 32x19 - text run at (4,0) width 32: "\x{5927}\x{5B66}" - RenderText {#text} at (204,12) size 144x19 - text run at (204,12) width 144: "\x{304B}\x{3089}\x{5352}\x{696D}\x{3057}\x{307E}\x{3057}\x{305F}\x{3002}" - RenderBlock {P} at (0,176) size 784x32 - RenderText {#text} at (0,12) size 64x19 - text run at (0,12) width 64: "\x{6E96}\x{592A}\x{90CE}\x{306F}" - RenderRuby (inline) {RUBY} at (0,0) size 140x19 - RenderRubyRun (anonymous) at (64,0) size 50x32 - RenderRubyText {RT} at (0,0) size 50x12 - RenderText {#text} at (0,0) size 50x12 - text run at (0,0) width 50: "\x{3068}\x{3046}\x{304D}\x{3087}\x{3046}" - RenderRubyBase (anonymous) at (0,12) size 50x20 - RenderInline {SPAN} at (0,0) size 32x19 - RenderText {#text} at (9,0) size 32x19 - text run at (9,0) width 32: "\x{6771}\x{4EAC}" - RenderRubyRun (anonymous) at (114,0) size 50x32 - RenderRubyText {RT} at (0,0) size 50x12 - RenderText {#text} at (0,0) size 50x12 - text run at (0,0) width 50: "\x{3053}\x{3046}\x{304E}\x{3087}\x{3046}" - RenderRubyBase (anonymous) at (0,12) size 50x20 - RenderInline {SPAN} at (0,0) size 32x19 - RenderText {#text} at (9,0) size 32x19 - text run at (9,0) width 32: "\x{5DE5}\x{696D}" - RenderRubyRun (anonymous) at (164,0) size 40x32 - RenderRubyText {RT} at (0,0) size 40x12 - RenderText {#text} at (0,0) size 40x12 - text run at (0,0) width 40: "\x{3060}\x{3044}\x{304C}\x{304F}" - RenderRubyBase (anonymous) at (0,12) size 40x20 - RenderInline {SPAN} at (0,0) size 32x19 - RenderText {#text} at (4,0) size 32x19 - text run at (4,0) width 32: "\x{5927}\x{5B66}" - RenderText {#text} at (204,12) size 144x19 - text run at (204,12) width 144: "\x{304B}\x{3089}\x{5352}\x{696D}\x{3057}\x{307E}\x{3057}\x{305F}\x{3002}" diff --git a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/ruby/rubyDOM-insert-text1-expected.checksum b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/ruby/rubyDOM-insert-text1-expected.checksum index d1370d0..ce0e097 100644 --- a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/ruby/rubyDOM-insert-text1-expected.checksum +++ b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/ruby/rubyDOM-insert-text1-expected.checksum @@ -1 +1 @@ -55ab49ff9354bcab9ab47bb1ee0425ab
\ No newline at end of file +56751cd6fab59c264b8fdcba3ab63368
\ No newline at end of file diff --git a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/ruby/rubyDOM-insert-text1-expected.png b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/ruby/rubyDOM-insert-text1-expected.png Binary files differindex e9f98a3..b5a220c 100644 --- a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/ruby/rubyDOM-insert-text1-expected.png +++ b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/ruby/rubyDOM-insert-text1-expected.png diff --git a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/ruby/rubyDOM-insert-text1-expected.txt b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/ruby/rubyDOM-insert-text1-expected.txt deleted file mode 100644 index 11407a7..0000000 --- a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/ruby/rubyDOM-insert-text1-expected.txt +++ /dev/null @@ -1,72 +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 - RenderBody {BODY} at (8,8) size 784x576 - RenderBlock {P} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 618x19 - text run at (0,0) width 618: "The following is a test for DOM manipulation within <ruby>: Inserting a new text before a <rt> element" - RenderBlock {P} at (0,36) size 784x20 - RenderText {#text} at (0,0) size 409x19 - text run at (0,0) width 409: "Both lines should look identical (the first line is the one manipulated)." - RenderBlock (anonymous) at (0,72) size 784x40 - RenderBR {BR} at (0,0) size 0x19 - RenderBR {BR} at (0,20) size 0x19 - RenderBlock {P} at (0,128) size 784x32 - RenderText {#text} at (0,12) size 64x19 - text run at (0,12) width 64: "\x{6E96}\x{592A}\x{90CE}\x{306F}" - RenderRuby (inline) {RUBY} at (0,0) size 140x19 - RenderRubyRun (anonymous) at (64,0) size 50x32 - RenderRubyText {RT} at (0,0) size 50x12 - RenderText {#text} at (0,0) size 50x12 - text run at (0,0) width 50: "\x{3068}\x{3046}\x{304D}\x{3087}\x{3046}" - RenderRubyBase (anonymous) at (0,12) size 50x20 - RenderInline {SPAN} at (0,0) size 32x19 - RenderText {#text} at (9,0) size 32x19 - text run at (9,0) width 32: "\x{6771}\x{4EAC}" - RenderRubyRun (anonymous) at (114,0) size 50x32 - RenderRubyText {RT} at (0,0) size 50x12 - RenderText {#text} at (0,0) size 50x12 - text run at (0,0) width 50: "\x{3053}\x{3046}\x{304E}\x{3087}\x{3046}" - RenderRubyBase (anonymous) at (0,12) size 50x20 - RenderText {#text} at (9,0) size 32x19 - text run at (9,0) width 32: "\x{5DE5}\x{696D}" - RenderRubyRun (anonymous) at (164,0) size 40x32 - RenderRubyText {RT} at (0,0) size 40x12 - RenderText {#text} at (0,0) size 40x12 - text run at (0,0) width 40: "\x{3060}\x{3044}\x{304C}\x{304F}" - RenderRubyBase (anonymous) at (0,12) size 40x20 - RenderInline {SPAN} at (0,0) size 32x19 - RenderText {#text} at (4,0) size 32x19 - text run at (4,0) width 32: "\x{5927}\x{5B66}" - RenderText {#text} at (204,12) size 144x19 - text run at (204,12) width 144: "\x{304B}\x{3089}\x{5352}\x{696D}\x{3057}\x{307E}\x{3057}\x{305F}\x{3002}" - RenderBlock {P} at (0,176) size 784x32 - RenderText {#text} at (0,12) size 64x19 - text run at (0,12) width 64: "\x{6E96}\x{592A}\x{90CE}\x{306F}" - RenderRuby (inline) {RUBY} at (0,0) size 140x19 - RenderRubyRun (anonymous) at (64,0) size 50x32 - RenderRubyText {RT} at (0,0) size 50x12 - RenderText {#text} at (0,0) size 50x12 - text run at (0,0) width 50: "\x{3068}\x{3046}\x{304D}\x{3087}\x{3046}" - RenderRubyBase (anonymous) at (0,12) size 50x20 - RenderInline {SPAN} at (0,0) size 32x19 - RenderText {#text} at (9,0) size 32x19 - text run at (9,0) width 32: "\x{6771}\x{4EAC}" - RenderRubyRun (anonymous) at (114,0) size 50x32 - RenderRubyText {RT} at (0,0) size 50x12 - RenderText {#text} at (0,0) size 50x12 - text run at (0,0) width 50: "\x{3053}\x{3046}\x{304E}\x{3087}\x{3046}" - RenderRubyBase (anonymous) at (0,12) size 50x20 - RenderText {#text} at (9,0) size 32x19 - text run at (9,0) width 32: "\x{5DE5}\x{696D}" - RenderRubyRun (anonymous) at (164,0) size 40x32 - RenderRubyText {RT} at (0,0) size 40x12 - RenderText {#text} at (0,0) size 40x12 - text run at (0,0) width 40: "\x{3060}\x{3044}\x{304C}\x{304F}" - RenderRubyBase (anonymous) at (0,12) size 40x20 - RenderInline {SPAN} at (0,0) size 32x19 - RenderText {#text} at (4,0) size 32x19 - text run at (4,0) width 32: "\x{5927}\x{5B66}" - RenderText {#text} at (204,12) size 144x19 - text run at (204,12) width 144: "\x{304B}\x{3089}\x{5352}\x{696D}\x{3057}\x{307E}\x{3057}\x{305F}\x{3002}" diff --git a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/ruby/rubyDOM-insert-text2-expected.checksum b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/ruby/rubyDOM-insert-text2-expected.checksum index 840252b..c99f5e3 100644 --- a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/ruby/rubyDOM-insert-text2-expected.checksum +++ b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/ruby/rubyDOM-insert-text2-expected.checksum @@ -1 +1 @@ -7d8b67dd9c05a7eb29a7c9a831e43275
\ No newline at end of file +b269afc30b18660dd3229a8757b80154
\ No newline at end of file diff --git a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/ruby/rubyDOM-insert-text2-expected.png b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/ruby/rubyDOM-insert-text2-expected.png Binary files differindex 96f7c05..31d656f 100644 --- a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/ruby/rubyDOM-insert-text2-expected.png +++ b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/ruby/rubyDOM-insert-text2-expected.png diff --git a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/ruby/rubyDOM-insert-text2-expected.txt b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/ruby/rubyDOM-insert-text2-expected.txt deleted file mode 100644 index 6ee8bf1..0000000 --- a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/ruby/rubyDOM-insert-text2-expected.txt +++ /dev/null @@ -1,46 +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 - RenderBody {BODY} at (8,8) size 784x576 - RenderBlock {P} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 775x19 - text run at (0,0) width 775: "The following is a test for DOM manipulation within <ruby>: Inserting a new text before a <rt> element that already contains text." - RenderBlock {P} at (0,36) size 784x20 - RenderText {#text} at (0,0) size 409x19 - text run at (0,0) width 409: "Both lines should look identical (the first line is the one manipulated)." - RenderBlock (anonymous) at (0,72) size 784x40 - RenderBR {BR} at (0,0) size 0x19 - RenderBR {BR} at (0,20) size 0x19 - RenderBlock {P} at (0,128) size 784x32 - RenderText {#text} at (0,12) size 64x19 - text run at (0,12) width 64: "\x{6E96}\x{592A}\x{90CE}\x{306F}" - RenderRuby (inline) {RUBY} at (0,0) size 90x19 - RenderRubyRun (anonymous) at (64,0) size 90x32 - RenderRubyText {RT} at (0,0) size 90x12 - RenderText {#text} at (0,0) size 90x12 - text run at (0,0) width 90: "\x{3053}\x{3046}\x{304E}\x{3087}\x{3046}\x{3060}\x{3044}\x{304C}\x{304F}" - RenderRubyBase (anonymous) at (0,12) size 90x20 - RenderInline {SPAN} at (0,0) size 32x19 - RenderText {#text} at (13,0) size 32x19 - text run at (13,0) width 32: "\x{5DE5}\x{696D}" - RenderText {#text} at (45,0) size 32x19 - text run at (45,0) width 32: "\x{5927}\x{5B66}" - RenderText {#text} at (154,12) size 144x19 - text run at (154,12) width 144: "\x{304B}\x{3089}\x{5352}\x{696D}\x{3057}\x{307E}\x{3057}\x{305F}\x{3002}" - RenderBlock {P} at (0,176) size 784x32 - RenderText {#text} at (0,12) size 64x19 - text run at (0,12) width 64: "\x{6E96}\x{592A}\x{90CE}\x{306F}" - RenderRuby (inline) {RUBY} at (0,0) size 90x19 - RenderRubyRun (anonymous) at (64,0) size 90x32 - RenderRubyText {RT} at (0,0) size 90x12 - RenderText {#text} at (0,0) size 90x12 - text run at (0,0) width 90: "\x{3053}\x{3046}\x{304E}\x{3087}\x{3046}\x{3060}\x{3044}\x{304C}\x{304F}" - RenderRubyBase (anonymous) at (0,12) size 90x20 - RenderInline {SPAN} at (0,0) size 32x19 - RenderText {#text} at (13,0) size 32x19 - text run at (13,0) width 32: "\x{5DE5}\x{696D}" - RenderText {#text} at (45,0) size 32x19 - text run at (45,0) width 32: "\x{5927}\x{5B66}" - RenderText {#text} at (154,12) size 144x19 - text run at (154,12) width 144: "\x{304B}\x{3089}\x{5352}\x{696D}\x{3057}\x{307E}\x{3057}\x{305F}\x{3002}" diff --git a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/ruby/rubyDOM-insert-text3-expected.checksum b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/ruby/rubyDOM-insert-text3-expected.checksum index b79853a..fb45c93 100644 --- a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/ruby/rubyDOM-insert-text3-expected.checksum +++ b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/ruby/rubyDOM-insert-text3-expected.checksum @@ -1 +1 @@ -496f810943341dec6b1a0e54f9ea8444
\ No newline at end of file +8745f6693887587cbdaceb8fa8a56457
\ No newline at end of file diff --git a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/ruby/rubyDOM-insert-text3-expected.png b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/ruby/rubyDOM-insert-text3-expected.png Binary files differindex fec5c38..21cc539 100644 --- a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/ruby/rubyDOM-insert-text3-expected.png +++ b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/ruby/rubyDOM-insert-text3-expected.png diff --git a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/ruby/rubyDOM-insert-text3-expected.txt b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/ruby/rubyDOM-insert-text3-expected.txt deleted file mode 100644 index 6e9c2cf..0000000 --- a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/ruby/rubyDOM-insert-text3-expected.txt +++ /dev/null @@ -1,46 +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 - RenderBody {BODY} at (8,8) size 784x576 - RenderBlock {P} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 695x19 - text run at (0,0) width 695: "The following is a test for DOM manipulation within <ruby>: Inserting a new text before another text of a ruby base." - RenderBlock {P} at (0,36) size 784x20 - RenderText {#text} at (0,0) size 409x19 - text run at (0,0) width 409: "Both lines should look identical (the first line is the one manipulated)." - RenderBlock (anonymous) at (0,72) size 784x40 - RenderBR {BR} at (0,0) size 0x19 - RenderBR {BR} at (0,20) size 0x19 - RenderBlock {P} at (0,128) size 784x32 - RenderText {#text} at (0,12) size 64x19 - text run at (0,12) width 64: "\x{6E96}\x{592A}\x{90CE}\x{306F}" - RenderRuby (inline) {RUBY} at (0,0) size 90x19 - RenderRubyRun (anonymous) at (64,0) size 90x32 - RenderRubyText {RT} at (0,0) size 90x12 - RenderText {#text} at (0,0) size 90x12 - text run at (0,0) width 90: "\x{3053}\x{3046}\x{304E}\x{3087}\x{3046}\x{3060}\x{3044}\x{304C}\x{304F}" - RenderRubyBase (anonymous) at (0,12) size 90x20 - RenderText {#text} at (13,0) size 32x19 - text run at (13,0) width 32: "\x{5DE5}\x{696D}" - RenderInline {SPAN} at (0,0) size 32x19 - RenderText {#text} at (45,0) size 32x19 - text run at (45,0) width 32: "\x{5927}\x{5B66}" - RenderText {#text} at (154,12) size 144x19 - text run at (154,12) width 144: "\x{304B}\x{3089}\x{5352}\x{696D}\x{3057}\x{307E}\x{3057}\x{305F}\x{3002}" - RenderBlock {P} at (0,176) size 784x32 - RenderText {#text} at (0,12) size 64x19 - text run at (0,12) width 64: "\x{6E96}\x{592A}\x{90CE}\x{306F}" - RenderRuby (inline) {RUBY} at (0,0) size 90x19 - RenderRubyRun (anonymous) at (64,0) size 90x32 - RenderRubyText {RT} at (0,0) size 90x12 - RenderText {#text} at (0,0) size 90x12 - text run at (0,0) width 90: "\x{3053}\x{3046}\x{304E}\x{3087}\x{3046}\x{3060}\x{3044}\x{304C}\x{304F}" - RenderRubyBase (anonymous) at (0,12) size 90x20 - RenderText {#text} at (13,0) size 32x19 - text run at (13,0) width 32: "\x{5DE5}\x{696D}" - RenderInline {SPAN} at (0,0) size 32x19 - RenderText {#text} at (45,0) size 32x19 - text run at (45,0) width 32: "\x{5927}\x{5B66}" - RenderText {#text} at (154,12) size 144x19 - text run at (154,12) width 144: "\x{304B}\x{3089}\x{5352}\x{696D}\x{3057}\x{307E}\x{3057}\x{305F}\x{3002}" diff --git a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/ruby/rubyDOM-remove-rt1-expected.checksum b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/ruby/rubyDOM-remove-rt1-expected.checksum index c2755e0..5c4e724 100644 --- a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/ruby/rubyDOM-remove-rt1-expected.checksum +++ b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/ruby/rubyDOM-remove-rt1-expected.checksum @@ -1 +1 @@ -36706cac3c168303c53e13924d9d0246
\ No newline at end of file +caacc8511681ba0de7a60dbd501d5208
\ No newline at end of file diff --git a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/ruby/rubyDOM-remove-rt1-expected.png b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/ruby/rubyDOM-remove-rt1-expected.png Binary files differindex 2258a3a..c73ba0a1 100644 --- a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/ruby/rubyDOM-remove-rt1-expected.png +++ b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/ruby/rubyDOM-remove-rt1-expected.png diff --git a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/ruby/rubyDOM-remove-rt1-expected.txt b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/ruby/rubyDOM-remove-rt1-expected.txt deleted file mode 100644 index 473c691..0000000 --- a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/ruby/rubyDOM-remove-rt1-expected.txt +++ /dev/null @@ -1,48 +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 - RenderBody {BODY} at (8,8) size 784x576 - RenderBlock {P} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 715x19 - text run at (0,0) width 715: "The following is a test for DOM manipulation within <ruby>: Removing the last <rt>, leaving the base without ruby text." - RenderBlock {P} at (0,36) size 784x20 - RenderText {#text} at (0,0) size 409x19 - text run at (0,0) width 409: "Both lines should look identical (the first line is the one manipulated)." - RenderBlock (anonymous) at (0,72) size 784x40 - RenderBR {BR} at (0,0) size 0x19 - RenderBR {BR} at (0,20) size 0x19 - RenderBlock {P} at (0,128) size 784x32 - RenderText {#text} at (0,12) size 64x19 - text run at (0,12) width 64: "\x{6E96}\x{592A}\x{90CE}\x{306F}" - RenderRuby (inline) {RUBY} at (0,0) size 82x19 - RenderRubyRun (anonymous) at (64,0) size 50x32 - RenderRubyText {RT} at (0,0) size 50x12 - RenderText {#text} at (0,0) size 50x12 - text run at (0,0) width 50: "\x{3053}\x{3046}\x{304E}\x{3087}\x{3046}" - RenderRubyBase (anonymous) at (0,12) size 50x20 - RenderText {#text} at (9,0) size 32x19 - text run at (9,0) width 32: "\x{5DE5}\x{696D}" - RenderRubyRun (anonymous) at (114,12) size 32x20 - RenderRubyBase (anonymous) at (0,0) size 32x20 - RenderText {#text} at (0,0) size 32x19 - text run at (0,0) width 32: "\x{5927}\x{5B66}" - RenderText {#text} at (146,12) size 144x19 - text run at (146,12) width 144: "\x{304B}\x{3089}\x{5352}\x{696D}\x{3057}\x{307E}\x{3057}\x{305F}\x{3002}" - RenderBlock {P} at (0,176) size 784x32 - RenderText {#text} at (0,12) size 64x19 - text run at (0,12) width 64: "\x{6E96}\x{592A}\x{90CE}\x{306F}" - RenderRuby (inline) {RUBY} at (0,0) size 82x19 - RenderRubyRun (anonymous) at (64,0) size 50x32 - RenderRubyText {RT} at (0,0) size 50x12 - RenderText {#text} at (0,0) size 50x12 - text run at (0,0) width 50: "\x{3053}\x{3046}\x{304E}\x{3087}\x{3046}" - RenderRubyBase (anonymous) at (0,12) size 50x20 - RenderText {#text} at (9,0) size 32x19 - text run at (9,0) width 32: "\x{5DE5}\x{696D}" - RenderRubyRun (anonymous) at (114,12) size 32x20 - RenderRubyBase (anonymous) at (0,0) size 32x20 - RenderText {#text} at (0,0) size 32x19 - text run at (0,0) width 32: "\x{5927}\x{5B66}" - RenderText {#text} at (146,12) size 144x19 - text run at (146,12) width 144: "\x{304B}\x{3089}\x{5352}\x{696D}\x{3057}\x{307E}\x{3057}\x{305F}\x{3002}" diff --git a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/ruby/rubyDOM-remove-rt2-expected.checksum b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/ruby/rubyDOM-remove-rt2-expected.checksum index 7d3641d..b693fec 100644 --- a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/ruby/rubyDOM-remove-rt2-expected.checksum +++ b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/ruby/rubyDOM-remove-rt2-expected.checksum @@ -1 +1 @@ -5bf893dbc40ebb5c4af06b8626eedf49
\ No newline at end of file +3c2a46f22f32410a216f7a6ca21a295c
\ No newline at end of file diff --git a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/ruby/rubyDOM-remove-rt2-expected.png b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/ruby/rubyDOM-remove-rt2-expected.png Binary files differindex 4e33904..d0261a3 100644 --- a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/ruby/rubyDOM-remove-rt2-expected.png +++ b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/ruby/rubyDOM-remove-rt2-expected.png diff --git a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/ruby/rubyDOM-remove-rt2-expected.txt b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/ruby/rubyDOM-remove-rt2-expected.txt deleted file mode 100644 index 8bdbf83..0000000 --- a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/ruby/rubyDOM-remove-rt2-expected.txt +++ /dev/null @@ -1,42 +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 - RenderBody {BODY} at (8,8) size 784x576 - RenderBlock {P} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 771x19 - text run at (0,0) width 771: "The following is a test for DOM manipulation within <ruby>: Removing the last <rt>, forcing a merge with the right neighbour run" - RenderBlock {P} at (0,36) size 784x20 - RenderText {#text} at (0,0) size 409x19 - text run at (0,0) width 409: "Both lines should look identical (the first line is the one manipulated)." - RenderBlock (anonymous) at (0,72) size 784x40 - RenderBR {BR} at (0,0) size 0x19 - RenderBR {BR} at (0,20) size 0x19 - RenderBlock {P} at (0,128) size 784x32 - RenderText {#text} at (0,12) size 64x19 - text run at (0,12) width 64: "\x{6E96}\x{592A}\x{90CE}\x{306F}" - RenderRuby (inline) {RUBY} at (0,0) size 90x19 - RenderRubyRun (anonymous) at (64,0) size 90x32 - RenderRubyText {RT} at (0,0) size 90x12 - RenderText {#text} at (0,0) size 90x12 - text run at (0,0) width 90: "\x{3053}\x{3046}\x{304E}\x{3087}\x{3046}\x{3060}\x{3044}\x{304C}\x{304F}" - RenderRubyBase (anonymous) at (0,12) size 90x20 - RenderText {#text} at (13,0) size 32x19 - text run at (13,0) width 32: "\x{5DE5}\x{696D}" - RenderText {#text} at (45,0) size 32x19 - text run at (45,0) width 32: "\x{5927}\x{5B66}" - RenderText {#text} at (154,12) size 144x19 - text run at (154,12) width 144: "\x{304B}\x{3089}\x{5352}\x{696D}\x{3057}\x{307E}\x{3057}\x{305F}\x{3002}" - RenderBlock {P} at (0,176) size 784x32 - RenderText {#text} at (0,12) size 64x19 - text run at (0,12) width 64: "\x{6E96}\x{592A}\x{90CE}\x{306F}" - RenderRuby (inline) {RUBY} at (0,0) size 90x19 - RenderRubyRun (anonymous) at (64,0) size 90x32 - RenderRubyText {RT} at (0,0) size 90x12 - RenderText {#text} at (0,0) size 90x12 - text run at (0,0) width 90: "\x{3053}\x{3046}\x{304E}\x{3087}\x{3046}\x{3060}\x{3044}\x{304C}\x{304F}" - RenderRubyBase (anonymous) at (0,12) size 90x20 - RenderText {#text} at (13,0) size 64x19 - text run at (13,0) width 64: "\x{5DE5}\x{696D}\x{5927}\x{5B66}" - RenderText {#text} at (154,12) size 144x19 - text run at (154,12) width 144: "\x{304B}\x{3089}\x{5352}\x{696D}\x{3057}\x{307E}\x{3057}\x{305F}\x{3002}" diff --git a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/ruby/rubyDOM-remove-text1-expected.checksum b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/ruby/rubyDOM-remove-text1-expected.checksum index cced37b..29a7ee5 100644 --- a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/ruby/rubyDOM-remove-text1-expected.checksum +++ b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/ruby/rubyDOM-remove-text1-expected.checksum @@ -1 +1 @@ -5c1cb461330fef9644c04839355ef592
\ No newline at end of file +762c759251341f6a080246a33c75d0f0
\ No newline at end of file diff --git a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/ruby/rubyDOM-remove-text1-expected.png b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/ruby/rubyDOM-remove-text1-expected.png Binary files differindex bc07e1e..80ab419 100644 --- a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/ruby/rubyDOM-remove-text1-expected.png +++ b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/ruby/rubyDOM-remove-text1-expected.png diff --git a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/ruby/rubyDOM-remove-text1-expected.txt b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/ruby/rubyDOM-remove-text1-expected.txt deleted file mode 100644 index 928ff0a..0000000 --- a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/ruby/rubyDOM-remove-text1-expected.txt +++ /dev/null @@ -1,42 +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 - RenderBody {BODY} at (8,8) size 784x576 - RenderBlock {P} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 718x19 - text run at (0,0) width 718: "The following is a test for DOM manipulation within <ruby>: Removing a ruby base object, leaving the base non-empty." - RenderBlock {P} at (0,36) size 784x20 - RenderText {#text} at (0,0) size 409x19 - text run at (0,0) width 409: "Both lines should look identical (the first line is the one manipulated)." - RenderBlock (anonymous) at (0,72) size 784x40 - RenderBR {BR} at (0,0) size 0x19 - RenderBR {BR} at (0,20) size 0x19 - RenderBlock {P} at (0,128) size 784x32 - RenderText {#text} at (0,12) size 64x19 - text run at (0,12) width 64: "\x{6E96}\x{592A}\x{90CE}\x{306F}" - RenderRuby (inline) {RUBY} at (0,0) size 40x19 - RenderRubyRun (anonymous) at (64,0) size 40x32 - RenderRubyText {RT} at (0,0) size 40x12 - RenderText {#text} at (0,0) size 40x12 - text run at (0,0) width 40: "\x{3060}\x{3044}\x{304C}\x{304F}" - RenderRubyBase (anonymous) at (0,12) size 40x20 - RenderInline {SPAN} at (0,0) size 32x19 - RenderText {#text} at (4,0) size 32x19 - text run at (4,0) width 32: "\x{5927}\x{5B66}" - RenderText {#text} at (104,12) size 144x19 - text run at (104,12) width 144: "\x{304B}\x{3089}\x{5352}\x{696D}\x{3057}\x{307E}\x{3057}\x{305F}\x{3002}" - RenderBlock {P} at (0,176) size 784x32 - RenderText {#text} at (0,12) size 64x19 - text run at (0,12) width 64: "\x{6E96}\x{592A}\x{90CE}\x{306F}" - RenderRuby (inline) {RUBY} at (0,0) size 40x19 - RenderRubyRun (anonymous) at (64,0) size 40x32 - RenderRubyText {RT} at (0,0) size 40x12 - RenderText {#text} at (0,0) size 40x12 - text run at (0,0) width 40: "\x{3060}\x{3044}\x{304C}\x{304F}" - RenderRubyBase (anonymous) at (0,12) size 40x20 - RenderInline {SPAN} at (0,0) size 32x19 - RenderText {#text} at (4,0) size 32x19 - text run at (4,0) width 32: "\x{5927}\x{5B66}" - RenderText {#text} at (104,12) size 144x19 - text run at (104,12) width 144: "\x{304B}\x{3089}\x{5352}\x{696D}\x{3057}\x{307E}\x{3057}\x{305F}\x{3002}" diff --git a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/ruby/rubyDOM-remove-text2-expected.checksum b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/ruby/rubyDOM-remove-text2-expected.checksum index 7c193fd..652c7cd 100644 --- a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/ruby/rubyDOM-remove-text2-expected.checksum +++ b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/ruby/rubyDOM-remove-text2-expected.checksum @@ -1 +1 @@ -fb861cb99c1d8d83ec0fbafd2b2ea839
\ No newline at end of file +c1e40441f4f23243f4d7f4dc171d05c8
\ No newline at end of file diff --git a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/ruby/rubyDOM-remove-text2-expected.png b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/ruby/rubyDOM-remove-text2-expected.png Binary files differindex 7d1bec7..3147bb4 100644 --- a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/ruby/rubyDOM-remove-text2-expected.png +++ b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/ruby/rubyDOM-remove-text2-expected.png diff --git a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/ruby/rubyDOM-remove-text2-expected.txt b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/ruby/rubyDOM-remove-text2-expected.txt deleted file mode 100644 index 3c46944..0000000 --- a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/ruby/rubyDOM-remove-text2-expected.txt +++ /dev/null @@ -1,35 +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 - RenderBody {BODY} at (8,8) size 784x576 - RenderBlock {P} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 690x19 - text run at (0,0) width 690: "The following is a test for DOM manipulation within <ruby>: Removing a ruby base object, leaving the base empty." - RenderBlock {P} at (0,36) size 784x20 - RenderText {#text} at (0,0) size 409x19 - text run at (0,0) width 409: "Both lines should look identical (the first line is the one manipulated)." - RenderBlock (anonymous) at (0,72) size 784x40 - RenderBR {BR} at (0,0) size 0x19 - RenderBR {BR} at (0,20) size 0x19 - RenderBlock {P} at (0,128) size 784x20 - RenderText {#text} at (0,0) size 64x19 - text run at (0,0) width 64: "\x{6E96}\x{592A}\x{90CE}\x{306F}" - RenderRuby (inline) {RUBY} at (0,0) size 40x19 - RenderRubyRun (anonymous) at (64,5) size 40x12 - RenderRubyText {RT} at (0,0) size 40x12 - RenderText {#text} at (0,0) size 40x12 - text run at (0,0) width 40: "\x{3060}\x{3044}\x{304C}\x{304F}" - RenderRubyBase (anonymous) at (0,12) size 40x0 - RenderText {#text} at (104,0) size 144x19 - text run at (104,0) width 144: "\x{304B}\x{3089}\x{5352}\x{696D}\x{3057}\x{307E}\x{3057}\x{305F}\x{3002}" - RenderBlock {P} at (0,164) size 784x20 - RenderText {#text} at (0,0) size 64x19 - text run at (0,0) width 64: "\x{6E96}\x{592A}\x{90CE}\x{306F}" - RenderRuby (inline) {RUBY} at (0,0) size 40x19 - RenderRubyRun (anonymous) at (64,5) size 40x12 - RenderRubyText {RT} at (0,0) size 40x12 - RenderText {#text} at (0,0) size 40x12 - text run at (0,0) width 40: "\x{3060}\x{3044}\x{304C}\x{304F}" - RenderText {#text} at (104,0) size 144x19 - text run at (104,0) width 144: "\x{304B}\x{3089}\x{5352}\x{696D}\x{3057}\x{307E}\x{3057}\x{305F}\x{3002}" diff --git a/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/fast/lists/markers-in-selection-expected.checksum b/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/fast/lists/markers-in-selection-expected.checksum new file mode 100644 index 0000000..e9cd1170 --- /dev/null +++ b/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/fast/lists/markers-in-selection-expected.checksum @@ -0,0 +1 @@ +e292c3a2b835003e73417c232feb3464
\ No newline at end of file diff --git a/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/fast/lists/markers-in-selection-expected.png b/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/fast/lists/markers-in-selection-expected.png Binary files differnew file mode 100644 index 0000000..373e2fc --- /dev/null +++ b/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/fast/lists/markers-in-selection-expected.png diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/selection/extend-by-word-002-expected.checksum b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/selection/extend-by-word-002-expected.checksum index 3c5d76a..f876fe4 100644 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/selection/extend-by-word-002-expected.checksum +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/selection/extend-by-word-002-expected.checksum @@ -1 +1 @@ -8677ff7f1586d93566164a1de2190a81
\ No newline at end of file +897b39d105cb48e8fb5f149011e23437
\ No newline at end of file diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/selection/extend-by-word-002-expected.png b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/selection/extend-by-word-002-expected.png Binary files differindex be2a116..94c2625 100644 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/selection/extend-by-word-002-expected.png +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/selection/extend-by-word-002-expected.png diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/lists/markers-in-selection-expected.checksum b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/lists/markers-in-selection-expected.checksum index f61c50c..823c262 100644 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/lists/markers-in-selection-expected.checksum +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/lists/markers-in-selection-expected.checksum @@ -1 +1 @@ -2dc0c8033ba1826e83205978234fdd2d
\ No newline at end of file +05e7158b30e4bb6505e7ba077cc67cec
\ No newline at end of file diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/lists/markers-in-selection-expected.png b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/lists/markers-in-selection-expected.png Binary files differindex ecf7d2a..0630601 100644 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/lists/markers-in-selection-expected.png +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/lists/markers-in-selection-expected.png diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/ruby/ruby-empty-rt-expected.checksum b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/ruby/ruby-empty-rt-expected.checksum index 0fb27db..4c9f46e 100644 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/ruby/ruby-empty-rt-expected.checksum +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/ruby/ruby-empty-rt-expected.checksum @@ -1 +1 @@ -1b3cfe8f6db7e3eded434a43aeda68c6
\ No newline at end of file +505060f0d43ac1cbfa503ad7729f48f6
\ No newline at end of file diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/ruby/ruby-empty-rt-expected.png b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/ruby/ruby-empty-rt-expected.png Binary files differindex 240c7e1..b453ad9 100644 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/ruby/ruby-empty-rt-expected.png +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/ruby/ruby-empty-rt-expected.png diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/ruby/ruby-empty-rt-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/ruby/ruby-empty-rt-expected.txt index 8eb96a4..e790fbb 100644 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/ruby/ruby-empty-rt-expected.txt +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/ruby/ruby-empty-rt-expected.txt @@ -10,28 +10,21 @@ layer at (0,0) size 800x600 RenderBR {BR} at (0,0) size 0x19 RenderBR {BR} at (0,20) size 0x19 RenderBlock {P} at (0,92) size 784x32 - RenderText {#text} at (0,12) size 64x19 - text run at (0,12) width 64: "\x{6E96}\x{592A}\x{90CE}\x{306F}" - RenderRuby (inline) {RUBY} at (0,0) size 135x19 - RenderRubyRun (anonymous) at (64,0) size 37x32 - RenderRubyText {RT} at (0,0) size 37x12 - RenderText {#text} at (0,0) size 37x12 - text run at (0,0) width 37: "\x{3068}\x{3046}\x{304D}\x{3087}\x{3046}" - RenderRubyBase (anonymous) at (0,12) size 37x20 - RenderText {#text} at (2,0) size 32x19 - text run at (2,0) width 32: "\x{6771}\x{4EAC}" - RenderRubyRun (anonymous) at (101,0) size 64x32 - RenderRubyText {RT} at (0,0) size 64x12 - RenderText {#text} at (13,0) size 38x12 - text run at (13,0) width 38: "\x{3053}\x{3046}\x{304E}\x{3087}\x{3046}" - RenderRubyBase (anonymous) at (0,12) size 64x20 - RenderText {#text} at (0,0) size 64x19 - text run at (0,0) width 64: "\x{5DE5}\x{696D}\x{5927}\x{5B66}" - RenderRubyRun (anonymous) at (165,17) size 34x12 - RenderRubyText {RT} at (0,0) size 34x12 - RenderText {#text} at (0,0) size 34x12 - text run at (0,0) width 34: "\x{3060}\x{3044}\x{304C}\x{304F}" - RenderText {#text} at (199,12) size 130x19 - text run at (199,12) width 130: "\x{304B}\x{3089}\x{5352}\x{696D}\x{3057}\x{307E}\x{3057}\x{305F}\x{3002}" + RenderText {#text} at (0,12) size 79x19 + text run at (0,12) width 79: "<ruby> uses " + RenderRuby (inline) {RUBY} at (0,0) size 42x19 + RenderRubyRun (anonymous) at (79,0) size 27x32 + RenderRubyText {RT} at (0,0) size 27x12 + RenderText {#text} at (4,0) size 18x12 + text run at (4,0) width 18: "ruby" + RenderRubyBase (anonymous) at (0,12) size 27x20 + RenderText {#text} at (0,0) size 27x19 + text run at (0,0) width 27: "<rt>" + RenderRubyRun (anonymous) at (106,17) size 15x12 + RenderRubyText {RT} at (0,0) size 15x12 + RenderText {#text} at (0,0) size 15x12 + text run at (0,0) width 15: "text" + RenderText {#text} at (121,12) size 155x19 + text run at (121,12) width 155: " to contain the annotation." 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/fast/ruby/ruby-length-expected.checksum b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/ruby/ruby-length-expected.checksum index 71b468c..1c1feee 100644 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/ruby/ruby-length-expected.checksum +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/ruby/ruby-length-expected.checksum @@ -1 +1 @@ -10445d341d8bf992bf42216b546efe52
\ No newline at end of file +d948178cc80b5c61262f82307ecaae1f
\ No newline at end of file diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/ruby/ruby-length-expected.png b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/ruby/ruby-length-expected.png Binary files differindex 3009ef1..3234d79 100644 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/ruby/ruby-length-expected.png +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/ruby/ruby-length-expected.png diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/ruby/ruby-length-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/ruby/ruby-length-expected.txt index 1bddbab..016cb46 100644 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/ruby/ruby-length-expected.txt +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/ruby/ruby-length-expected.txt @@ -8,26 +8,26 @@ layer at (0,0) size 800x600 text run at (0,20) width 277: "and one with a ruby text longer than the base. " RenderBR {BR} at (277,35) size 0x0 RenderBR {BR} at (0,40) size 0x19 - RenderText {#text} at (0,72) size 222x19 - text run at (0,72) width 222: "\x{FF23}\x{FF33}\x{FF33}\x{FF13}\x{FF0F}\x{FF28}\x{FF34}\x{FF2D}\x{FF2C}\x{FF15}\x{306E}\x{30EB}\x{30D3}\x{306F}" - RenderRuby (inline) {RUBY} at (0,0) size 75x19 - RenderRubyRun (anonymous) at (222,60) size 75x32 - RenderRubyText {RT} at (0,0) size 75x12 - RenderText {#text} at (0,0) size 75x12 - text run at (0,0) width 75: "Japanese Langauge" - RenderRubyBase (anonymous) at (0,12) size 75x20 - RenderText {#text} at (13,0) size 48x19 - text run at (13,0) width 48: "\x{65E5}\x{672C}\x{8A9E}" - RenderText {#text} at (297,72) size 38x19 - text run at (297,72) width 38: "\x{306B}\x{3088}\x{304F}" - RenderRuby (inline) {RUBY} at (0,0) size 62x19 - RenderRubyRun (anonymous) at (335,60) size 62x32 - RenderRubyText {RT} at (0,0) size 62x12 - RenderText {#text} at (22,0) size 18x12 - text run at (22,0) width 18: "used" - RenderRubyBase (anonymous) at (0,12) size 62x20 - RenderText {#text} at (0,0) size 62x19 - text run at (0,0) width 62: "\x{4F7F}\x{308F}\x{308C}\x{3066}" - RenderText {#text} at (397,72) size 60x19 - text run at (397,72) width 60: "\x{3044}\x{307E}\x{3059}\x{3002}" + RenderText {#text} at (0,72) size 146x19 + text run at (0,72) width 146: "<ruby> is defined in the " + RenderRuby (inline) {RUBY} at (0,0) size 175x19 + RenderRubyRun (anonymous) at (146,60) size 175x32 + RenderRubyText {RT} at (0,0) size 175x12 + RenderText {#text} at (70,0) size 34x12 + text run at (70,0) width 34: "HTML5" + RenderRubyBase (anonymous) at (0,12) size 175x20 + RenderText {#text} at (0,0) size 175x19 + text run at (0,0) width 175: "Hypertext Markup Language" + RenderText {#text} at (321,72) size 30x19 + text run at (321,72) width 30: " and " + RenderRuby (inline) {RUBY} at (0,0) size 94x19 + RenderRubyRun (anonymous) at (351,60) size 94x32 + RenderRubyText {RT} at (0,0) size 94x12 + RenderText {#text} at (0,0) size 94x12 + text run at (0,0) width 94: "Cascading Style Sheets" + RenderRubyBase (anonymous) at (0,12) size 94x20 + RenderText {#text} at (28,0) size 37x19 + text run at (28,0) width 37: "CSS3" + RenderText {#text} at (445,72) size 42x19 + text run at (445,72) width 42: " specs." RenderText {#text} at (0,0) size 0x0 diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/ruby/ruby-run-break-expected.checksum b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/ruby/ruby-run-break-expected.checksum index ef1c823..08018f6 100644 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/ruby/ruby-run-break-expected.checksum +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/ruby/ruby-run-break-expected.checksum @@ -1 +1 @@ -246f8b60c0cd48816dfa86267ee6a969
\ No newline at end of file +d2d9cb041b425841f071058d53f33c57
\ No newline at end of file diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/ruby/ruby-run-break-expected.png b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/ruby/ruby-run-break-expected.png Binary files differindex 02c0528..d2e27803 100644 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/ruby/ruby-run-break-expected.png +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/ruby/ruby-run-break-expected.png diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/ruby/ruby-run-break-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/ruby/ruby-run-break-expected.txt index 79a5b8f..c6aef38 100644 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/ruby/ruby-run-break-expected.txt +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/ruby/ruby-run-break-expected.txt @@ -12,29 +12,43 @@ layer at (0,0) size 800x600 RenderBR {BR} at (28,55) size 0x0 RenderBR {BR} at (0,60) size 0x19 RenderBlock {DIV} at (0,80) size 284x88 [border: (2px solid #0000FF)] - RenderText {#text} at (12,24) size 222x19 - text run at (12,24) width 222: "\x{FF23}\x{FF33}\x{FF33}\x{FF13}\x{FF0F}\x{FF28}\x{FF34}\x{FF2D}\x{FF2C}\x{FF15}\x{306E}\x{30EB}\x{30D3}\x{306F}" + RenderText {#text} at (12,24) size 146x19 + text run at (12,24) width 146: "<ruby> is defined in the " RenderRuby (inline) {RUBY} at (0,0) size 258x51 - RenderRubyRun (anonymous) at (234,12) size 16x32 - RenderRubyText {RT} at (0,0) size 16x12 - RenderText {#text} at (3,0) size 9x12 - text run at (3,0) width 9: "\x{306B}" - RenderRubyBase (anonymous) at (0,12) size 16x20 - RenderText {#text} at (0,0) size 16x19 - text run at (0,0) width 16: "\x{65E5}" - RenderRubyRun (anonymous) at (250,12) size 20x32 - RenderRubyText {RT} at (0,0) size 20x12 - RenderText {#text} at (0,0) size 20x12 - text run at (0,0) width 20: "\x{307B}\x{3093}" - RenderRubyBase (anonymous) at (0,12) size 20x20 - RenderText {#text} at (2,0) size 16x19 - text run at (2,0) width 16: "\x{672C}" - RenderRubyRun (anonymous) at (12,44) size 16x32 - RenderRubyText {RT} at (0,0) size 16x12 - RenderText {#text} at (3,0) size 9x12 - text run at (3,0) width 9: "\x{3054}" - RenderRubyBase (anonymous) at (0,12) size 16x20 - RenderText {#text} at (0,0) size 16x19 - text run at (0,0) width 16: "\x{8A9E}" - RenderText {#text} at (28,56) size 160x19 - text run at (28,56) width 160: "\x{306B}\x{3088}\x{304F}\x{4F7F}\x{308F}\x{308C}\x{3066}\x{3044}\x{307E}\x{3059}\x{3002}" + RenderRubyRun (anonymous) at (158,12) size 24x32 + RenderRubyText {RT} at (0,0) size 24x12 + RenderText {#text} at (0,0) size 24x12 + text run at (0,0) width 24: "Hyper" + RenderRubyBase (anonymous) at (0,12) size 24x20 + RenderText {#text} at (6,0) size 11x19 + text run at (6,0) width 11: "H" + RenderRubyRun (anonymous) at (182,12) size 19x32 + RenderRubyText {RT} at (0,0) size 19x12 + RenderText {#text} at (0,0) size 19x12 + text run at (0,0) width 19: "Text" + RenderRubyBase (anonymous) at (0,12) size 19x20 + RenderText {#text} at (5,0) size 9x19 + text run at (5,0) width 9: "T" + RenderRubyRun (anonymous) at (201,12) size 31x32 + RenderRubyText {RT} at (0,0) size 31x12 + RenderText {#text} at (0,0) size 31x12 + text run at (0,0) width 31: "Markup" + RenderRubyBase (anonymous) at (0,12) size 31x20 + RenderText {#text} at (8,0) size 14x19 + text run at (8,0) width 14: "M" + RenderRubyRun (anonymous) at (232,12) size 38x32 + RenderRubyText {RT} at (0,0) size 38x12 + RenderText {#text} at (0,0) size 38x12 + text run at (0,0) width 38: "Language" + RenderRubyBase (anonymous) at (0,12) size 38x20 + RenderText {#text} at (14,0) size 9x19 + text run at (14,0) width 9: "L" + RenderRubyRun (anonymous) at (12,44) size 30x32 + RenderRubyText {RT} at (0,0) size 30x12 + RenderText {#text} at (0,0) size 30x12 + text run at (0,0) width 30: "Level 5" + RenderRubyBase (anonymous) at (0,12) size 30x20 + RenderText {#text} at (11,0) size 8x19 + text run at (11,0) width 8: "5" + RenderText {#text} at (42,56) size 42x19 + text run at (42,56) width 42: " specs." diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/ruby/ruby-runs-expected.checksum b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/ruby/ruby-runs-expected.checksum index 4454ffd..9b4090d 100644 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/ruby/ruby-runs-expected.checksum +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/ruby/ruby-runs-expected.checksum @@ -1 +1 @@ -08519778ec81ee580e03b01162d46558
\ No newline at end of file +4bb795883e44bccbd148bab8e9302617
\ No newline at end of file diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/ruby/ruby-runs-expected.png b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/ruby/ruby-runs-expected.png Binary files differindex 232d663..57907e7 100644 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/ruby/ruby-runs-expected.png +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/ruby/ruby-runs-expected.png diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/ruby/ruby-runs-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/ruby/ruby-runs-expected.txt index 0cc9b1e..9059f71 100644 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/ruby/ruby-runs-expected.txt +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/ruby/ruby-runs-expected.txt @@ -2,35 +2,50 @@ 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 213x19 - text run at (0,0) width 213: "This is a test for multiple ruby runs. " - RenderBR {BR} at (213,15) size 0x0 - RenderBR {BR} at (0,20) size 0x19 - RenderText {#text} at (0,52) size 222x19 - text run at (0,52) width 222: "\x{FF23}\x{FF33}\x{FF33}\x{FF13}\x{FF0F}\x{FF28}\x{FF34}\x{FF2D}\x{FF2C}\x{FF15}\x{306E}\x{30EB}\x{30D3}\x{306F}" - RenderRuby (inline) {RUBY} at (0,0) size 52x19 - RenderRubyRun (anonymous) at (222,40) size 16x32 - RenderRubyText {RT} at (0,0) size 16x12 - RenderText {#text} at (3,0) size 9x12 - text run at (3,0) width 9: "\x{306B}" - RenderRubyBase (anonymous) at (0,12) size 16x20 - RenderText {#text} at (0,0) size 16x19 - text run at (0,0) width 16: "\x{65E5}" - RenderRubyRun (anonymous) at (238,40) size 20x32 - RenderRubyText {RT} at (0,0) size 20x12 - RenderText {#text} at (0,0) size 20x12 - text run at (0,0) width 20: "\x{307B}\x{3093}" - RenderRubyBase (anonymous) at (0,12) size 20x20 - RenderText {#text} at (2,0) size 16x19 - text run at (2,0) width 16: "\x{672C}" - RenderRubyRun (anonymous) at (258,40) size 16x32 - RenderRubyText {RT} at (0,0) size 16x12 - RenderText {#text} at (3,0) size 9x12 - text run at (3,0) width 9: "\x{3054}" - RenderRubyBase (anonymous) at (0,12) size 16x20 - RenderText {#text} at (0,0) size 16x19 - text run at (0,0) width 16: "\x{8A9E}" - RenderText {#text} at (274,52) size 160x19 - text run at (274,52) width 160: "\x{306B}\x{3088}\x{304F}\x{4F7F}\x{308F}\x{308C}\x{3066}\x{3044}\x{307E}\x{3059}\x{3002}" - RenderText {#text} at (0,0) size 0x0 + RenderBody {BODY} at (8,8) size 784x576 + RenderBlock (anonymous) at (0,0) size 784x40 + RenderText {#text} at (0,0) size 213x19 + text run at (0,0) width 213: "This is a test for multiple ruby runs. " + RenderBR {BR} at (213,15) size 0x0 + RenderBR {BR} at (0,20) size 0x19 + RenderBlock {P} at (0,56) size 784x32 + RenderText {#text} at (0,12) size 146x19 + text run at (0,12) width 146: "<ruby> is defined in the " + RenderRuby (inline) {RUBY} at (0,0) size 142x19 + RenderRubyRun (anonymous) at (146,0) size 24x32 + RenderRubyText {RT} at (0,0) size 24x12 + RenderText {#text} at (0,0) size 24x12 + text run at (0,0) width 24: "Hyper" + RenderRubyBase (anonymous) at (0,12) size 24x20 + RenderText {#text} at (6,0) size 11x19 + text run at (6,0) width 11: "H" + RenderRubyRun (anonymous) at (170,0) size 19x32 + RenderRubyText {RT} at (0,0) size 19x12 + RenderText {#text} at (0,0) size 19x12 + text run at (0,0) width 19: "Text" + RenderRubyBase (anonymous) at (0,12) size 19x20 + RenderText {#text} at (5,0) size 9x19 + text run at (5,0) width 9: "T" + RenderRubyRun (anonymous) at (189,0) size 31x32 + RenderRubyText {RT} at (0,0) size 31x12 + RenderText {#text} at (0,0) size 31x12 + text run at (0,0) width 31: "Markup" + RenderRubyBase (anonymous) at (0,12) size 31x20 + RenderText {#text} at (8,0) size 14x19 + text run at (8,0) width 14: "M" + RenderRubyRun (anonymous) at (220,0) size 38x32 + RenderRubyText {RT} at (0,0) size 38x12 + RenderText {#text} at (0,0) size 38x12 + text run at (0,0) width 38: "Language" + RenderRubyBase (anonymous) at (0,12) size 38x20 + RenderText {#text} at (14,0) size 9x19 + text run at (14,0) width 9: "L" + RenderRubyRun (anonymous) at (258,0) size 30x32 + RenderRubyText {RT} at (0,0) size 30x12 + RenderText {#text} at (0,0) size 30x12 + text run at (0,0) width 30: "Level 5" + RenderRubyBase (anonymous) at (0,12) size 30x20 + RenderText {#text} at (11,0) size 8x19 + text run at (11,0) width 8: "5" + RenderText {#text} at (288,12) size 42x19 + text run at (288,12) width 42: " specs." diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/ruby/ruby-runs-spans-expected.checksum b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/ruby/ruby-runs-spans-expected.checksum index 1371e3b..100f2d5 100644 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/ruby/ruby-runs-spans-expected.checksum +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/ruby/ruby-runs-spans-expected.checksum @@ -1 +1 @@ -0f5e5e9de4fa183d20228326fa74acb9
\ No newline at end of file +1ed82f451c90467e1a8b0828db62e197
\ No newline at end of file diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/ruby/ruby-runs-spans-expected.png b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/ruby/ruby-runs-spans-expected.png Binary files differindex df4d654..ec3812d 100644 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/ruby/ruby-runs-spans-expected.png +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/ruby/ruby-runs-spans-expected.png diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/ruby/ruby-runs-spans-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/ruby/ruby-runs-spans-expected.txt index 015e35c..b0314e7 100644 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/ruby/ruby-runs-spans-expected.txt +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/ruby/ruby-runs-spans-expected.txt @@ -7,29 +7,30 @@ layer at (0,0) size 800x600 RenderText {#text} at (0,0) size 464x19 text run at (0,0) width 464: "The following is a test for having non-text inline elements as base in a <ruby>." RenderBlock {P} at (0,36) size 784x32 - RenderText {#text} at (0,12) size 64x19 - text run at (0,12) width 64: "\x{6E96}\x{592A}\x{90CE}\x{306F}" - RenderRuby (inline) {RUBY} at (0,0) size 109x19 - RenderRubyRun (anonymous) at (64,0) size 37x32 - RenderRubyText {RT} at (0,0) size 37x12 - RenderText {#text} at (0,0) size 37x12 - text run at (0,0) width 37: "\x{3068}\x{3046}\x{304D}\x{3087}\x{3046}" - RenderRubyBase (anonymous) at (0,12) size 37x20 - RenderInline {SPAN} at (0,0) size 32x19 - RenderText {#text} at (2,0) size 32x19 - text run at (2,0) width 32: "\x{6771}\x{4EAC}" - RenderRubyRun (anonymous) at (101,0) size 72x32 - RenderRubyText {RT} at (0,0) size 72x12 - RenderText {#text} at (0,0) size 72x12 - text run at (0,0) width 72: "\x{3053}\x{3046}\x{304E}\x{3087}\x{3046}\x{3060}\x{3044}\x{304C}\x{304F}" - RenderRubyBase (anonymous) at (0,12) size 72x20 - RenderInline {SPAN} at (0,0) size 32x19 - RenderText {#text} at (4,0) size 32x19 - text run at (4,0) width 32: "\x{5DE5}\x{696D}" - RenderInline {SPAN} at (0,0) size 32x19 - RenderText {#text} at (36,0) size 32x19 - text run at (36,0) width 32: "\x{5927}\x{5B66}" - RenderText {#text} at (173,12) size 130x19 - text run at (173,12) width 130: "\x{304B}\x{3089}\x{5352}\x{696D}\x{3057}\x{307E}\x{3057}\x{305F}\x{3002}" - RenderText {#text} at (0,0) size 0x0 - RenderText {#text} at (0,0) size 0x0 + RenderText {#text} at (0,12) size 146x19 + text run at (0,12) width 146: "<ruby> is defined in the " + RenderRuby (inline) {RUBY} at (0,0) size 142x19 + RenderRubyRun (anonymous) at (146,0) size 42x32 + RenderRubyText {RT} at (0,0) size 42x12 + RenderText {#text} at (0,0) size 42x12 + text run at (0,0) width 42: "Hyper-text" + RenderRubyBase (anonymous) at (0,12) size 42x20 + RenderInline {SPAN} at (0,0) size 20x19 + RenderText {#text} at (11,0) size 20x19 + text run at (11,0) width 20: "HT" + RenderRubyRun (anonymous) at (188,0) size 100x32 + RenderRubyText {RT} at (0,0) size 100x12 + RenderText {#text} at (0,0) size 100x12 + text run at (0,0) width 100: "Markup Language Lvl. 5" + RenderRubyBase (anonymous) at (0,12) size 100x20 + RenderInline {SPAN} at (0,0) size 14x19 + RenderText {#text} at (34,0) size 14x19 + text run at (34,0) width 14: "M" + RenderInline {SPAN} at (0,0) size 9x19 + RenderText {#text} at (48,0) size 9x19 + text run at (48,0) width 9: "L" + RenderInline {SPAN} at (0,0) size 8x19 + RenderText {#text} at (57,0) size 8x19 + text run at (57,0) width 8: "5" + RenderText {#text} at (288,12) size 36x19 + text run at (288,12) width 36: " spec." diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/ruby/ruby-simple-expected.checksum b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/ruby/ruby-simple-expected.checksum index dd3d2eb..8d382f0 100644 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/ruby/ruby-simple-expected.checksum +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/ruby/ruby-simple-expected.checksum @@ -1 +1 @@ -2362091828cdddcbb0b695a9d8cbffe8
\ No newline at end of file +49be2d9a8eaa01a87704001de49e36a4
\ No newline at end of file diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/ruby/ruby-simple-expected.png b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/ruby/ruby-simple-expected.png Binary files differindex f047305..ba85244 100644 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/ruby/ruby-simple-expected.png +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/ruby/ruby-simple-expected.png diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/ruby/ruby-simple-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/ruby/ruby-simple-expected.txt index bc41fcf..0f35d9e 100644 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/ruby/ruby-simple-expected.txt +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/ruby/ruby-simple-expected.txt @@ -2,21 +2,22 @@ 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 210x19 - text run at (0,0) width 210: "This is a initial test for simple ruby. " - RenderBR {BR} at (210,15) size 0x0 - RenderBR {BR} at (0,20) size 0x19 - RenderText {#text} at (0,52) size 222x19 - text run at (0,52) width 222: "\x{FF23}\x{FF33}\x{FF33}\x{FF13}\x{FF0F}\x{FF28}\x{FF34}\x{FF2D}\x{FF2C}\x{FF15}\x{306E}\x{30EB}\x{30D3}\x{306F}" - RenderRuby (inline) {RUBY} at (0,0) size 48x19 - RenderRubyRun (anonymous) at (222,40) size 48x32 - RenderRubyText {RT} at (0,0) size 48x12 - RenderText {#text} at (5,0) size 38x12 - text run at (5,0) width 38: "\x{306B}\x{307B}\x{3093}\x{3054}" - RenderRubyBase (anonymous) at (0,12) size 48x20 - RenderText {#text} at (0,0) size 48x19 - text run at (0,0) width 48: "\x{65E5}\x{672C}\x{8A9E}" - RenderText {#text} at (270,52) size 160x19 - text run at (270,52) width 160: "\x{306B}\x{3088}\x{304F}\x{4F7F}\x{308F}\x{308C}\x{3066}\x{3044}\x{307E}\x{3059}\x{3002}" - RenderText {#text} at (0,0) size 0x0 + RenderBody {BODY} at (8,8) size 784x576 + RenderBlock (anonymous) at (0,0) size 784x40 + RenderText {#text} at (0,0) size 210x19 + text run at (0,0) width 210: "This is a initial test for simple ruby. " + RenderBR {BR} at (210,15) size 0x0 + RenderBR {BR} at (0,20) size 0x19 + RenderBlock {P} at (0,56) size 784x32 + RenderText {#text} at (0,12) size 151x19 + text run at (0,12) width 151: "Ruby is often used in the " + RenderRuby (inline) {RUBY} at (0,0) size 111x19 + RenderRubyRun (anonymous) at (151,0) size 111x32 + RenderRubyText {RT} at (0,0) size 111x12 + RenderText {#text} at (38,0) size 35x12 + text run at (38,0) width 35: "Nihongo" + RenderRubyBase (anonymous) at (0,12) size 111x20 + RenderText {#text} at (0,0) size 111x19 + text run at (0,0) width 111: "Japanese language" + RenderText {#text} at (262,12) size 4x19 + text run at (262,12) width 4: "." diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/ruby/ruby-simple-rp-expected.checksum b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/ruby/ruby-simple-rp-expected.checksum index b44deca..19966e2 100644 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/ruby/ruby-simple-rp-expected.checksum +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/ruby/ruby-simple-rp-expected.checksum @@ -1 +1 @@ -61677fa16c34288882f436d52af02515
\ No newline at end of file +84e1b2a43e7d21d8500f27dcf1d53a0f
\ No newline at end of file diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/ruby/ruby-simple-rp-expected.png b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/ruby/ruby-simple-rp-expected.png Binary files differindex 404f96b..cad8a9f 100644 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/ruby/ruby-simple-rp-expected.png +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/ruby/ruby-simple-rp-expected.png diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/ruby/ruby-simple-rp-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/ruby/ruby-simple-rp-expected.txt index 666be0f..dc8ad39 100644 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/ruby/ruby-simple-rp-expected.txt +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/ruby/ruby-simple-rp-expected.txt @@ -2,23 +2,24 @@ 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 763x39 - text run at (0,0) width 318: "This is a test for simple ruby that contains <rp> tags. " - text run at (318,0) width 445: "Contents of the <rp> tags (opening and closing brackets) should not show" - text run at (0,20) width 157: "when ruby is suppoorted. " - RenderBR {BR} at (157,35) size 0x0 - RenderBR {BR} at (0,40) size 0x19 - RenderText {#text} at (0,72) size 222x19 - text run at (0,72) width 222: "\x{FF23}\x{FF33}\x{FF33}\x{FF13}\x{FF0F}\x{FF28}\x{FF34}\x{FF2D}\x{FF2C}\x{FF15}\x{306E}\x{30EB}\x{30D3}\x{306F}" - RenderRuby (inline) {RUBY} at (0,0) size 48x19 - RenderRubyRun (anonymous) at (222,60) size 48x32 - RenderRubyText {RT} at (0,0) size 48x12 - RenderText {#text} at (5,0) size 38x12 - text run at (5,0) width 38: "\x{306B}\x{307B}\x{3093}\x{3054}" - RenderRubyBase (anonymous) at (0,12) size 48x20 - RenderText {#text} at (0,0) size 48x19 - text run at (0,0) width 48: "\x{65E5}\x{672C}\x{8A9E}" - RenderText {#text} at (270,72) size 160x19 - text run at (270,72) width 160: "\x{306B}\x{3088}\x{304F}\x{4F7F}\x{308F}\x{308C}\x{3066}\x{3044}\x{307E}\x{3059}\x{3002}" - RenderText {#text} at (0,0) size 0x0 + RenderBody {BODY} at (8,8) size 784x576 + RenderBlock (anonymous) at (0,0) size 784x60 + RenderText {#text} at (0,0) size 763x39 + text run at (0,0) width 318: "This is a test for simple ruby that contains <rp> tags. " + text run at (318,0) width 445: "Contents of the <rp> tags (opening and closing brackets) should not show" + text run at (0,20) width 157: "when ruby is suppoorted. " + RenderBR {BR} at (157,35) size 0x0 + RenderBR {BR} at (0,40) size 0x19 + RenderBlock {P} at (0,76) size 784x32 + RenderText {#text} at (0,12) size 151x19 + text run at (0,12) width 151: "Ruby is often used in the " + RenderRuby (inline) {RUBY} at (0,0) size 111x19 + RenderRubyRun (anonymous) at (151,0) size 111x32 + RenderRubyText {RT} at (0,0) size 111x12 + RenderText {#text} at (38,0) size 35x12 + text run at (38,0) width 35: "Nihongo" + RenderRubyBase (anonymous) at (0,12) size 111x20 + RenderText {#text} at (0,0) size 111x19 + text run at (0,0) width 111: "Japanese language" + RenderText {#text} at (262,12) size 4x19 + text run at (262,12) width 4: "." diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/ruby/ruby-trailing-expected.checksum b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/ruby/ruby-trailing-expected.checksum index 3ec0631..07d4859 100644 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/ruby/ruby-trailing-expected.checksum +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/ruby/ruby-trailing-expected.checksum @@ -1 +1 @@ -fe3573f0baa48b11820f7f2ad0a50f17
\ No newline at end of file +7be5d7bea7677212c0f85db47ebda167
\ No newline at end of file diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/ruby/ruby-trailing-expected.png b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/ruby/ruby-trailing-expected.png Binary files differindex 6ff7376..5e9767a 100644 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/ruby/ruby-trailing-expected.png +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/ruby/ruby-trailing-expected.png diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/ruby/ruby-trailing-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/ruby/ruby-trailing-expected.txt index 06ac17e..ec4638b 100644 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/ruby/ruby-trailing-expected.txt +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/ruby/ruby-trailing-expected.txt @@ -10,28 +10,19 @@ layer at (0,0) size 800x600 RenderBR {BR} at (0,0) size 0x19 RenderBR {BR} at (0,20) size 0x19 RenderBlock {P} at (0,92) size 784x32 - RenderText {#text} at (0,12) size 64x19 - text run at (0,12) width 64: "\x{6E96}\x{592A}\x{90CE}\x{306F}" - RenderRuby (inline) {RUBY} at (0,0) size 107x19 - RenderRubyRun (anonymous) at (64,0) size 37x32 - RenderRubyText {RT} at (0,0) size 37x12 - RenderText {#text} at (0,0) size 37x12 - text run at (0,0) width 37: "\x{3068}\x{3046}\x{304D}\x{3087}\x{3046}" - RenderRubyBase (anonymous) at (0,12) size 37x20 - RenderText {#text} at (2,0) size 32x19 - text run at (2,0) width 32: "\x{6771}\x{4EAC}" - RenderRubyRun (anonymous) at (101,0) size 38x32 - RenderRubyText {RT} at (0,0) size 38x12 - RenderText {#text} at (0,0) size 38x12 - text run at (0,0) width 38: "\x{3053}\x{3046}\x{304E}\x{3087}\x{3046}" - RenderRubyBase (anonymous) at (0,12) size 38x20 - RenderText {#text} at (3,0) size 32x19 - text run at (3,0) width 32: "\x{5DE5}\x{696D}" - RenderRubyRun (anonymous) at (139,12) size 32x20 - RenderRubyBase (anonymous) at (0,0) size 32x20 - RenderText {#text} at (0,0) size 32x19 - text run at (0,0) width 32: "\x{5927}\x{5B66}" - RenderText {#text} at (171,12) size 130x19 - text run at (171,12) width 130: "\x{304B}\x{3089}\x{5352}\x{696D}\x{3057}\x{307E}\x{3057}\x{305F}\x{3002}" - RenderText {#text} at (0,0) size 0x0 - RenderText {#text} at (0,0) size 0x0 + RenderText {#text} at (0,12) size 146x19 + text run at (0,12) width 146: "<ruby> is defined in the " + RenderRuby (inline) {RUBY} at (0,0) size 125x19 + RenderRubyRun (anonymous) at (146,0) size 117x32 + RenderRubyText {RT} at (0,0) size 117x12 + RenderText {#text} at (0,0) size 117x12 + text run at (0,0) width 117: "Hyper-text Markup Language" + RenderRubyBase (anonymous) at (0,12) size 117x20 + RenderText {#text} at (37,0) size 43x19 + text run at (37,0) width 43: "HTML" + RenderRubyRun (anonymous) at (263,12) size 8x20 + RenderRubyBase (anonymous) at (0,0) size 8x20 + RenderText {#text} at (0,0) size 8x19 + text run at (0,0) width 8: "5" + RenderText {#text} at (271,12) size 4x19 + text run at (271,12) width 4: "." diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/ruby/rubyDOM-insert-rt-expected.checksum b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/ruby/rubyDOM-insert-rt-expected.checksum index ed18090..66b6680 100644 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/ruby/rubyDOM-insert-rt-expected.checksum +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/ruby/rubyDOM-insert-rt-expected.checksum @@ -1 +1 @@ -1708c3d02ae5e81fe4b5a0d7ff4e1e6c
\ No newline at end of file +2a8f056364b4e7a336e53eb7addac319
\ No newline at end of file diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/ruby/rubyDOM-insert-rt-expected.png b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/ruby/rubyDOM-insert-rt-expected.png Binary files differindex 38c236f..3852ad7 100644 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/ruby/rubyDOM-insert-rt-expected.png +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/ruby/rubyDOM-insert-rt-expected.png diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/ruby/rubyDOM-insert-rt-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/ruby/rubyDOM-insert-rt-expected.txt index d41c451..159c7e8 100644 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/ruby/rubyDOM-insert-rt-expected.txt +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/ruby/rubyDOM-insert-rt-expected.txt @@ -13,62 +13,54 @@ layer at (0,0) size 800x600 RenderBR {BR} at (0,0) size 0x19 RenderBR {BR} at (0,20) size 0x19 RenderBlock {P} at (0,128) size 784x32 - RenderText {#text} at (0,12) size 64x19 - text run at (0,12) width 64: "\x{6E96}\x{592A}\x{90CE}\x{306F}" - RenderRuby (inline) {RUBY} at (0,0) size 109x19 - RenderRubyRun (anonymous) at (64,0) size 37x32 - RenderRubyText {RT} at (0,0) size 37x12 - RenderText {#text} at (0,0) size 37x12 - text run at (0,0) width 37: "\x{3068}\x{3046}\x{304D}\x{3087}\x{3046}" - RenderRubyBase (anonymous) at (0,12) size 37x20 - RenderInline {SPAN} at (0,0) size 32x19 - RenderText {#text} at (2,0) size 32x19 - text run at (2,0) width 32: "\x{6771}\x{4EAC}" - RenderRubyRun (anonymous) at (101,0) size 38x32 - RenderRubyText {RT} at (0,0) size 38x12 - RenderText {#text} at (0,0) size 38x12 - text run at (0,0) width 38: "\x{3053}\x{3046}\x{304E}\x{3087}\x{3046}" - RenderRubyBase (anonymous) at (0,12) size 38x20 - RenderInline {SPAN} at (0,0) size 32x19 - RenderText {#text} at (3,0) size 32x19 - text run at (3,0) width 32: "\x{5DE5}\x{696D}" - RenderRubyRun (anonymous) at (139,0) size 34x32 - RenderRubyText {RT} at (0,0) size 34x12 - RenderText {#text} at (0,0) size 34x12 - text run at (0,0) width 34: "\x{3060}\x{3044}\x{304C}\x{304F}" - RenderRubyBase (anonymous) at (0,12) size 34x20 - RenderInline {SPAN} at (0,0) size 32x19 - RenderText {#text} at (1,0) size 32x19 - text run at (1,0) width 32: "\x{5927}\x{5B66}" - RenderText {#text} at (173,12) size 130x19 - text run at (173,12) width 130: "\x{304B}\x{3089}\x{5352}\x{696D}\x{3057}\x{307E}\x{3057}\x{305F}\x{3002}" + RenderText {#text} at (0,12) size 146x19 + text run at (0,12) width 146: "<ruby> is defined in the " + RenderRuby (inline) {RUBY} at (0,0) size 122x19 + RenderRubyRun (anonymous) at (146,0) size 42x32 + RenderRubyText {RT} at (0,0) size 42x12 + RenderText {#text} at (0,0) size 42x12 + text run at (0,0) width 42: "Hyper-text" + RenderRubyBase (anonymous) at (0,12) size 42x20 + RenderInline {SPAN} at (0,0) size 20x19 + RenderText {#text} at (11,0) size 20x19 + text run at (11,0) width 20: "HT" + RenderRubyRun (anonymous) at (188,0) size 72x32 + RenderRubyText {RT} at (0,0) size 72x12 + RenderText {#text} at (0,0) size 72x12 + text run at (0,0) width 72: "Markup Language" + RenderRubyBase (anonymous) at (0,12) size 72x20 + RenderInline {SPAN} at (0,0) size 23x19 + RenderText {#text} at (24,0) size 23x19 + text run at (24,0) width 23: "ML" + RenderRubyRun (anonymous) at (260,12) size 8x20 + RenderRubyBase (anonymous) at (0,0) size 8x20 + RenderText {#text} at (0,0) size 8x19 + text run at (0,0) width 8: "5" + RenderText {#text} at (268,12) size 36x19 + text run at (268,12) width 36: " spec." RenderBlock {P} at (0,176) size 784x32 - RenderText {#text} at (0,12) size 64x19 - text run at (0,12) width 64: "\x{6E96}\x{592A}\x{90CE}\x{306F}" - RenderRuby (inline) {RUBY} at (0,0) size 109x19 - RenderRubyRun (anonymous) at (64,0) size 37x32 - RenderRubyText {RT} at (0,0) size 37x12 - RenderText {#text} at (0,0) size 37x12 - text run at (0,0) width 37: "\x{3068}\x{3046}\x{304D}\x{3087}\x{3046}" - RenderRubyBase (anonymous) at (0,12) size 37x20 - RenderInline {SPAN} at (0,0) size 32x19 - RenderText {#text} at (2,0) size 32x19 - text run at (2,0) width 32: "\x{6771}\x{4EAC}" - RenderRubyRun (anonymous) at (101,0) size 38x32 - RenderRubyText {RT} at (0,0) size 38x12 - RenderText {#text} at (0,0) size 38x12 - text run at (0,0) width 38: "\x{3053}\x{3046}\x{304E}\x{3087}\x{3046}" - RenderRubyBase (anonymous) at (0,12) size 38x20 - RenderInline {SPAN} at (0,0) size 32x19 - RenderText {#text} at (3,0) size 32x19 - text run at (3,0) width 32: "\x{5DE5}\x{696D}" - RenderRubyRun (anonymous) at (139,0) size 34x32 - RenderRubyText {RT} at (0,0) size 34x12 - RenderText {#text} at (0,0) size 34x12 - text run at (0,0) width 34: "\x{3060}\x{3044}\x{304C}\x{304F}" - RenderRubyBase (anonymous) at (0,12) size 34x20 - RenderInline {SPAN} at (0,0) size 32x19 - RenderText {#text} at (1,0) size 32x19 - text run at (1,0) width 32: "\x{5927}\x{5B66}" - RenderText {#text} at (173,12) size 130x19 - text run at (173,12) width 130: "\x{304B}\x{3089}\x{5352}\x{696D}\x{3057}\x{307E}\x{3057}\x{305F}\x{3002}" + RenderText {#text} at (0,12) size 146x19 + text run at (0,12) width 146: "<ruby> is defined in the " + RenderRuby (inline) {RUBY} at (0,0) size 122x19 + RenderRubyRun (anonymous) at (146,0) size 42x32 + RenderRubyText {RT} at (0,0) size 42x12 + RenderText {#text} at (0,0) size 42x12 + text run at (0,0) width 42: "Hyper-text" + RenderRubyBase (anonymous) at (0,12) size 42x20 + RenderInline {SPAN} at (0,0) size 20x19 + RenderText {#text} at (11,0) size 20x19 + text run at (11,0) width 20: "HT" + RenderRubyRun (anonymous) at (188,0) size 72x32 + RenderRubyText {RT} at (0,0) size 72x12 + RenderText {#text} at (0,0) size 72x12 + text run at (0,0) width 72: "Markup Language" + RenderRubyBase (anonymous) at (0,12) size 72x20 + RenderInline {SPAN} at (0,0) size 23x19 + RenderText {#text} at (24,0) size 23x19 + text run at (24,0) width 23: "ML" + RenderRubyRun (anonymous) at (260,12) size 8x20 + RenderRubyBase (anonymous) at (0,0) size 8x20 + RenderText {#text} at (0,0) size 8x19 + text run at (0,0) width 8: "5" + RenderText {#text} at (268,12) size 36x19 + text run at (268,12) width 36: " spec." diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/ruby/rubyDOM-insert-text1-expected.checksum b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/ruby/rubyDOM-insert-text1-expected.checksum index 0619473..860afff 100644 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/ruby/rubyDOM-insert-text1-expected.checksum +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/ruby/rubyDOM-insert-text1-expected.checksum @@ -1 +1 @@ -4184910a2b2863e4675e33538655ddf8
\ No newline at end of file +98db2a3da4dbfa2494260dd8aba6a1c4
\ No newline at end of file diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/ruby/rubyDOM-insert-text1-expected.png b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/ruby/rubyDOM-insert-text1-expected.png Binary files differindex 2fc6f5e..cfc9896 100644 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/ruby/rubyDOM-insert-text1-expected.png +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/ruby/rubyDOM-insert-text1-expected.png diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/ruby/rubyDOM-insert-text1-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/ruby/rubyDOM-insert-text1-expected.txt index afa6f0d..56d7985 100644 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/ruby/rubyDOM-insert-text1-expected.txt +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/ruby/rubyDOM-insert-text1-expected.txt @@ -13,60 +13,50 @@ layer at (0,0) size 800x600 RenderBR {BR} at (0,0) size 0x19 RenderBR {BR} at (0,20) size 0x19 RenderBlock {P} at (0,128) size 784x32 - RenderText {#text} at (0,12) size 64x19 - text run at (0,12) width 64: "\x{6E96}\x{592A}\x{90CE}\x{306F}" - RenderRuby (inline) {RUBY} at (0,0) size 109x19 - RenderRubyRun (anonymous) at (64,0) size 37x32 - RenderRubyText {RT} at (0,0) size 37x12 - RenderText {#text} at (0,0) size 37x12 - text run at (0,0) width 37: "\x{3068}\x{3046}\x{304D}\x{3087}\x{3046}" - RenderRubyBase (anonymous) at (0,12) size 37x20 - RenderInline {SPAN} at (0,0) size 32x19 - RenderText {#text} at (2,0) size 32x19 - text run at (2,0) width 32: "\x{6771}\x{4EAC}" - RenderRubyRun (anonymous) at (101,0) size 38x32 - RenderRubyText {RT} at (0,0) size 38x12 - RenderText {#text} at (0,0) size 38x12 - text run at (0,0) width 38: "\x{3053}\x{3046}\x{304E}\x{3087}\x{3046}" - RenderRubyBase (anonymous) at (0,12) size 38x20 - RenderText {#text} at (3,0) size 32x19 - text run at (3,0) width 32: "\x{5DE5}\x{696D}" - RenderRubyRun (anonymous) at (139,0) size 34x32 - RenderRubyText {RT} at (0,0) size 34x12 - RenderText {#text} at (0,0) size 34x12 - text run at (0,0) width 34: "\x{3060}\x{3044}\x{304C}\x{304F}" - RenderRubyBase (anonymous) at (0,12) size 34x20 - RenderInline {SPAN} at (0,0) size 32x19 - RenderText {#text} at (1,0) size 32x19 - text run at (1,0) width 32: "\x{5927}\x{5B66}" - RenderText {#text} at (173,12) size 130x19 - text run at (173,12) width 130: "\x{304B}\x{3089}\x{5352}\x{696D}\x{3057}\x{307E}\x{3057}\x{305F}\x{3002}" + RenderText {#text} at (0,12) size 146x19 + text run at (0,12) width 146: "<ruby> is defined in the " + RenderRuby (inline) {RUBY} at (0,0) size 122x19 + RenderRubyRun (anonymous) at (146,0) size 42x32 + RenderRubyText {RT} at (0,0) size 42x12 + RenderText {#text} at (0,0) size 42x12 + text run at (0,0) width 42: "Hyper-text" + RenderRubyBase (anonymous) at (0,12) size 42x20 + RenderText {#text} at (11,0) size 20x19 + text run at (11,0) width 20: "HT" + RenderRubyRun (anonymous) at (188,0) size 72x32 + RenderRubyText {RT} at (0,0) size 72x12 + RenderText {#text} at (0,0) size 72x12 + text run at (0,0) width 72: "Markup Language" + RenderRubyBase (anonymous) at (0,12) size 72x20 + RenderText {#text} at (24,0) size 23x19 + text run at (24,0) width 23: "ML" + RenderRubyRun (anonymous) at (260,12) size 8x20 + RenderRubyBase (anonymous) at (0,0) size 8x20 + RenderText {#text} at (0,0) size 8x19 + text run at (0,0) width 8: "5" + RenderText {#text} at (268,12) size 36x19 + text run at (268,12) width 36: " spec." RenderBlock {P} at (0,176) size 784x32 - RenderText {#text} at (0,12) size 64x19 - text run at (0,12) width 64: "\x{6E96}\x{592A}\x{90CE}\x{306F}" - RenderRuby (inline) {RUBY} at (0,0) size 109x19 - RenderRubyRun (anonymous) at (64,0) size 37x32 - RenderRubyText {RT} at (0,0) size 37x12 - RenderText {#text} at (0,0) size 37x12 - text run at (0,0) width 37: "\x{3068}\x{3046}\x{304D}\x{3087}\x{3046}" - RenderRubyBase (anonymous) at (0,12) size 37x20 - RenderInline {SPAN} at (0,0) size 32x19 - RenderText {#text} at (2,0) size 32x19 - text run at (2,0) width 32: "\x{6771}\x{4EAC}" - RenderRubyRun (anonymous) at (101,0) size 38x32 - RenderRubyText {RT} at (0,0) size 38x12 - RenderText {#text} at (0,0) size 38x12 - text run at (0,0) width 38: "\x{3053}\x{3046}\x{304E}\x{3087}\x{3046}" - RenderRubyBase (anonymous) at (0,12) size 38x20 - RenderText {#text} at (3,0) size 32x19 - text run at (3,0) width 32: "\x{5DE5}\x{696D}" - RenderRubyRun (anonymous) at (139,0) size 34x32 - RenderRubyText {RT} at (0,0) size 34x12 - RenderText {#text} at (0,0) size 34x12 - text run at (0,0) width 34: "\x{3060}\x{3044}\x{304C}\x{304F}" - RenderRubyBase (anonymous) at (0,12) size 34x20 - RenderInline {SPAN} at (0,0) size 32x19 - RenderText {#text} at (1,0) size 32x19 - text run at (1,0) width 32: "\x{5927}\x{5B66}" - RenderText {#text} at (173,12) size 130x19 - text run at (173,12) width 130: "\x{304B}\x{3089}\x{5352}\x{696D}\x{3057}\x{307E}\x{3057}\x{305F}\x{3002}" + RenderText {#text} at (0,12) size 146x19 + text run at (0,12) width 146: "<ruby> is defined in the " + RenderRuby (inline) {RUBY} at (0,0) size 122x19 + RenderRubyRun (anonymous) at (146,0) size 42x32 + RenderRubyText {RT} at (0,0) size 42x12 + RenderText {#text} at (0,0) size 42x12 + text run at (0,0) width 42: "Hyper-text" + RenderRubyBase (anonymous) at (0,12) size 42x20 + RenderText {#text} at (11,0) size 20x19 + text run at (11,0) width 20: "HT" + RenderRubyRun (anonymous) at (188,0) size 72x32 + RenderRubyText {RT} at (0,0) size 72x12 + RenderText {#text} at (0,0) size 72x12 + text run at (0,0) width 72: "Markup Language" + RenderRubyBase (anonymous) at (0,12) size 72x20 + RenderText {#text} at (24,0) size 23x19 + text run at (24,0) width 23: "ML" + RenderRubyRun (anonymous) at (260,12) size 8x20 + RenderRubyBase (anonymous) at (0,0) size 8x20 + RenderText {#text} at (0,0) size 8x19 + text run at (0,0) width 8: "5" + RenderText {#text} at (268,12) size 36x19 + text run at (268,12) width 36: " spec." diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/ruby/rubyDOM-insert-text2-expected.checksum b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/ruby/rubyDOM-insert-text2-expected.checksum index 5973f28..d41d8f5 100644 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/ruby/rubyDOM-insert-text2-expected.checksum +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/ruby/rubyDOM-insert-text2-expected.checksum @@ -1 +1 @@ -7fb90214fdde2967e7b2622b9490f57f
\ No newline at end of file +f80d3ed6502716ee5bb647011e90f8a4
\ No newline at end of file diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/ruby/rubyDOM-insert-text2-expected.png b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/ruby/rubyDOM-insert-text2-expected.png Binary files differindex 9bfd62da..589f53d 100644 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/ruby/rubyDOM-insert-text2-expected.png +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/ruby/rubyDOM-insert-text2-expected.png diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/ruby/rubyDOM-insert-text2-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/ruby/rubyDOM-insert-text2-expected.txt index 2c066ba..e92a09b 100644 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/ruby/rubyDOM-insert-text2-expected.txt +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/ruby/rubyDOM-insert-text2-expected.txt @@ -13,34 +13,40 @@ layer at (0,0) size 800x600 RenderBR {BR} at (0,0) size 0x19 RenderBR {BR} at (0,20) size 0x19 RenderBlock {P} at (0,128) size 784x32 - RenderText {#text} at (0,12) size 64x19 - text run at (0,12) width 64: "\x{6E96}\x{592A}\x{90CE}\x{306F}" - RenderRuby (inline) {RUBY} at (0,0) size 72x19 - RenderRubyRun (anonymous) at (64,0) size 72x32 - RenderRubyText {RT} at (0,0) size 72x12 - RenderText {#text} at (0,0) size 72x12 - text run at (0,0) width 72: "\x{3053}\x{3046}\x{304E}\x{3087}\x{3046}\x{3060}\x{3044}\x{304C}\x{304F}" - RenderRubyBase (anonymous) at (0,12) size 72x20 - RenderInline {SPAN} at (0,0) size 32x19 - RenderText {#text} at (4,0) size 32x19 - text run at (4,0) width 32: "\x{5DE5}\x{696D}" - RenderText {#text} at (36,0) size 32x19 - text run at (36,0) width 32: "\x{5927}\x{5B66}" - RenderText {#text} at (136,12) size 130x19 - text run at (136,12) width 130: "\x{304B}\x{3089}\x{5352}\x{696D}\x{3057}\x{307E}\x{3057}\x{305F}\x{3002}" + RenderText {#text} at (0,12) size 146x19 + text run at (0,12) width 146: "<ruby> is defined in the " + RenderRuby (inline) {RUBY} at (0,0) size 125x19 + RenderRubyRun (anonymous) at (146,0) size 117x32 + RenderRubyText {RT} at (0,0) size 117x12 + RenderText {#text} at (0,0) size 117x12 + text run at (0,0) width 117: "Hyper-text Markup Language" + RenderRubyBase (anonymous) at (0,12) size 117x20 + RenderInline {SPAN} at (0,0) size 20x19 + RenderText {#text} at (37,0) size 20x19 + text run at (37,0) width 20: "HT" + RenderText {#text} at (57,0) size 23x19 + text run at (57,0) width 23: "ML" + RenderRubyRun (anonymous) at (263,12) size 8x20 + RenderRubyBase (anonymous) at (0,0) size 8x20 + RenderText {#text} at (0,0) size 8x19 + text run at (0,0) width 8: "5" + RenderText {#text} at (271,12) size 36x19 + text run at (271,12) width 36: " spec." RenderBlock {P} at (0,176) size 784x32 - RenderText {#text} at (0,12) size 64x19 - text run at (0,12) width 64: "\x{6E96}\x{592A}\x{90CE}\x{306F}" - RenderRuby (inline) {RUBY} at (0,0) size 72x19 - RenderRubyRun (anonymous) at (64,0) size 72x32 - RenderRubyText {RT} at (0,0) size 72x12 - RenderText {#text} at (0,0) size 72x12 - text run at (0,0) width 72: "\x{3053}\x{3046}\x{304E}\x{3087}\x{3046}\x{3060}\x{3044}\x{304C}\x{304F}" - RenderRubyBase (anonymous) at (0,12) size 72x20 - RenderInline {SPAN} at (0,0) size 32x19 - RenderText {#text} at (4,0) size 32x19 - text run at (4,0) width 32: "\x{5DE5}\x{696D}" - RenderText {#text} at (36,0) size 32x19 - text run at (36,0) width 32: "\x{5927}\x{5B66}" - RenderText {#text} at (136,12) size 130x19 - text run at (136,12) width 130: "\x{304B}\x{3089}\x{5352}\x{696D}\x{3057}\x{307E}\x{3057}\x{305F}\x{3002}" + RenderText {#text} at (0,12) size 146x19 + text run at (0,12) width 146: "<ruby> is defined in the " + RenderRuby (inline) {RUBY} at (0,0) size 125x19 + RenderRubyRun (anonymous) at (146,0) size 117x32 + RenderRubyText {RT} at (0,0) size 117x12 + RenderText {#text} at (0,0) size 117x12 + text run at (0,0) width 117: "Hyper-text Markup Language" + RenderRubyBase (anonymous) at (0,12) size 117x20 + RenderText {#text} at (37,0) size 43x19 + text run at (37,0) width 43: "HTML" + RenderInline {SPAN} at (0,0) size 0x19 + RenderRubyRun (anonymous) at (263,12) size 8x20 + RenderRubyBase (anonymous) at (0,0) size 8x20 + RenderText {#text} at (0,0) size 8x19 + text run at (0,0) width 8: "5" + RenderText {#text} at (271,12) size 36x19 + text run at (271,12) width 36: " spec." diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/ruby/rubyDOM-insert-text3-expected.checksum b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/ruby/rubyDOM-insert-text3-expected.checksum index a53a6ad..27e1608 100644 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/ruby/rubyDOM-insert-text3-expected.checksum +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/ruby/rubyDOM-insert-text3-expected.checksum @@ -1 +1 @@ -fdb535a422f8b0effcc4bed1283c9564
\ No newline at end of file +f007f89d03da1d72cad28dc5de7aa04e
\ No newline at end of file diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/ruby/rubyDOM-insert-text3-expected.png b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/ruby/rubyDOM-insert-text3-expected.png Binary files differindex 695b287..1673e5f 100644 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/ruby/rubyDOM-insert-text3-expected.png +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/ruby/rubyDOM-insert-text3-expected.png diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/ruby/rubyDOM-insert-text3-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/ruby/rubyDOM-insert-text3-expected.txt index 203dc2d..d5247bb 100644 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/ruby/rubyDOM-insert-text3-expected.txt +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/ruby/rubyDOM-insert-text3-expected.txt @@ -13,34 +13,42 @@ layer at (0,0) size 800x600 RenderBR {BR} at (0,0) size 0x19 RenderBR {BR} at (0,20) size 0x19 RenderBlock {P} at (0,128) size 784x32 - RenderText {#text} at (0,12) size 64x19 - text run at (0,12) width 64: "\x{6E96}\x{592A}\x{90CE}\x{306F}" - RenderRuby (inline) {RUBY} at (0,0) size 72x19 - RenderRubyRun (anonymous) at (64,0) size 72x32 - RenderRubyText {RT} at (0,0) size 72x12 - RenderText {#text} at (0,0) size 72x12 - text run at (0,0) width 72: "\x{3053}\x{3046}\x{304E}\x{3087}\x{3046}\x{3060}\x{3044}\x{304C}\x{304F}" - RenderRubyBase (anonymous) at (0,12) size 72x20 - RenderText {#text} at (4,0) size 32x19 - text run at (4,0) width 32: "\x{5DE5}\x{696D}" - RenderInline {SPAN} at (0,0) size 32x19 - RenderText {#text} at (36,0) size 32x19 - text run at (36,0) width 32: "\x{5927}\x{5B66}" - RenderText {#text} at (136,12) size 130x19 - text run at (136,12) width 130: "\x{304B}\x{3089}\x{5352}\x{696D}\x{3057}\x{307E}\x{3057}\x{305F}\x{3002}" + RenderText {#text} at (0,12) size 146x19 + text run at (0,12) width 146: "<ruby> is defined in the " + RenderRuby (inline) {RUBY} at (0,0) size 125x19 + RenderRubyRun (anonymous) at (146,0) size 117x32 + RenderRubyText {RT} at (0,0) size 117x12 + RenderText {#text} at (0,0) size 117x12 + text run at (0,0) width 117: "Hyper-text Markup Language" + RenderRubyBase (anonymous) at (0,12) size 117x20 + RenderText {#text} at (37,0) size 20x19 + text run at (37,0) width 20: "HT" + RenderInline {SPAN} at (0,0) size 23x19 + RenderText {#text} at (57,0) size 23x19 + text run at (57,0) width 23: "ML" + RenderRubyRun (anonymous) at (263,12) size 8x20 + RenderRubyBase (anonymous) at (0,0) size 8x20 + RenderText {#text} at (0,0) size 8x19 + text run at (0,0) width 8: "5" + RenderText {#text} at (271,12) size 36x19 + text run at (271,12) width 36: " spec." RenderBlock {P} at (0,176) size 784x32 - RenderText {#text} at (0,12) size 64x19 - text run at (0,12) width 64: "\x{6E96}\x{592A}\x{90CE}\x{306F}" - RenderRuby (inline) {RUBY} at (0,0) size 72x19 - RenderRubyRun (anonymous) at (64,0) size 72x32 - RenderRubyText {RT} at (0,0) size 72x12 - RenderText {#text} at (0,0) size 72x12 - text run at (0,0) width 72: "\x{3053}\x{3046}\x{304E}\x{3087}\x{3046}\x{3060}\x{3044}\x{304C}\x{304F}" - RenderRubyBase (anonymous) at (0,12) size 72x20 - RenderText {#text} at (4,0) size 32x19 - text run at (4,0) width 32: "\x{5DE5}\x{696D}" - RenderInline {SPAN} at (0,0) size 32x19 - RenderText {#text} at (36,0) size 32x19 - text run at (36,0) width 32: "\x{5927}\x{5B66}" - RenderText {#text} at (136,12) size 130x19 - text run at (136,12) width 130: "\x{304B}\x{3089}\x{5352}\x{696D}\x{3057}\x{307E}\x{3057}\x{305F}\x{3002}" + RenderText {#text} at (0,12) size 146x19 + text run at (0,12) width 146: "<ruby> is defined in the " + RenderRuby (inline) {RUBY} at (0,0) size 125x19 + RenderRubyRun (anonymous) at (146,0) size 117x32 + RenderRubyText {RT} at (0,0) size 117x12 + RenderText {#text} at (0,0) size 117x12 + text run at (0,0) width 117: "Hyper-text Markup Language" + RenderRubyBase (anonymous) at (0,12) size 117x20 + RenderText {#text} at (37,0) size 20x19 + text run at (37,0) width 20: "HT" + RenderInline {SPAN} at (0,0) size 23x19 + RenderText {#text} at (57,0) size 23x19 + text run at (57,0) width 23: "ML" + RenderRubyRun (anonymous) at (263,12) size 8x20 + RenderRubyBase (anonymous) at (0,0) size 8x20 + RenderText {#text} at (0,0) size 8x19 + text run at (0,0) width 8: "5" + RenderText {#text} at (271,12) size 36x19 + text run at (271,12) width 36: " spec." diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/ruby/rubyDOM-remove-rt1-expected.checksum b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/ruby/rubyDOM-remove-rt1-expected.checksum index c50081d..95c68b7 100644 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/ruby/rubyDOM-remove-rt1-expected.checksum +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/ruby/rubyDOM-remove-rt1-expected.checksum @@ -1 +1 @@ -c74a3a398e82faa0557b38793b74f192
\ No newline at end of file +25392ca820330f92f729063002dc2fe9
\ No newline at end of file diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/ruby/rubyDOM-remove-rt1-expected.png b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/ruby/rubyDOM-remove-rt1-expected.png Binary files differindex 0034187..aded3a7 100644 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/ruby/rubyDOM-remove-rt1-expected.png +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/ruby/rubyDOM-remove-rt1-expected.png diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/ruby/rubyDOM-remove-rt1-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/ruby/rubyDOM-remove-rt1-expected.txt index 79ae198..f3820a5 100644 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/ruby/rubyDOM-remove-rt1-expected.txt +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/ruby/rubyDOM-remove-rt1-expected.txt @@ -13,36 +13,36 @@ layer at (0,0) size 800x600 RenderBR {BR} at (0,0) size 0x19 RenderBR {BR} at (0,20) size 0x19 RenderBlock {P} at (0,128) size 784x32 - RenderText {#text} at (0,12) size 64x19 - text run at (0,12) width 64: "\x{6E96}\x{592A}\x{90CE}\x{306F}" - RenderRuby (inline) {RUBY} at (0,0) size 70x19 - RenderRubyRun (anonymous) at (64,0) size 38x32 - RenderRubyText {RT} at (0,0) size 38x12 - RenderText {#text} at (0,0) size 38x12 - text run at (0,0) width 38: "\x{3053}\x{3046}\x{304E}\x{3087}\x{3046}" - RenderRubyBase (anonymous) at (0,12) size 38x20 - RenderText {#text} at (3,0) size 32x19 - text run at (3,0) width 32: "\x{5DE5}\x{696D}" - RenderRubyRun (anonymous) at (102,12) size 32x20 - RenderRubyBase (anonymous) at (0,0) size 32x20 - RenderText {#text} at (0,0) size 32x19 - text run at (0,0) width 32: "\x{5927}\x{5B66}" - RenderText {#text} at (134,12) size 130x19 - text run at (134,12) width 130: "\x{304B}\x{3089}\x{5352}\x{696D}\x{3057}\x{307E}\x{3057}\x{305F}\x{3002}" + RenderText {#text} at (0,12) size 146x19 + text run at (0,12) width 146: "<ruby> is defined in the " + RenderRuby (inline) {RUBY} at (0,0) size 125x19 + RenderRubyRun (anonymous) at (146,0) size 117x32 + RenderRubyText {RT} at (0,0) size 117x12 + RenderText {#text} at (0,0) size 117x12 + text run at (0,0) width 117: "Hyper-text Markup Language" + RenderRubyBase (anonymous) at (0,12) size 117x20 + RenderText {#text} at (37,0) size 43x19 + text run at (37,0) width 43: "HTML" + RenderRubyRun (anonymous) at (263,12) size 8x20 + RenderRubyBase (anonymous) at (0,0) size 8x20 + RenderText {#text} at (0,0) size 8x19 + text run at (0,0) width 8: "5" + RenderText {#text} at (271,12) size 36x19 + text run at (271,12) width 36: " spec." RenderBlock {P} at (0,176) size 784x32 - RenderText {#text} at (0,12) size 64x19 - text run at (0,12) width 64: "\x{6E96}\x{592A}\x{90CE}\x{306F}" - RenderRuby (inline) {RUBY} at (0,0) size 70x19 - RenderRubyRun (anonymous) at (64,0) size 38x32 - RenderRubyText {RT} at (0,0) size 38x12 - RenderText {#text} at (0,0) size 38x12 - text run at (0,0) width 38: "\x{3053}\x{3046}\x{304E}\x{3087}\x{3046}" - RenderRubyBase (anonymous) at (0,12) size 38x20 - RenderText {#text} at (3,0) size 32x19 - text run at (3,0) width 32: "\x{5DE5}\x{696D}" - RenderRubyRun (anonymous) at (102,12) size 32x20 - RenderRubyBase (anonymous) at (0,0) size 32x20 - RenderText {#text} at (0,0) size 32x19 - text run at (0,0) width 32: "\x{5927}\x{5B66}" - RenderText {#text} at (134,12) size 130x19 - text run at (134,12) width 130: "\x{304B}\x{3089}\x{5352}\x{696D}\x{3057}\x{307E}\x{3057}\x{305F}\x{3002}" + RenderText {#text} at (0,12) size 146x19 + text run at (0,12) width 146: "<ruby> is defined in the " + RenderRuby (inline) {RUBY} at (0,0) size 125x19 + RenderRubyRun (anonymous) at (146,0) size 117x32 + RenderRubyText {RT} at (0,0) size 117x12 + RenderText {#text} at (0,0) size 117x12 + text run at (0,0) width 117: "Hyper-text Markup Language" + RenderRubyBase (anonymous) at (0,12) size 117x20 + RenderText {#text} at (37,0) size 43x19 + text run at (37,0) width 43: "HTML" + RenderRubyRun (anonymous) at (263,12) size 8x20 + RenderRubyBase (anonymous) at (0,0) size 8x20 + RenderText {#text} at (0,0) size 8x19 + text run at (0,0) width 8: "5" + RenderText {#text} at (271,12) size 36x19 + text run at (271,12) width 36: " spec." diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/ruby/rubyDOM-remove-rt2-expected.checksum b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/ruby/rubyDOM-remove-rt2-expected.checksum index bf6d8b2..9791ec1 100644 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/ruby/rubyDOM-remove-rt2-expected.checksum +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/ruby/rubyDOM-remove-rt2-expected.checksum @@ -1 +1 @@ -9f248619705c73a5671c7bd7b71d84db
\ No newline at end of file +51f15dcd269d8221f22145bc5fe5b3f1
\ No newline at end of file diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/ruby/rubyDOM-remove-rt2-expected.png b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/ruby/rubyDOM-remove-rt2-expected.png Binary files differindex 33ed123..ecdfeb1 100644 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/ruby/rubyDOM-remove-rt2-expected.png +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/ruby/rubyDOM-remove-rt2-expected.png diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/ruby/rubyDOM-remove-rt2-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/ruby/rubyDOM-remove-rt2-expected.txt index 3b2f86d..fd2e10e 100644 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/ruby/rubyDOM-remove-rt2-expected.txt +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/ruby/rubyDOM-remove-rt2-expected.txt @@ -4,8 +4,8 @@ layer at (0,0) size 800x600 RenderBlock {HTML} at (0,0) size 800x600 RenderBody {BODY} at (8,8) size 784x576 RenderBlock {P} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 771x19 - text run at (0,0) width 771: "The following is a test for DOM manipulation within <ruby>: Removing the last <rt>, forcing a merge with the right neighbour run" + RenderText {#text} at (0,0) size 736x19 + text run at (0,0) width 736: "The following is a test for DOM manipulation within <ruby>: Removing a <rt>, forcing a merge with the right neighbour run" RenderBlock {P} at (0,36) size 784x20 RenderText {#text} at (0,0) size 409x19 text run at (0,0) width 409: "Both lines should look identical (the first line is the one manipulated)." @@ -13,30 +13,38 @@ layer at (0,0) size 800x600 RenderBR {BR} at (0,0) size 0x19 RenderBR {BR} at (0,20) size 0x19 RenderBlock {P} at (0,128) size 784x32 - RenderText {#text} at (0,12) size 64x19 - text run at (0,12) width 64: "\x{6E96}\x{592A}\x{90CE}\x{306F}" - RenderRuby (inline) {RUBY} at (0,0) size 72x19 - RenderRubyRun (anonymous) at (64,0) size 72x32 - RenderRubyText {RT} at (0,0) size 72x12 - RenderText {#text} at (0,0) size 72x12 - text run at (0,0) width 72: "\x{3053}\x{3046}\x{304E}\x{3087}\x{3046}\x{3060}\x{3044}\x{304C}\x{304F}" - RenderRubyBase (anonymous) at (0,12) size 72x20 - RenderText {#text} at (4,0) size 32x19 - text run at (4,0) width 32: "\x{5DE5}\x{696D}" - RenderText {#text} at (36,0) size 32x19 - text run at (36,0) width 32: "\x{5927}\x{5B66}" - RenderText {#text} at (136,12) size 130x19 - text run at (136,12) width 130: "\x{304B}\x{3089}\x{5352}\x{696D}\x{3057}\x{307E}\x{3057}\x{305F}\x{3002}" + RenderText {#text} at (0,12) size 146x19 + text run at (0,12) width 146: "<ruby> is defined in the " + RenderRuby (inline) {RUBY} at (0,0) size 125x19 + RenderRubyRun (anonymous) at (146,0) size 117x32 + RenderRubyText {RT} at (0,0) size 117x12 + RenderText {#text} at (0,0) size 117x12 + text run at (0,0) width 117: "Hyper-text Markup Language" + RenderRubyBase (anonymous) at (0,12) size 117x20 + RenderText {#text} at (37,0) size 20x19 + text run at (37,0) width 20: "HT" + RenderText {#text} at (57,0) size 23x19 + text run at (57,0) width 23: "ML" + RenderRubyRun (anonymous) at (263,12) size 8x20 + RenderRubyBase (anonymous) at (0,0) size 8x20 + RenderText {#text} at (0,0) size 8x19 + text run at (0,0) width 8: "5" + RenderText {#text} at (271,12) size 36x19 + text run at (271,12) width 36: " spec." RenderBlock {P} at (0,176) size 784x32 - RenderText {#text} at (0,12) size 64x19 - text run at (0,12) width 64: "\x{6E96}\x{592A}\x{90CE}\x{306F}" - RenderRuby (inline) {RUBY} at (0,0) size 72x19 - RenderRubyRun (anonymous) at (64,0) size 72x32 - RenderRubyText {RT} at (0,0) size 72x12 - RenderText {#text} at (0,0) size 72x12 - text run at (0,0) width 72: "\x{3053}\x{3046}\x{304E}\x{3087}\x{3046}\x{3060}\x{3044}\x{304C}\x{304F}" - RenderRubyBase (anonymous) at (0,12) size 72x20 - RenderText {#text} at (4,0) size 64x19 - text run at (4,0) width 64: "\x{5DE5}\x{696D}\x{5927}\x{5B66}" - RenderText {#text} at (136,12) size 130x19 - text run at (136,12) width 130: "\x{304B}\x{3089}\x{5352}\x{696D}\x{3057}\x{307E}\x{3057}\x{305F}\x{3002}" + RenderText {#text} at (0,12) size 146x19 + text run at (0,12) width 146: "<ruby> is defined in the " + RenderRuby (inline) {RUBY} at (0,0) size 125x19 + RenderRubyRun (anonymous) at (146,0) size 117x32 + RenderRubyText {RT} at (0,0) size 117x12 + RenderText {#text} at (0,0) size 117x12 + text run at (0,0) width 117: "Hyper-text Markup Language" + RenderRubyBase (anonymous) at (0,12) size 117x20 + RenderText {#text} at (37,0) size 43x19 + text run at (37,0) width 43: "HTML" + RenderRubyRun (anonymous) at (263,12) size 8x20 + RenderRubyBase (anonymous) at (0,0) size 8x20 + RenderText {#text} at (0,0) size 8x19 + text run at (0,0) width 8: "5" + RenderText {#text} at (271,12) size 36x19 + text run at (271,12) width 36: " spec." diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/ruby/rubyDOM-remove-text1-expected.checksum b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/ruby/rubyDOM-remove-text1-expected.checksum index 97d95e6..1fe4e02 100644 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/ruby/rubyDOM-remove-text1-expected.checksum +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/ruby/rubyDOM-remove-text1-expected.checksum @@ -1 +1 @@ -6ca6f2f3dde769943d09a58fe8c6441a
\ No newline at end of file +b352a652b18ae72825005779288d1589
\ No newline at end of file diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/ruby/rubyDOM-remove-text1-expected.png b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/ruby/rubyDOM-remove-text1-expected.png Binary files differindex 61e045a..d6188b2 100644 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/ruby/rubyDOM-remove-text1-expected.png +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/ruby/rubyDOM-remove-text1-expected.png diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/ruby/rubyDOM-remove-text1-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/ruby/rubyDOM-remove-text1-expected.txt index fd4be0e..22343ed 100644 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/ruby/rubyDOM-remove-text1-expected.txt +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/ruby/rubyDOM-remove-text1-expected.txt @@ -13,30 +13,38 @@ layer at (0,0) size 800x600 RenderBR {BR} at (0,0) size 0x19 RenderBR {BR} at (0,20) size 0x19 RenderBlock {P} at (0,128) size 784x32 - RenderText {#text} at (0,12) size 64x19 - text run at (0,12) width 64: "\x{6E96}\x{592A}\x{90CE}\x{306F}" - RenderRuby (inline) {RUBY} at (0,0) size 34x19 - RenderRubyRun (anonymous) at (64,0) size 34x32 - RenderRubyText {RT} at (0,0) size 34x12 - RenderText {#text} at (0,0) size 34x12 - text run at (0,0) width 34: "\x{3060}\x{3044}\x{304C}\x{304F}" - RenderRubyBase (anonymous) at (0,12) size 34x20 - RenderInline {SPAN} at (0,0) size 32x19 - RenderText {#text} at (1,0) size 32x19 - text run at (1,0) width 32: "\x{5927}\x{5B66}" - RenderText {#text} at (98,12) size 130x19 - text run at (98,12) width 130: "\x{304B}\x{3089}\x{5352}\x{696D}\x{3057}\x{307E}\x{3057}\x{305F}\x{3002}" + RenderText {#text} at (0,12) size 146x19 + text run at (0,12) width 146: "<ruby> is defined in the " + RenderRuby (inline) {RUBY} at (0,0) size 125x19 + RenderRubyRun (anonymous) at (146,0) size 117x32 + RenderRubyText {RT} at (0,0) size 117x12 + RenderText {#text} at (0,0) size 117x12 + text run at (0,0) width 117: "Hyper-text Markup Language" + RenderRubyBase (anonymous) at (0,12) size 117x20 + RenderInline {SPAN} at (0,0) size 43x19 + RenderText {#text} at (37,0) size 43x19 + text run at (37,0) width 43: "HTML" + RenderRubyRun (anonymous) at (263,12) size 8x20 + RenderRubyBase (anonymous) at (0,0) size 8x20 + RenderText {#text} at (0,0) size 8x19 + text run at (0,0) width 8: "5" + RenderText {#text} at (271,12) size 36x19 + text run at (271,12) width 36: " spec." RenderBlock {P} at (0,176) size 784x32 - RenderText {#text} at (0,12) size 64x19 - text run at (0,12) width 64: "\x{6E96}\x{592A}\x{90CE}\x{306F}" - RenderRuby (inline) {RUBY} at (0,0) size 34x19 - RenderRubyRun (anonymous) at (64,0) size 34x32 - RenderRubyText {RT} at (0,0) size 34x12 - RenderText {#text} at (0,0) size 34x12 - text run at (0,0) width 34: "\x{3060}\x{3044}\x{304C}\x{304F}" - RenderRubyBase (anonymous) at (0,12) size 34x20 - RenderInline {SPAN} at (0,0) size 32x19 - RenderText {#text} at (1,0) size 32x19 - text run at (1,0) width 32: "\x{5927}\x{5B66}" - RenderText {#text} at (98,12) size 130x19 - text run at (98,12) width 130: "\x{304B}\x{3089}\x{5352}\x{696D}\x{3057}\x{307E}\x{3057}\x{305F}\x{3002}" + RenderText {#text} at (0,12) size 146x19 + text run at (0,12) width 146: "<ruby> is defined in the " + RenderRuby (inline) {RUBY} at (0,0) size 125x19 + RenderRubyRun (anonymous) at (146,0) size 117x32 + RenderRubyText {RT} at (0,0) size 117x12 + RenderText {#text} at (0,0) size 117x12 + text run at (0,0) width 117: "Hyper-text Markup Language" + RenderRubyBase (anonymous) at (0,12) size 117x20 + RenderInline {SPAN} at (0,0) size 43x19 + RenderText {#text} at (37,0) size 43x19 + text run at (37,0) width 43: "HTML" + RenderRubyRun (anonymous) at (263,12) size 8x20 + RenderRubyBase (anonymous) at (0,0) size 8x20 + RenderText {#text} at (0,0) size 8x19 + text run at (0,0) width 8: "5" + RenderText {#text} at (271,12) size 36x19 + text run at (271,12) width 36: " spec." diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/ruby/rubyDOM-remove-text2-expected.checksum b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/ruby/rubyDOM-remove-text2-expected.checksum index d6f8f18..fac1a33 100644 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/ruby/rubyDOM-remove-text2-expected.checksum +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/ruby/rubyDOM-remove-text2-expected.checksum @@ -1 +1 @@ -b8778bce297823aee6ca2b1326bd224b
\ No newline at end of file +311627635d391c9087aff4b8c87e645c
\ No newline at end of file diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/ruby/rubyDOM-remove-text2-expected.png b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/ruby/rubyDOM-remove-text2-expected.png Binary files differindex 6a5d5c3..76c0128 100644 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/ruby/rubyDOM-remove-text2-expected.png +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/ruby/rubyDOM-remove-text2-expected.png diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/ruby/rubyDOM-remove-text2-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/ruby/rubyDOM-remove-text2-expected.txt index 3a56d35..7bb14d2 100644 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/ruby/rubyDOM-remove-text2-expected.txt +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/ruby/rubyDOM-remove-text2-expected.txt @@ -13,23 +13,31 @@ layer at (0,0) size 800x600 RenderBR {BR} at (0,0) size 0x19 RenderBR {BR} at (0,20) size 0x19 RenderBlock {P} at (0,128) size 784x20 - RenderText {#text} at (0,0) size 64x19 - text run at (0,0) width 64: "\x{6E96}\x{592A}\x{90CE}\x{306F}" - RenderRuby (inline) {RUBY} at (0,0) size 34x19 - RenderRubyRun (anonymous) at (64,5) size 34x12 - RenderRubyText {RT} at (0,0) size 34x12 - RenderText {#text} at (0,0) size 34x12 - text run at (0,0) width 34: "\x{3060}\x{3044}\x{304C}\x{304F}" - RenderRubyBase (anonymous) at (0,12) size 34x0 - RenderText {#text} at (98,0) size 130x19 - text run at (98,0) width 130: "\x{304B}\x{3089}\x{5352}\x{696D}\x{3057}\x{307E}\x{3057}\x{305F}\x{3002}" + RenderText {#text} at (0,0) size 146x19 + text run at (0,0) width 146: "<ruby> is defined in the " + RenderRuby (inline) {RUBY} at (0,0) size 125x19 + RenderRubyRun (anonymous) at (146,5) size 117x12 + RenderRubyText {RT} at (0,0) size 117x12 + RenderText {#text} at (0,0) size 117x12 + text run at (0,0) width 117: "Hyper-text Markup Language" + RenderRubyBase (anonymous) at (0,12) size 117x0 + RenderRubyRun (anonymous) at (263,0) size 8x20 + RenderRubyBase (anonymous) at (0,0) size 8x20 + RenderText {#text} at (0,0) size 8x19 + text run at (0,0) width 8: "5" + RenderText {#text} at (271,0) size 36x19 + text run at (271,0) width 36: " spec." RenderBlock {P} at (0,164) size 784x20 - RenderText {#text} at (0,0) size 64x19 - text run at (0,0) width 64: "\x{6E96}\x{592A}\x{90CE}\x{306F}" - RenderRuby (inline) {RUBY} at (0,0) size 34x19 - RenderRubyRun (anonymous) at (64,5) size 34x12 - RenderRubyText {RT} at (0,0) size 34x12 - RenderText {#text} at (0,0) size 34x12 - text run at (0,0) width 34: "\x{3060}\x{3044}\x{304C}\x{304F}" - RenderText {#text} at (98,0) size 130x19 - text run at (98,0) width 130: "\x{304B}\x{3089}\x{5352}\x{696D}\x{3057}\x{307E}\x{3057}\x{305F}\x{3002}" + RenderText {#text} at (0,0) size 146x19 + text run at (0,0) width 146: "<ruby> is defined in the " + RenderRuby (inline) {RUBY} at (0,0) size 125x19 + RenderRubyRun (anonymous) at (146,5) size 117x12 + RenderRubyText {RT} at (0,0) size 117x12 + RenderText {#text} at (0,0) size 117x12 + text run at (0,0) width 117: "Hyper-text Markup Language" + RenderRubyRun (anonymous) at (263,0) size 8x20 + RenderRubyBase (anonymous) at (0,0) size 8x20 + RenderText {#text} at (0,0) size 8x19 + text run at (0,0) width 8: "5" + RenderText {#text} at (271,0) size 36x19 + text run at (271,0) width 36: " spec." diff --git a/webkit/tools/layout_tests/test_expectations.txt b/webkit/tools/layout_tests/test_expectations.txt index 972c3c4..131f048 100755..100644 --- a/webkit/tools/layout_tests/test_expectations.txt +++ b/webkit/tools/layout_tests/test_expectations.txt @@ -3048,3 +3048,7 @@ BUG32666 MAC DEBUG : svg/custom/use-detach.svg = IMAGE PASS BUG_DPRANKE WIN : fast/media/lifetime.html = PASS TIMEOUT BUG_DPRANKE WIN : storage/domstorage/sessionstorage/delete-removal.html = PASS CRASH + +// 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 |
