[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.19-706-ge5415e9
rolandsteiner at chromium.org
rolandsteiner at chromium.org
Thu Feb 4 21:26:59 UTC 2010
The following commit has been merged in the webkit-1.1 branch:
commit 29b0b517d391d623446f5124d0d38e8cd76021b4
Author: rolandsteiner at chromium.org <rolandsteiner at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Mon Jan 25 07:04:52 2010 +0000
build fix: rubber-stamped by Eric Seidel.
Fix expected baselines for ruby layout tests on Windows.
* platform/win/fast/ruby/ruby-empty-rt-expected.txt:
* platform/win/fast/ruby/ruby-length-expected.txt:
* platform/win/fast/ruby/ruby-run-break-expected.txt:
* platform/win/fast/ruby/ruby-runs-expected.txt:
* platform/win/fast/ruby/ruby-runs-spans-expected.txt:
* platform/win/fast/ruby/ruby-simple-expected.txt:
* platform/win/fast/ruby/ruby-simple-rp-expected.txt:
* platform/win/fast/ruby/ruby-trailing-expected.txt:
* platform/win/fast/ruby/rubyDOM-insert-rt-expected.txt:
* platform/win/fast/ruby/rubyDOM-insert-text1-expected.txt:
* platform/win/fast/ruby/rubyDOM-insert-text2-expected.txt:
* platform/win/fast/ruby/rubyDOM-insert-text3-expected.txt:
* platform/win/fast/ruby/rubyDOM-remove-rt1-expected.txt:
* platform/win/fast/ruby/rubyDOM-remove-rt2-expected.txt:
* platform/win/fast/ruby/rubyDOM-remove-text1-expected.txt:
* platform/win/fast/ruby/rubyDOM-remove-text2-expected.txt:
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@53793 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index a0c0f56..857ee50 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,26 @@
+2010-01-24 Roland Steiner <rolandsteiner at chromium.org>
+
+ build fix: rubber-stamped by Eric Seidel.
+
+ Fix expected baselines for ruby layout tests on Windows.
+
+ * platform/win/fast/ruby/ruby-empty-rt-expected.txt:
+ * platform/win/fast/ruby/ruby-length-expected.txt:
+ * platform/win/fast/ruby/ruby-run-break-expected.txt:
+ * platform/win/fast/ruby/ruby-runs-expected.txt:
+ * platform/win/fast/ruby/ruby-runs-spans-expected.txt:
+ * platform/win/fast/ruby/ruby-simple-expected.txt:
+ * platform/win/fast/ruby/ruby-simple-rp-expected.txt:
+ * platform/win/fast/ruby/ruby-trailing-expected.txt:
+ * platform/win/fast/ruby/rubyDOM-insert-rt-expected.txt:
+ * platform/win/fast/ruby/rubyDOM-insert-text1-expected.txt:
+ * platform/win/fast/ruby/rubyDOM-insert-text2-expected.txt:
+ * platform/win/fast/ruby/rubyDOM-insert-text3-expected.txt:
+ * platform/win/fast/ruby/rubyDOM-remove-rt1-expected.txt:
+ * platform/win/fast/ruby/rubyDOM-remove-rt2-expected.txt:
+ * platform/win/fast/ruby/rubyDOM-remove-text1-expected.txt:
+ * platform/win/fast/ruby/rubyDOM-remove-text2-expected.txt:
+
2010-01-24 Eric Carlson <eric.carlson at apple.com>
Reviewed by Dan Bernstein.
diff --git a/LayoutTests/platform/win/fast/ruby/ruby-empty-rt-expected.txt b/LayoutTests/platform/win/fast/ruby/ruby-empty-rt-expected.txt
index 204bace..7f487dc 100755
--- a/LayoutTests/platform/win/fast/ruby/ruby-empty-rt-expected.txt
+++ b/LayoutTests/platform/win/fast/ruby/ruby-empty-rt-expected.txt
@@ -3,28 +3,28 @@ layer 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 784x21
- RenderText {#text} at (0,0) size 452x20
+ RenderBlock {P} at (0,0) size 784x18
+ RenderText {#text} at (0,0) size 452x18
text run at (0,0) width 452: "The following is a test for having a <rt> immediately following another."
- RenderBlock (anonymous) at (0,37) size 784x42
- RenderBR {BR} at (0,0) size 0x20
- RenderBR {BR} at (0,21) size 0x20
- RenderBlock {P} at (0,95) size 784x34
- RenderText {#text} at (0,13) size 82x20
+ RenderBlock (anonymous) at (0,34) size 784x36
+ RenderBR {BR} at (0,0) size 0x18
+ RenderBR {BR} at (0,18) size 0x18
+ RenderBlock {P} at (0,86) size 784x31
+ RenderText {#text} at (0,13) size 82x18
text run at (0,13) width 82: "<ruby> uses "
- RenderRuby (inline) {RUBY} at (0,0) size 42x20
- RenderRubyRun (anonymous) at (82,0) size 27x34
+ RenderRuby (inline) {RUBY} at (0,0) size 42x18
+ RenderRubyRun (anonymous) at (82,0) size 27x31
RenderRubyText {RT} at (0,0) size 27x13
RenderText {#text} at (4,0) size 18x13
text run at (4,0) width 18: "ruby"
- RenderRubyBase (anonymous) at (0,13) size 27x21
- RenderText {#text} at (0,0) size 27x20
+ RenderRubyBase (anonymous) at (0,13) size 27x18
+ RenderText {#text} at (0,0) size 27x18
text run at (0,0) width 27: "<rt>"
- RenderRubyRun (anonymous) at (109,19) size 15x13
+ RenderRubyRun (anonymous) at (109,17) size 15x13
RenderRubyText {RT} at (0,0) size 15x13
RenderText {#text} at (0,0) size 15x13
text run at (0,0) width 15: "text"
- RenderText {#text} at (124,13) size 163x20
+ RenderText {#text} at (124,13) size 163x18
text run at (124,13) width 163: " to contain the annotation."
RenderText {#text} at (0,0) size 0x0
RenderText {#text} at (0,0) size 0x0
diff --git a/LayoutTests/platform/win/fast/ruby/ruby-length-expected.txt b/LayoutTests/platform/win/fast/ruby/ruby-length-expected.txt
index d455283..925c6fa 100755
--- a/LayoutTests/platform/win/fast/ruby/ruby-length-expected.txt
+++ b/LayoutTests/platform/win/fast/ruby/ruby-length-expected.txt
@@ -3,32 +3,32 @@ layer 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 773x41
+ RenderText {#text} at (0,0) size 773x36
text run at (0,0) width 773: "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"
- text run at (0,21) width 36: "base, "
- text run at (36,21) width 291: "and one with a ruby text longer than the base. "
- RenderBR {BR} at (327,38) size 0x0
- RenderBR {BR} at (0,42) size 0x20
- RenderText {#text} at (0,76) size 155x20
- text run at (0,76) width 155: "<ruby> is defined in the "
- RenderRuby (inline) {RUBY} at (0,0) size 184x20
- RenderRubyRun (anonymous) at (155,63) size 184x34
+ text run at (0,18) width 36: "base, "
+ text run at (36,18) width 291: "and one with a ruby text longer than the base. "
+ RenderBR {BR} at (327,32) size 0x0
+ RenderBR {BR} at (0,36) size 0x18
+ RenderText {#text} at (0,67) size 155x18
+ text run at (0,67) width 155: "<ruby> is defined in the "
+ RenderRuby (inline) {RUBY} at (0,0) size 184x18
+ RenderRubyRun (anonymous) at (155,54) size 184x31
RenderRubyText {RT} at (0,0) size 184x13
RenderText {#text} at (75,0) size 33x13
text run at (75,0) width 33: "HTML5"
- RenderRubyBase (anonymous) at (0,13) size 184x21
- RenderText {#text} at (0,0) size 184x20
+ RenderRubyBase (anonymous) at (0,13) size 184x18
+ RenderText {#text} at (0,0) size 184x18
text run at (0,0) width 184: "Hypertext Markup Language"
- RenderText {#text} at (339,76) size 31x20
- text run at (339,76) width 31: " and "
- RenderRuby (inline) {RUBY} at (0,0) size 94x20
- RenderRubyRun (anonymous) at (370,63) size 94x34
+ RenderText {#text} at (339,67) size 31x18
+ text run at (339,67) width 31: " and "
+ RenderRuby (inline) {RUBY} at (0,0) size 94x18
+ RenderRubyRun (anonymous) at (370,54) size 94x31
RenderRubyText {RT} at (0,0) size 94x13
RenderText {#text} at (0,0) size 94x13
text run at (0,0) width 94: "Cascading Style Sheets"
- RenderRubyBase (anonymous) at (0,13) size 94x21
- RenderText {#text} at (28,0) size 37x20
+ RenderRubyBase (anonymous) at (0,13) size 94x18
+ RenderText {#text} at (28,0) size 37x18
text run at (28,0) width 37: "CSS3"
- RenderText {#text} at (464,76) size 42x20
- text run at (464,76) width 42: " specs."
+ RenderText {#text} at (464,67) size 42x18
+ text run at (464,67) width 42: " specs."
RenderText {#text} at (0,0) size 0x0
diff --git a/LayoutTests/platform/win/fast/ruby/ruby-run-break-expected.txt b/LayoutTests/platform/win/fast/ruby/ruby-run-break-expected.txt
index 17748b3..36acd17 100755
--- a/LayoutTests/platform/win/fast/ruby/ruby-run-break-expected.txt
+++ b/LayoutTests/platform/win/fast/ruby/ruby-run-break-expected.txt
@@ -3,52 +3,52 @@ layer 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 784x84
- RenderText {#text} at (0,0) size 767x62
+ RenderBlock (anonymous) at (0,0) size 784x72
+ RenderText {#text} at (0,0) size 767x54
text run at (0,0) width 752: "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"
- text run at (0,21) width 497: "single <ruby> markup in the text contained in the block, broken across 2 lines. "
- text run at (497,21) width 270: "Part of it should be on the first line, the rest"
- text run at (0,42) width 110: "on the other line. "
- RenderBR {BR} at (110,59) size 0x0
- RenderBR {BR} at (0,63) size 0x20
- RenderBlock {DIV} at (0,84) size 284x92 [border: (2px solid #0000FF)]
- RenderText {#text} at (12,25) size 155x20
+ text run at (0,18) width 497: "single <ruby> markup in the text contained in the block, broken across 2 lines. "
+ text run at (497,18) width 270: "Part of it should be on the first line, the rest"
+ text run at (0,36) width 110: "on the other line. "
+ RenderBR {BR} at (110,50) size 0x0
+ RenderBR {BR} at (0,54) size 0x18
+ RenderBlock {DIV} at (0,72) size 284x86 [border: (2px solid #0000FF)]
+ RenderText {#text} at (12,25) size 155x18
text run at (12,25) width 155: "<ruby> is defined in the "
- RenderRuby (inline) {RUBY} at (0,0) size 228x54
- RenderRubyRun (anonymous) at (167,12) size 24x34
+ RenderRuby (inline) {RUBY} at (0,0) size 228x49
+ RenderRubyRun (anonymous) at (167,12) size 24x31
RenderRubyText {RT} at (0,0) size 24x13
RenderText {#text} at (0,0) size 24x13
text run at (0,0) width 24: "Hyper"
- RenderRubyBase (anonymous) at (0,13) size 24x21
- RenderText {#text} at (6,0) size 12x20
+ RenderRubyBase (anonymous) at (0,13) size 24x18
+ RenderText {#text} at (6,0) size 12x18
text run at (6,0) width 12: "H"
- RenderRubyRun (anonymous) at (191,12) size 18x34
+ RenderRubyRun (anonymous) at (191,12) size 18x31
RenderRubyText {RT} at (0,0) size 18x13
RenderText {#text} at (0,0) size 18x13
text run at (0,0) width 18: "Text"
- RenderRubyBase (anonymous) at (0,13) size 18x21
- RenderText {#text} at (4,0) size 10x20
+ RenderRubyBase (anonymous) at (0,13) size 18x18
+ RenderText {#text} at (4,0) size 10x18
text run at (4,0) width 10: "T"
- RenderRubyRun (anonymous) at (209,12) size 31x34
+ RenderRubyRun (anonymous) at (209,12) size 31x31
RenderRubyText {RT} at (0,0) size 31x13
RenderText {#text} at (0,0) size 31x13
text run at (0,0) width 31: "Markup"
- RenderRubyBase (anonymous) at (0,13) size 31x21
- RenderText {#text} at (8,0) size 14x20
+ RenderRubyBase (anonymous) at (0,13) size 31x18
+ RenderText {#text} at (8,0) size 14x18
text run at (8,0) width 14: "M"
- RenderRubyRun (anonymous) at (12,46) size 38x34
+ RenderRubyRun (anonymous) at (12,43) size 38x31
RenderRubyText {RT} at (0,0) size 38x13
RenderText {#text} at (0,0) size 38x13
text run at (0,0) width 38: "Language"
- RenderRubyBase (anonymous) at (0,13) size 38x21
- RenderText {#text} at (14,0) size 10x20
+ RenderRubyBase (anonymous) at (0,13) size 38x18
+ RenderText {#text} at (14,0) size 10x18
text run at (14,0) width 10: "L"
- RenderRubyRun (anonymous) at (50,46) size 30x34
+ RenderRubyRun (anonymous) at (50,43) size 30x31
RenderRubyText {RT} at (0,0) size 30x13
RenderText {#text} at (0,0) size 30x13
text run at (0,0) width 30: "Level 5"
- RenderRubyBase (anonymous) at (0,13) size 30x21
- RenderText {#text} at (11,0) size 8x20
+ RenderRubyBase (anonymous) at (0,13) size 30x18
+ RenderText {#text} at (11,0) size 8x18
text run at (11,0) width 8: "5"
- RenderText {#text} at (80,59) size 42x20
- text run at (80,59) width 42: " specs."
+ RenderText {#text} at (80,56) size 42x18
+ text run at (80,56) width 42: " specs."
diff --git a/LayoutTests/platform/win/fast/ruby/ruby-runs-expected.txt b/LayoutTests/platform/win/fast/ruby/ruby-runs-expected.txt
index 2d12d8a..705fb83 100755
--- a/LayoutTests/platform/win/fast/ruby/ruby-runs-expected.txt
+++ b/LayoutTests/platform/win/fast/ruby/ruby-runs-expected.txt
@@ -3,49 +3,49 @@ layer 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 (anonymous) at (0,0) size 784x42
- RenderText {#text} at (0,0) size 227x20
+ RenderBlock (anonymous) at (0,0) size 784x36
+ RenderText {#text} at (0,0) size 227x18
text run at (0,0) width 227: "This is a test for multiple ruby runs. "
- RenderBR {BR} at (227,17) size 0x0
- RenderBR {BR} at (0,21) size 0x20
- RenderBlock {P} at (0,58) size 784x34
- RenderText {#text} at (0,13) size 155x20
+ RenderBR {BR} at (227,14) size 0x0
+ RenderBR {BR} at (0,18) size 0x18
+ RenderBlock {P} at (0,52) size 784x31
+ RenderText {#text} at (0,13) size 155x18
text run at (0,13) width 155: "<ruby> is defined in the "
- RenderRuby (inline) {RUBY} at (0,0) size 141x20
- RenderRubyRun (anonymous) at (155,0) size 24x34
+ RenderRuby (inline) {RUBY} at (0,0) size 141x18
+ RenderRubyRun (anonymous) at (155,0) size 24x31
RenderRubyText {RT} at (0,0) size 24x13
RenderText {#text} at (0,0) size 24x13
text run at (0,0) width 24: "Hyper"
- RenderRubyBase (anonymous) at (0,13) size 24x21
- RenderText {#text} at (6,0) size 12x20
+ RenderRubyBase (anonymous) at (0,13) size 24x18
+ RenderText {#text} at (6,0) size 12x18
text run at (6,0) width 12: "H"
- RenderRubyRun (anonymous) at (179,0) size 18x34
+ RenderRubyRun (anonymous) at (179,0) size 18x31
RenderRubyText {RT} at (0,0) size 18x13
RenderText {#text} at (0,0) size 18x13
text run at (0,0) width 18: "Text"
- RenderRubyBase (anonymous) at (0,13) size 18x21
- RenderText {#text} at (4,0) size 10x20
+ RenderRubyBase (anonymous) at (0,13) size 18x18
+ RenderText {#text} at (4,0) size 10x18
text run at (4,0) width 10: "T"
- RenderRubyRun (anonymous) at (197,0) size 31x34
+ RenderRubyRun (anonymous) at (197,0) size 31x31
RenderRubyText {RT} at (0,0) size 31x13
RenderText {#text} at (0,0) size 31x13
text run at (0,0) width 31: "Markup"
- RenderRubyBase (anonymous) at (0,13) size 31x21
- RenderText {#text} at (8,0) size 14x20
+ RenderRubyBase (anonymous) at (0,13) size 31x18
+ RenderText {#text} at (8,0) size 14x18
text run at (8,0) width 14: "M"
- RenderRubyRun (anonymous) at (228,0) size 38x34
+ RenderRubyRun (anonymous) at (228,0) size 38x31
RenderRubyText {RT} at (0,0) size 38x13
RenderText {#text} at (0,0) size 38x13
text run at (0,0) width 38: "Language"
- RenderRubyBase (anonymous) at (0,13) size 38x21
- RenderText {#text} at (14,0) size 10x20
+ RenderRubyBase (anonymous) at (0,13) size 38x18
+ RenderText {#text} at (14,0) size 10x18
text run at (14,0) width 10: "L"
- RenderRubyRun (anonymous) at (266,0) size 30x34
+ RenderRubyRun (anonymous) at (266,0) size 30x31
RenderRubyText {RT} at (0,0) size 30x13
RenderText {#text} at (0,0) size 30x13
text run at (0,0) width 30: "Level 5"
- RenderRubyBase (anonymous) at (0,13) size 30x21
- RenderText {#text} at (11,0) size 8x20
+ RenderRubyBase (anonymous) at (0,13) size 30x18
+ RenderText {#text} at (11,0) size 8x18
text run at (11,0) width 8: "5"
- RenderText {#text} at (296,13) size 42x20
+ RenderText {#text} at (296,13) size 42x18
text run at (296,13) width 42: " specs."
diff --git a/LayoutTests/platform/win/fast/ruby/ruby-runs-spans-expected.txt b/LayoutTests/platform/win/fast/ruby/ruby-runs-spans-expected.txt
index 9287367..751d568 100755
--- a/LayoutTests/platform/win/fast/ruby/ruby-runs-spans-expected.txt
+++ b/LayoutTests/platform/win/fast/ruby/ruby-runs-spans-expected.txt
@@ -3,34 +3,34 @@ layer 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 784x21
- RenderText {#text} at (0,0) size 494x20
+ RenderBlock {P} at (0,0) size 784x18
+ RenderText {#text} at (0,0) size 494x18
text run at (0,0) width 494: "The following is a test for having non-text inline elements as base in a <ruby>."
- RenderBlock {P} at (0,37) size 784x34
- RenderText {#text} at (0,13) size 155x20
+ RenderBlock {P} at (0,34) size 784x31
+ RenderText {#text} at (0,13) size 155x18
text run at (0,13) width 155: "<ruby> is defined in the "
- RenderRuby (inline) {RUBY} at (0,0) size 142x20
- RenderRubyRun (anonymous) at (155,0) size 42x34
+ RenderRuby (inline) {RUBY} at (0,0) size 142x18
+ RenderRubyRun (anonymous) at (155,0) size 42x31
RenderRubyText {RT} at (0,0) size 42x13
RenderText {#text} at (0,0) size 42x13
text run at (0,0) width 42: "Hyper-text"
- RenderRubyBase (anonymous) at (0,13) size 42x21
- RenderInline {SPAN} at (0,0) size 22x20
- RenderText {#text} at (10,0) size 22x20
+ RenderRubyBase (anonymous) at (0,13) size 42x18
+ RenderInline {SPAN} at (0,0) size 22x18
+ RenderText {#text} at (10,0) size 22x18
text run at (10,0) width 22: "HT"
- RenderRubyRun (anonymous) at (197,0) size 100x34
+ RenderRubyRun (anonymous) at (197,0) size 100x31
RenderRubyText {RT} at (0,0) size 100x13
RenderText {#text} at (0,0) size 100x13
text run at (0,0) width 100: "Markup Language Lvl. 5"
- RenderRubyBase (anonymous) at (0,13) size 100x21
- RenderInline {SPAN} at (0,0) size 14x20
- RenderText {#text} at (34,0) size 14x20
+ RenderRubyBase (anonymous) at (0,13) size 100x18
+ RenderInline {SPAN} at (0,0) size 14x18
+ RenderText {#text} at (34,0) size 14x18
text run at (34,0) width 14: "M"
- RenderInline {SPAN} at (0,0) size 10x20
- RenderText {#text} at (48,0) size 10x20
+ RenderInline {SPAN} at (0,0) size 10x18
+ RenderText {#text} at (48,0) size 10x18
text run at (48,0) width 10: "L"
- RenderInline {SPAN} at (0,0) size 8x20
- RenderText {#text} at (58,0) size 8x20
+ RenderInline {SPAN} at (0,0) size 8x18
+ RenderText {#text} at (58,0) size 8x18
text run at (58,0) width 8: "5"
- RenderText {#text} at (297,13) size 36x20
+ RenderText {#text} at (297,13) size 36x18
text run at (297,13) width 36: " spec."
diff --git a/LayoutTests/platform/win/fast/ruby/ruby-simple-expected.txt b/LayoutTests/platform/win/fast/ruby/ruby-simple-expected.txt
index 34f7798..f9bddc6 100755
--- a/LayoutTests/platform/win/fast/ruby/ruby-simple-expected.txt
+++ b/LayoutTests/platform/win/fast/ruby/ruby-simple-expected.txt
@@ -3,21 +3,21 @@ layer 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 (anonymous) at (0,0) size 784x42
- RenderText {#text} at (0,0) size 225x20
+ RenderBlock (anonymous) at (0,0) size 784x36
+ RenderText {#text} at (0,0) size 225x18
text run at (0,0) width 225: "This is a initial test for simple ruby. "
- RenderBR {BR} at (225,17) size 0x0
- RenderBR {BR} at (0,21) size 0x20
- RenderBlock {P} at (0,58) size 784x34
- RenderText {#text} at (0,13) size 161x20
+ RenderBR {BR} at (225,14) size 0x0
+ RenderBR {BR} at (0,18) size 0x18
+ RenderBlock {P} at (0,52) size 784x31
+ RenderText {#text} at (0,13) size 161x18
text run at (0,13) width 161: "Ruby is often used in the "
- RenderRuby (inline) {RUBY} at (0,0) size 117x20
- RenderRubyRun (anonymous) at (161,0) size 117x34
+ RenderRuby (inline) {RUBY} at (0,0) size 117x18
+ RenderRubyRun (anonymous) at (161,0) size 117x31
RenderRubyText {RT} at (0,0) size 117x13
RenderText {#text} at (41,0) size 35x13
text run at (41,0) width 35: "Nihongo"
- RenderRubyBase (anonymous) at (0,13) size 117x21
- RenderText {#text} at (0,0) size 117x20
+ RenderRubyBase (anonymous) at (0,13) size 117x18
+ RenderText {#text} at (0,0) size 117x18
text run at (0,0) width 117: "Japanese language"
- RenderText {#text} at (278,13) size 4x20
+ RenderText {#text} at (278,13) size 4x18
text run at (278,13) width 4: "."
diff --git a/LayoutTests/platform/win/fast/ruby/ruby-simple-rp-expected.txt b/LayoutTests/platform/win/fast/ruby/ruby-simple-rp-expected.txt
index a179707..0c1289a 100755
--- a/LayoutTests/platform/win/fast/ruby/ruby-simple-rp-expected.txt
+++ b/LayoutTests/platform/win/fast/ruby/ruby-simple-rp-expected.txt
@@ -3,23 +3,23 @@ layer 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 (anonymous) at (0,0) size 784x63
- RenderText {#text} at (0,0) size 760x41
+ RenderBlock (anonymous) at (0,0) size 784x54
+ RenderText {#text} at (0,0) size 760x36
text run at (0,0) width 333: "This is a test for simple ruby that contains <rp> tags. "
text run at (333,0) width 427: "Contents of the <rp> tags (opening and closing brackets) should not"
- text run at (0,21) width 202: "show when ruby is suppoorted. "
- RenderBR {BR} at (202,38) size 0x0
- RenderBR {BR} at (0,42) size 0x20
- RenderBlock {P} at (0,79) size 784x34
- RenderText {#text} at (0,13) size 161x20
+ text run at (0,18) width 202: "show when ruby is suppoorted. "
+ RenderBR {BR} at (202,32) size 0x0
+ RenderBR {BR} at (0,36) size 0x18
+ RenderBlock {P} at (0,70) size 784x31
+ RenderText {#text} at (0,13) size 161x18
text run at (0,13) width 161: "Ruby is often used in the "
- RenderRuby (inline) {RUBY} at (0,0) size 117x20
- RenderRubyRun (anonymous) at (161,0) size 117x34
+ RenderRuby (inline) {RUBY} at (0,0) size 117x18
+ RenderRubyRun (anonymous) at (161,0) size 117x31
RenderRubyText {RT} at (0,0) size 117x13
RenderText {#text} at (41,0) size 35x13
text run at (41,0) width 35: "Nihongo"
- RenderRubyBase (anonymous) at (0,13) size 117x21
- RenderText {#text} at (0,0) size 117x20
+ RenderRubyBase (anonymous) at (0,13) size 117x18
+ RenderText {#text} at (0,0) size 117x18
text run at (0,0) width 117: "Japanese language"
- RenderText {#text} at (278,13) size 4x20
+ RenderText {#text} at (278,13) size 4x18
text run at (278,13) width 4: "."
diff --git a/LayoutTests/platform/win/fast/ruby/ruby-trailing-expected.txt b/LayoutTests/platform/win/fast/ruby/ruby-trailing-expected.txt
index 23f3d8b..199de8d 100755
--- a/LayoutTests/platform/win/fast/ruby/ruby-trailing-expected.txt
+++ b/LayoutTests/platform/win/fast/ruby/ruby-trailing-expected.txt
@@ -3,26 +3,26 @@ layer 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 784x21
- RenderText {#text} at (0,0) size 590x20
+ RenderBlock {P} at (0,0) size 784x18
+ RenderText {#text} at (0,0) size 590x18
text run at (0,0) width 590: "The following is a test for having a trailing base within a <ruby> with no associated ruby text."
- RenderBlock (anonymous) at (0,37) size 784x42
- RenderBR {BR} at (0,0) size 0x20
- RenderBR {BR} at (0,21) size 0x20
- RenderBlock {P} at (0,95) size 784x34
- RenderText {#text} at (0,13) size 155x20
+ RenderBlock (anonymous) at (0,34) size 784x36
+ RenderBR {BR} at (0,0) size 0x18
+ RenderBR {BR} at (0,18) size 0x18
+ RenderBlock {P} at (0,86) size 784x31
+ RenderText {#text} at (0,13) size 155x18
text run at (0,13) width 155: "<ruby> is defined in the "
- RenderRuby (inline) {RUBY} at (0,0) size 125x20
- RenderRubyRun (anonymous) at (155,0) size 117x34
+ RenderRuby (inline) {RUBY} at (0,0) size 125x18
+ RenderRubyRun (anonymous) at (155,0) size 117x31
RenderRubyText {RT} at (0,0) size 117x13
RenderText {#text} at (0,0) size 117x13
text run at (0,0) width 117: "Hyper-text Markup Language"
- RenderRubyBase (anonymous) at (0,13) size 117x21
- RenderText {#text} at (35,0) size 46x20
+ RenderRubyBase (anonymous) at (0,13) size 117x18
+ RenderText {#text} at (35,0) size 46x18
text run at (35,0) width 46: "HTML"
- RenderRubyRun (anonymous) at (272,13) size 8x21
- RenderRubyBase (anonymous) at (0,0) size 8x21
- RenderText {#text} at (0,0) size 8x20
+ RenderRubyRun (anonymous) at (272,13) size 8x18
+ RenderRubyBase (anonymous) at (0,0) size 8x18
+ RenderText {#text} at (0,0) size 8x18
text run at (0,0) width 8: "5"
- RenderText {#text} at (280,13) size 4x20
+ RenderText {#text} at (280,13) size 4x18
text run at (280,13) width 4: "."
diff --git a/LayoutTests/platform/win/fast/ruby/rubyDOM-insert-rt-expected.txt b/LayoutTests/platform/win/fast/ruby/rubyDOM-insert-rt-expected.txt
index e7fa1f3..745b991 100755
--- a/LayoutTests/platform/win/fast/ruby/rubyDOM-insert-rt-expected.txt
+++ b/LayoutTests/platform/win/fast/ruby/rubyDOM-insert-rt-expected.txt
@@ -3,64 +3,64 @@ layer 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 784x21
- RenderText {#text} at (0,0) size 574x20
+ RenderBlock {P} at (0,0) size 784x18
+ RenderText {#text} at (0,0) size 574x18
text run at (0,0) width 574: "The following is a test for DOM manipulation within <ruby>: Inserting a new <rt> element"
- RenderBlock {P} at (0,37) size 784x21
- RenderText {#text} at (0,0) size 436x20
+ RenderBlock {P} at (0,34) size 784x18
+ RenderText {#text} at (0,0) size 436x18
text run at (0,0) width 436: "Both lines should look identical (the first line is the one manipulated)."
- RenderBlock (anonymous) at (0,74) size 784x42
- RenderBR {BR} at (0,0) size 0x20
- RenderBR {BR} at (0,21) size 0x20
- RenderBlock {P} at (0,132) size 784x34
- RenderText {#text} at (0,13) size 155x20
+ RenderBlock (anonymous) at (0,68) size 784x36
+ RenderBR {BR} at (0,0) size 0x18
+ RenderBR {BR} at (0,18) size 0x18
+ RenderBlock {P} at (0,120) size 784x31
+ RenderText {#text} at (0,13) size 155x18
text run at (0,13) width 155: "<ruby> is defined in the "
- RenderRuby (inline) {RUBY} at (0,0) size 122x20
- RenderRubyRun (anonymous) at (155,0) size 42x34
+ RenderRuby (inline) {RUBY} at (0,0) size 122x18
+ RenderRubyRun (anonymous) at (155,0) size 42x31
RenderRubyText {RT} at (0,0) size 42x13
RenderText {#text} at (0,0) size 42x13
text run at (0,0) width 42: "Hyper-text"
- RenderRubyBase (anonymous) at (0,13) size 42x21
- RenderInline {SPAN} at (0,0) size 22x20
- RenderText {#text} at (10,0) size 22x20
+ RenderRubyBase (anonymous) at (0,13) size 42x18
+ RenderInline {SPAN} at (0,0) size 22x18
+ RenderText {#text} at (10,0) size 22x18
text run at (10,0) width 22: "HT"
- RenderRubyRun (anonymous) at (197,0) size 72x34
+ RenderRubyRun (anonymous) at (197,0) size 72x31
RenderRubyText {RT} at (0,0) size 72x13
RenderText {#text} at (0,0) size 72x13
text run at (0,0) width 72: "Markup Language"
- RenderRubyBase (anonymous) at (0,13) size 72x21
- RenderInline {SPAN} at (0,0) size 24x20
- RenderText {#text} at (24,0) size 24x20
+ RenderRubyBase (anonymous) at (0,13) size 72x18
+ RenderInline {SPAN} at (0,0) size 24x18
+ RenderText {#text} at (24,0) size 24x18
text run at (24,0) width 24: "ML"
- RenderRubyRun (anonymous) at (269,13) size 8x21
- RenderRubyBase (anonymous) at (0,0) size 8x21
- RenderText {#text} at (0,0) size 8x20
+ RenderRubyRun (anonymous) at (269,13) size 8x18
+ RenderRubyBase (anonymous) at (0,0) size 8x18
+ RenderText {#text} at (0,0) size 8x18
text run at (0,0) width 8: "5"
- RenderText {#text} at (277,13) size 36x20
+ RenderText {#text} at (277,13) size 36x18
text run at (277,13) width 36: " spec."
- RenderBlock {P} at (0,182) size 784x34
- RenderText {#text} at (0,13) size 155x20
+ RenderBlock {P} at (0,167) size 784x31
+ RenderText {#text} at (0,13) size 155x18
text run at (0,13) width 155: "<ruby> is defined in the "
- RenderRuby (inline) {RUBY} at (0,0) size 122x20
- RenderRubyRun (anonymous) at (155,0) size 42x34
+ RenderRuby (inline) {RUBY} at (0,0) size 122x18
+ RenderRubyRun (anonymous) at (155,0) size 42x31
RenderRubyText {RT} at (0,0) size 42x13
RenderText {#text} at (0,0) size 42x13
text run at (0,0) width 42: "Hyper-text"
- RenderRubyBase (anonymous) at (0,13) size 42x21
- RenderInline {SPAN} at (0,0) size 22x20
- RenderText {#text} at (10,0) size 22x20
+ RenderRubyBase (anonymous) at (0,13) size 42x18
+ RenderInline {SPAN} at (0,0) size 22x18
+ RenderText {#text} at (10,0) size 22x18
text run at (10,0) width 22: "HT"
- RenderRubyRun (anonymous) at (197,0) size 72x34
+ RenderRubyRun (anonymous) at (197,0) size 72x31
RenderRubyText {RT} at (0,0) size 72x13
RenderText {#text} at (0,0) size 72x13
text run at (0,0) width 72: "Markup Language"
- RenderRubyBase (anonymous) at (0,13) size 72x21
- RenderInline {SPAN} at (0,0) size 24x20
- RenderText {#text} at (24,0) size 24x20
+ RenderRubyBase (anonymous) at (0,13) size 72x18
+ RenderInline {SPAN} at (0,0) size 24x18
+ RenderText {#text} at (24,0) size 24x18
text run at (24,0) width 24: "ML"
- RenderRubyRun (anonymous) at (269,13) size 8x21
- RenderRubyBase (anonymous) at (0,0) size 8x21
- RenderText {#text} at (0,0) size 8x20
+ RenderRubyRun (anonymous) at (269,13) size 8x18
+ RenderRubyBase (anonymous) at (0,0) size 8x18
+ RenderText {#text} at (0,0) size 8x18
text run at (0,0) width 8: "5"
- RenderText {#text} at (277,13) size 36x20
+ RenderText {#text} at (277,13) size 36x18
text run at (277,13) width 36: " spec."
diff --git a/LayoutTests/platform/win/fast/ruby/rubyDOM-insert-text1-expected.txt b/LayoutTests/platform/win/fast/ruby/rubyDOM-insert-text1-expected.txt
index 04d47dd..6778b81 100755
--- a/LayoutTests/platform/win/fast/ruby/rubyDOM-insert-text1-expected.txt
+++ b/LayoutTests/platform/win/fast/ruby/rubyDOM-insert-text1-expected.txt
@@ -3,60 +3,60 @@ layer 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 784x21
- RenderText {#text} at (0,0) size 656x20
+ RenderBlock {P} at (0,0) size 784x18
+ RenderText {#text} at (0,0) size 656x18
text run at (0,0) width 656: "The following is a test for DOM manipulation within <ruby>: Inserting a new text before a <rt> element"
- RenderBlock {P} at (0,37) size 784x21
- RenderText {#text} at (0,0) size 436x20
+ RenderBlock {P} at (0,34) size 784x18
+ RenderText {#text} at (0,0) size 436x18
text run at (0,0) width 436: "Both lines should look identical (the first line is the one manipulated)."
- RenderBlock (anonymous) at (0,74) size 784x42
- RenderBR {BR} at (0,0) size 0x20
- RenderBR {BR} at (0,21) size 0x20
- RenderBlock {P} at (0,132) size 784x34
- RenderText {#text} at (0,13) size 155x20
+ RenderBlock (anonymous) at (0,68) size 784x36
+ RenderBR {BR} at (0,0) size 0x18
+ RenderBR {BR} at (0,18) size 0x18
+ RenderBlock {P} at (0,120) size 784x31
+ RenderText {#text} at (0,13) size 155x18
text run at (0,13) width 155: "<ruby> is defined in the "
- RenderRuby (inline) {RUBY} at (0,0) size 122x20
- RenderRubyRun (anonymous) at (155,0) size 42x34
+ RenderRuby (inline) {RUBY} at (0,0) size 122x18
+ RenderRubyRun (anonymous) at (155,0) size 42x31
RenderRubyText {RT} at (0,0) size 42x13
RenderText {#text} at (0,0) size 42x13
text run at (0,0) width 42: "Hyper-text"
- RenderRubyBase (anonymous) at (0,13) size 42x21
- RenderText {#text} at (10,0) size 22x20
+ RenderRubyBase (anonymous) at (0,13) size 42x18
+ RenderText {#text} at (10,0) size 22x18
text run at (10,0) width 22: "HT"
- RenderRubyRun (anonymous) at (197,0) size 72x34
+ RenderRubyRun (anonymous) at (197,0) size 72x31
RenderRubyText {RT} at (0,0) size 72x13
RenderText {#text} at (0,0) size 72x13
text run at (0,0) width 72: "Markup Language"
- RenderRubyBase (anonymous) at (0,13) size 72x21
- RenderText {#text} at (24,0) size 24x20
+ RenderRubyBase (anonymous) at (0,13) size 72x18
+ RenderText {#text} at (24,0) size 24x18
text run at (24,0) width 24: "ML"
- RenderRubyRun (anonymous) at (269,13) size 8x21
- RenderRubyBase (anonymous) at (0,0) size 8x21
- RenderText {#text} at (0,0) size 8x20
+ RenderRubyRun (anonymous) at (269,13) size 8x18
+ RenderRubyBase (anonymous) at (0,0) size 8x18
+ RenderText {#text} at (0,0) size 8x18
text run at (0,0) width 8: "5"
- RenderText {#text} at (277,13) size 36x20
+ RenderText {#text} at (277,13) size 36x18
text run at (277,13) width 36: " spec."
- RenderBlock {P} at (0,182) size 784x34
- RenderText {#text} at (0,13) size 155x20
+ RenderBlock {P} at (0,167) size 784x31
+ RenderText {#text} at (0,13) size 155x18
text run at (0,13) width 155: "<ruby> is defined in the "
- RenderRuby (inline) {RUBY} at (0,0) size 122x20
- RenderRubyRun (anonymous) at (155,0) size 42x34
+ RenderRuby (inline) {RUBY} at (0,0) size 122x18
+ RenderRubyRun (anonymous) at (155,0) size 42x31
RenderRubyText {RT} at (0,0) size 42x13
RenderText {#text} at (0,0) size 42x13
text run at (0,0) width 42: "Hyper-text"
- RenderRubyBase (anonymous) at (0,13) size 42x21
- RenderText {#text} at (10,0) size 22x20
+ RenderRubyBase (anonymous) at (0,13) size 42x18
+ RenderText {#text} at (10,0) size 22x18
text run at (10,0) width 22: "HT"
- RenderRubyRun (anonymous) at (197,0) size 72x34
+ RenderRubyRun (anonymous) at (197,0) size 72x31
RenderRubyText {RT} at (0,0) size 72x13
RenderText {#text} at (0,0) size 72x13
text run at (0,0) width 72: "Markup Language"
- RenderRubyBase (anonymous) at (0,13) size 72x21
- RenderText {#text} at (24,0) size 24x20
+ RenderRubyBase (anonymous) at (0,13) size 72x18
+ RenderText {#text} at (24,0) size 24x18
text run at (24,0) width 24: "ML"
- RenderRubyRun (anonymous) at (269,13) size 8x21
- RenderRubyBase (anonymous) at (0,0) size 8x21
- RenderText {#text} at (0,0) size 8x20
+ RenderRubyRun (anonymous) at (269,13) size 8x18
+ RenderRubyBase (anonymous) at (0,0) size 8x18
+ RenderText {#text} at (0,0) size 8x18
text run at (0,0) width 8: "5"
- RenderText {#text} at (277,13) size 36x20
+ RenderText {#text} at (277,13) size 36x18
text run at (277,13) width 36: " spec."
diff --git a/LayoutTests/platform/win/fast/ruby/rubyDOM-insert-text2-expected.txt b/LayoutTests/platform/win/fast/ruby/rubyDOM-insert-text2-expected.txt
index ac223e2..5c9b9f0 100755
--- a/LayoutTests/platform/win/fast/ruby/rubyDOM-insert-text2-expected.txt
+++ b/LayoutTests/platform/win/fast/ruby/rubyDOM-insert-text2-expected.txt
@@ -3,51 +3,51 @@ layer 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 784x42
- RenderText {#text} at (0,0) size 733x41
+ RenderBlock {P} at (0,0) size 784x36
+ RenderText {#text} at (0,0) size 733x36
text run at (0,0) width 733: "The following is a test for DOM manipulation within <ruby>: Inserting a new text before a <rt> element that already"
- text run at (0,21) width 83: "contains text."
- RenderBlock {P} at (0,58) size 784x21
- RenderText {#text} at (0,0) size 436x20
+ text run at (0,18) width 83: "contains text."
+ RenderBlock {P} at (0,52) size 784x18
+ RenderText {#text} at (0,0) size 436x18
text run at (0,0) width 436: "Both lines should look identical (the first line is the one manipulated)."
- RenderBlock (anonymous) at (0,95) size 784x42
- RenderBR {BR} at (0,0) size 0x20
- RenderBR {BR} at (0,21) size 0x20
- RenderBlock {P} at (0,153) size 784x34
- RenderText {#text} at (0,13) size 155x20
+ RenderBlock (anonymous) at (0,86) size 784x36
+ RenderBR {BR} at (0,0) size 0x18
+ RenderBR {BR} at (0,18) size 0x18
+ RenderBlock {P} at (0,138) size 784x31
+ RenderText {#text} at (0,13) size 155x18
text run at (0,13) width 155: "<ruby> is defined in the "
- RenderRuby (inline) {RUBY} at (0,0) size 125x20
- RenderRubyRun (anonymous) at (155,0) size 117x34
+ RenderRuby (inline) {RUBY} at (0,0) size 125x18
+ RenderRubyRun (anonymous) at (155,0) size 117x31
RenderRubyText {RT} at (0,0) size 117x13
RenderText {#text} at (0,0) size 117x13
text run at (0,0) width 117: "Hyper-text Markup Language"
- RenderRubyBase (anonymous) at (0,13) size 117x21
- RenderInline {SPAN} at (0,0) size 22x20
- RenderText {#text} at (35,0) size 22x20
+ RenderRubyBase (anonymous) at (0,13) size 117x18
+ RenderInline {SPAN} at (0,0) size 22x18
+ RenderText {#text} at (35,0) size 22x18
text run at (35,0) width 22: "HT"
- RenderText {#text} at (57,0) size 24x20
+ RenderText {#text} at (57,0) size 24x18
text run at (57,0) width 24: "ML"
- RenderRubyRun (anonymous) at (272,13) size 8x21
- RenderRubyBase (anonymous) at (0,0) size 8x21
- RenderText {#text} at (0,0) size 8x20
+ RenderRubyRun (anonymous) at (272,13) size 8x18
+ RenderRubyBase (anonymous) at (0,0) size 8x18
+ RenderText {#text} at (0,0) size 8x18
text run at (0,0) width 8: "5"
- RenderText {#text} at (280,13) size 36x20
+ RenderText {#text} at (280,13) size 36x18
text run at (280,13) width 36: " spec."
- RenderBlock {P} at (0,203) size 784x34
- RenderText {#text} at (0,13) size 155x20
+ RenderBlock {P} at (0,185) size 784x31
+ RenderText {#text} at (0,13) size 155x18
text run at (0,13) width 155: "<ruby> is defined in the "
- RenderRuby (inline) {RUBY} at (0,0) size 125x20
- RenderRubyRun (anonymous) at (155,0) size 117x34
+ RenderRuby (inline) {RUBY} at (0,0) size 125x18
+ RenderRubyRun (anonymous) at (155,0) size 117x31
RenderRubyText {RT} at (0,0) size 117x13
RenderText {#text} at (0,0) size 117x13
text run at (0,0) width 117: "Hyper-text Markup Language"
- RenderRubyBase (anonymous) at (0,13) size 117x21
- RenderText {#text} at (35,0) size 46x20
+ RenderRubyBase (anonymous) at (0,13) size 117x18
+ RenderText {#text} at (35,0) size 46x18
text run at (35,0) width 46: "HTML"
- RenderInline {SPAN} at (0,0) size 0x20
- RenderRubyRun (anonymous) at (272,13) size 8x21
- RenderRubyBase (anonymous) at (0,0) size 8x21
- RenderText {#text} at (0,0) size 8x20
+ RenderInline {SPAN} at (0,0) size 0x18
+ RenderRubyRun (anonymous) at (272,13) size 8x18
+ RenderRubyBase (anonymous) at (0,0) size 8x18
+ RenderText {#text} at (0,0) size 8x18
text run at (0,0) width 8: "5"
- RenderText {#text} at (280,13) size 36x20
+ RenderText {#text} at (280,13) size 36x18
text run at (280,13) width 36: " spec."
diff --git a/LayoutTests/platform/win/fast/ruby/rubyDOM-insert-text3-expected.txt b/LayoutTests/platform/win/fast/ruby/rubyDOM-insert-text3-expected.txt
index 217fab1..d97bc5a 100755
--- a/LayoutTests/platform/win/fast/ruby/rubyDOM-insert-text3-expected.txt
+++ b/LayoutTests/platform/win/fast/ruby/rubyDOM-insert-text3-expected.txt
@@ -3,52 +3,52 @@ layer 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 784x21
- RenderText {#text} at (0,0) size 736x20
+ RenderBlock {P} at (0,0) size 784x18
+ RenderText {#text} at (0,0) size 736x18
text run at (0,0) width 736: "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,37) size 784x21
- RenderText {#text} at (0,0) size 436x20
+ RenderBlock {P} at (0,34) size 784x18
+ RenderText {#text} at (0,0) size 436x18
text run at (0,0) width 436: "Both lines should look identical (the first line is the one manipulated)."
- RenderBlock (anonymous) at (0,74) size 784x42
- RenderBR {BR} at (0,0) size 0x20
- RenderBR {BR} at (0,21) size 0x20
- RenderBlock {P} at (0,132) size 784x34
- RenderText {#text} at (0,13) size 155x20
+ RenderBlock (anonymous) at (0,68) size 784x36
+ RenderBR {BR} at (0,0) size 0x18
+ RenderBR {BR} at (0,18) size 0x18
+ RenderBlock {P} at (0,120) size 784x31
+ RenderText {#text} at (0,13) size 155x18
text run at (0,13) width 155: "<ruby> is defined in the "
- RenderRuby (inline) {RUBY} at (0,0) size 125x20
- RenderRubyRun (anonymous) at (155,0) size 117x34
+ RenderRuby (inline) {RUBY} at (0,0) size 125x18
+ RenderRubyRun (anonymous) at (155,0) size 117x31
RenderRubyText {RT} at (0,0) size 117x13
RenderText {#text} at (0,0) size 117x13
text run at (0,0) width 117: "Hyper-text Markup Language"
- RenderRubyBase (anonymous) at (0,13) size 117x21
- RenderText {#text} at (35,0) size 22x20
+ RenderRubyBase (anonymous) at (0,13) size 117x18
+ RenderText {#text} at (35,0) size 22x18
text run at (35,0) width 22: "HT"
- RenderInline {SPAN} at (0,0) size 24x20
- RenderText {#text} at (57,0) size 24x20
+ RenderInline {SPAN} at (0,0) size 24x18
+ RenderText {#text} at (57,0) size 24x18
text run at (57,0) width 24: "ML"
- RenderRubyRun (anonymous) at (272,13) size 8x21
- RenderRubyBase (anonymous) at (0,0) size 8x21
- RenderText {#text} at (0,0) size 8x20
+ RenderRubyRun (anonymous) at (272,13) size 8x18
+ RenderRubyBase (anonymous) at (0,0) size 8x18
+ RenderText {#text} at (0,0) size 8x18
text run at (0,0) width 8: "5"
- RenderText {#text} at (280,13) size 36x20
+ RenderText {#text} at (280,13) size 36x18
text run at (280,13) width 36: " spec."
- RenderBlock {P} at (0,182) size 784x34
- RenderText {#text} at (0,13) size 155x20
+ RenderBlock {P} at (0,167) size 784x31
+ RenderText {#text} at (0,13) size 155x18
text run at (0,13) width 155: "<ruby> is defined in the "
- RenderRuby (inline) {RUBY} at (0,0) size 125x20
- RenderRubyRun (anonymous) at (155,0) size 117x34
+ RenderRuby (inline) {RUBY} at (0,0) size 125x18
+ RenderRubyRun (anonymous) at (155,0) size 117x31
RenderRubyText {RT} at (0,0) size 117x13
RenderText {#text} at (0,0) size 117x13
text run at (0,0) width 117: "Hyper-text Markup Language"
- RenderRubyBase (anonymous) at (0,13) size 117x21
- RenderText {#text} at (35,0) size 22x20
+ RenderRubyBase (anonymous) at (0,13) size 117x18
+ RenderText {#text} at (35,0) size 22x18
text run at (35,0) width 22: "HT"
- RenderInline {SPAN} at (0,0) size 24x20
- RenderText {#text} at (57,0) size 24x20
+ RenderInline {SPAN} at (0,0) size 24x18
+ RenderText {#text} at (57,0) size 24x18
text run at (57,0) width 24: "ML"
- RenderRubyRun (anonymous) at (272,13) size 8x21
- RenderRubyBase (anonymous) at (0,0) size 8x21
- RenderText {#text} at (0,0) size 8x20
+ RenderRubyRun (anonymous) at (272,13) size 8x18
+ RenderRubyBase (anonymous) at (0,0) size 8x18
+ RenderText {#text} at (0,0) size 8x18
text run at (0,0) width 8: "5"
- RenderText {#text} at (280,13) size 36x20
+ RenderText {#text} at (280,13) size 36x18
text run at (280,13) width 36: " spec."
diff --git a/LayoutTests/platform/win/fast/ruby/rubyDOM-remove-rt1-expected.txt b/LayoutTests/platform/win/fast/ruby/rubyDOM-remove-rt1-expected.txt
index c94056c..e54e7d8 100755
--- a/LayoutTests/platform/win/fast/ruby/rubyDOM-remove-rt1-expected.txt
+++ b/LayoutTests/platform/win/fast/ruby/rubyDOM-remove-rt1-expected.txt
@@ -3,46 +3,46 @@ layer 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 784x21
- RenderText {#text} at (0,0) size 763x20
+ RenderBlock {P} at (0,0) size 784x18
+ RenderText {#text} at (0,0) size 763x18
text run at (0,0) width 763: "The following is a test for DOM manipulation within <ruby>: Removing the last <rt>, leaving the base without ruby text."
- RenderBlock {P} at (0,37) size 784x21
- RenderText {#text} at (0,0) size 436x20
+ RenderBlock {P} at (0,34) size 784x18
+ RenderText {#text} at (0,0) size 436x18
text run at (0,0) width 436: "Both lines should look identical (the first line is the one manipulated)."
- RenderBlock (anonymous) at (0,74) size 784x42
- RenderBR {BR} at (0,0) size 0x20
- RenderBR {BR} at (0,21) size 0x20
- RenderBlock {P} at (0,132) size 784x34
- RenderText {#text} at (0,13) size 155x20
+ RenderBlock (anonymous) at (0,68) size 784x36
+ RenderBR {BR} at (0,0) size 0x18
+ RenderBR {BR} at (0,18) size 0x18
+ RenderBlock {P} at (0,120) size 784x31
+ RenderText {#text} at (0,13) size 155x18
text run at (0,13) width 155: "<ruby> is defined in the "
- RenderRuby (inline) {RUBY} at (0,0) size 125x20
- RenderRubyRun (anonymous) at (155,0) size 117x34
+ RenderRuby (inline) {RUBY} at (0,0) size 125x18
+ RenderRubyRun (anonymous) at (155,0) size 117x31
RenderRubyText {RT} at (0,0) size 117x13
RenderText {#text} at (0,0) size 117x13
text run at (0,0) width 117: "Hyper-text Markup Language"
- RenderRubyBase (anonymous) at (0,13) size 117x21
- RenderText {#text} at (35,0) size 46x20
+ RenderRubyBase (anonymous) at (0,13) size 117x18
+ RenderText {#text} at (35,0) size 46x18
text run at (35,0) width 46: "HTML"
- RenderRubyRun (anonymous) at (272,13) size 8x21
- RenderRubyBase (anonymous) at (0,0) size 8x21
- RenderText {#text} at (0,0) size 8x20
+ RenderRubyRun (anonymous) at (272,13) size 8x18
+ RenderRubyBase (anonymous) at (0,0) size 8x18
+ RenderText {#text} at (0,0) size 8x18
text run at (0,0) width 8: "5"
- RenderText {#text} at (280,13) size 36x20
+ RenderText {#text} at (280,13) size 36x18
text run at (280,13) width 36: " spec."
- RenderBlock {P} at (0,182) size 784x34
- RenderText {#text} at (0,13) size 155x20
+ RenderBlock {P} at (0,167) size 784x31
+ RenderText {#text} at (0,13) size 155x18
text run at (0,13) width 155: "<ruby> is defined in the "
- RenderRuby (inline) {RUBY} at (0,0) size 125x20
- RenderRubyRun (anonymous) at (155,0) size 117x34
+ RenderRuby (inline) {RUBY} at (0,0) size 125x18
+ RenderRubyRun (anonymous) at (155,0) size 117x31
RenderRubyText {RT} at (0,0) size 117x13
RenderText {#text} at (0,0) size 117x13
text run at (0,0) width 117: "Hyper-text Markup Language"
- RenderRubyBase (anonymous) at (0,13) size 117x21
- RenderText {#text} at (35,0) size 46x20
+ RenderRubyBase (anonymous) at (0,13) size 117x18
+ RenderText {#text} at (35,0) size 46x18
text run at (35,0) width 46: "HTML"
- RenderRubyRun (anonymous) at (272,13) size 8x21
- RenderRubyBase (anonymous) at (0,0) size 8x21
- RenderText {#text} at (0,0) size 8x20
+ RenderRubyRun (anonymous) at (272,13) size 8x18
+ RenderRubyBase (anonymous) at (0,0) size 8x18
+ RenderText {#text} at (0,0) size 8x18
text run at (0,0) width 8: "5"
- RenderText {#text} at (280,13) size 36x20
+ RenderText {#text} at (280,13) size 36x18
text run at (280,13) width 36: " spec."
diff --git a/LayoutTests/platform/win/fast/ruby/rubyDOM-remove-rt2-expected.txt b/LayoutTests/platform/win/fast/ruby/rubyDOM-remove-rt2-expected.txt
index f2e5a92..1de0864 100755
--- a/LayoutTests/platform/win/fast/ruby/rubyDOM-remove-rt2-expected.txt
+++ b/LayoutTests/platform/win/fast/ruby/rubyDOM-remove-rt2-expected.txt
@@ -3,49 +3,49 @@ layer 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 784x42
- RenderText {#text} at (0,0) size 764x41
+ RenderBlock {P} at (0,0) size 784x36
+ RenderText {#text} at (0,0) size 764x36
text run at (0,0) width 764: "The following is a test for DOM manipulation within <ruby>: Removing a <rt>, forcing a merge with the right neighbour"
- text run at (0,21) width 21: "run"
- RenderBlock {P} at (0,58) size 784x21
- RenderText {#text} at (0,0) size 436x20
+ text run at (0,18) width 21: "run"
+ RenderBlock {P} at (0,52) size 784x18
+ RenderText {#text} at (0,0) size 436x18
text run at (0,0) width 436: "Both lines should look identical (the first line is the one manipulated)."
- RenderBlock (anonymous) at (0,95) size 784x42
- RenderBR {BR} at (0,0) size 0x20
- RenderBR {BR} at (0,21) size 0x20
- RenderBlock {P} at (0,153) size 784x34
- RenderText {#text} at (0,13) size 155x20
+ RenderBlock (anonymous) at (0,86) size 784x36
+ RenderBR {BR} at (0,0) size 0x18
+ RenderBR {BR} at (0,18) size 0x18
+ RenderBlock {P} at (0,138) size 784x31
+ RenderText {#text} at (0,13) size 155x18
text run at (0,13) width 155: "<ruby> is defined in the "
- RenderRuby (inline) {RUBY} at (0,0) size 125x20
- RenderRubyRun (anonymous) at (155,0) size 117x34
+ RenderRuby (inline) {RUBY} at (0,0) size 125x18
+ RenderRubyRun (anonymous) at (155,0) size 117x31
RenderRubyText {RT} at (0,0) size 117x13
RenderText {#text} at (0,0) size 117x13
text run at (0,0) width 117: "Hyper-text Markup Language"
- RenderRubyBase (anonymous) at (0,13) size 117x21
- RenderText {#text} at (35,0) size 22x20
+ RenderRubyBase (anonymous) at (0,13) size 117x18
+ RenderText {#text} at (35,0) size 22x18
text run at (35,0) width 22: "HT"
- RenderText {#text} at (57,0) size 24x20
+ RenderText {#text} at (57,0) size 24x18
text run at (57,0) width 24: "ML"
- RenderRubyRun (anonymous) at (272,13) size 8x21
- RenderRubyBase (anonymous) at (0,0) size 8x21
- RenderText {#text} at (0,0) size 8x20
+ RenderRubyRun (anonymous) at (272,13) size 8x18
+ RenderRubyBase (anonymous) at (0,0) size 8x18
+ RenderText {#text} at (0,0) size 8x18
text run at (0,0) width 8: "5"
- RenderText {#text} at (280,13) size 36x20
+ RenderText {#text} at (280,13) size 36x18
text run at (280,13) width 36: " spec."
- RenderBlock {P} at (0,203) size 784x34
- RenderText {#text} at (0,13) size 155x20
+ RenderBlock {P} at (0,185) size 784x31
+ RenderText {#text} at (0,13) size 155x18
text run at (0,13) width 155: "<ruby> is defined in the "
- RenderRuby (inline) {RUBY} at (0,0) size 125x20
- RenderRubyRun (anonymous) at (155,0) size 117x34
+ RenderRuby (inline) {RUBY} at (0,0) size 125x18
+ RenderRubyRun (anonymous) at (155,0) size 117x31
RenderRubyText {RT} at (0,0) size 117x13
RenderText {#text} at (0,0) size 117x13
text run at (0,0) width 117: "Hyper-text Markup Language"
- RenderRubyBase (anonymous) at (0,13) size 117x21
- RenderText {#text} at (35,0) size 46x20
+ RenderRubyBase (anonymous) at (0,13) size 117x18
+ RenderText {#text} at (35,0) size 46x18
text run at (35,0) width 46: "HTML"
- RenderRubyRun (anonymous) at (272,13) size 8x21
- RenderRubyBase (anonymous) at (0,0) size 8x21
- RenderText {#text} at (0,0) size 8x20
+ RenderRubyRun (anonymous) at (272,13) size 8x18
+ RenderRubyBase (anonymous) at (0,0) size 8x18
+ RenderText {#text} at (0,0) size 8x18
text run at (0,0) width 8: "5"
- RenderText {#text} at (280,13) size 36x20
+ RenderText {#text} at (280,13) size 36x18
text run at (280,13) width 36: " spec."
diff --git a/LayoutTests/platform/win/fast/ruby/rubyDOM-remove-text1-expected.txt b/LayoutTests/platform/win/fast/ruby/rubyDOM-remove-text1-expected.txt
index eaf5fa5..69cd32a 100755
--- a/LayoutTests/platform/win/fast/ruby/rubyDOM-remove-text1-expected.txt
+++ b/LayoutTests/platform/win/fast/ruby/rubyDOM-remove-text1-expected.txt
@@ -3,48 +3,48 @@ layer 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 784x21
- RenderText {#text} at (0,0) size 762x20
+ RenderBlock {P} at (0,0) size 784x18
+ RenderText {#text} at (0,0) size 762x18
text run at (0,0) width 762: "The following is a test for DOM manipulation within <ruby>: Removing a ruby base object, leaving the base non-empty."
- RenderBlock {P} at (0,37) size 784x21
- RenderText {#text} at (0,0) size 436x20
+ RenderBlock {P} at (0,34) size 784x18
+ RenderText {#text} at (0,0) size 436x18
text run at (0,0) width 436: "Both lines should look identical (the first line is the one manipulated)."
- RenderBlock (anonymous) at (0,74) size 784x42
- RenderBR {BR} at (0,0) size 0x20
- RenderBR {BR} at (0,21) size 0x20
- RenderBlock {P} at (0,132) size 784x34
- RenderText {#text} at (0,13) size 155x20
+ RenderBlock (anonymous) at (0,68) size 784x36
+ RenderBR {BR} at (0,0) size 0x18
+ RenderBR {BR} at (0,18) size 0x18
+ RenderBlock {P} at (0,120) size 784x31
+ RenderText {#text} at (0,13) size 155x18
text run at (0,13) width 155: "<ruby> is defined in the "
- RenderRuby (inline) {RUBY} at (0,0) size 125x20
- RenderRubyRun (anonymous) at (155,0) size 117x34
+ RenderRuby (inline) {RUBY} at (0,0) size 125x18
+ RenderRubyRun (anonymous) at (155,0) size 117x31
RenderRubyText {RT} at (0,0) size 117x13
RenderText {#text} at (0,0) size 117x13
text run at (0,0) width 117: "Hyper-text Markup Language"
- RenderRubyBase (anonymous) at (0,13) size 117x21
- RenderInline {SPAN} at (0,0) size 46x20
- RenderText {#text} at (35,0) size 46x20
+ RenderRubyBase (anonymous) at (0,13) size 117x18
+ RenderInline {SPAN} at (0,0) size 46x18
+ RenderText {#text} at (35,0) size 46x18
text run at (35,0) width 46: "HTML"
- RenderRubyRun (anonymous) at (272,13) size 8x21
- RenderRubyBase (anonymous) at (0,0) size 8x21
- RenderText {#text} at (0,0) size 8x20
+ RenderRubyRun (anonymous) at (272,13) size 8x18
+ RenderRubyBase (anonymous) at (0,0) size 8x18
+ RenderText {#text} at (0,0) size 8x18
text run at (0,0) width 8: "5"
- RenderText {#text} at (280,13) size 36x20
+ RenderText {#text} at (280,13) size 36x18
text run at (280,13) width 36: " spec."
- RenderBlock {P} at (0,182) size 784x34
- RenderText {#text} at (0,13) size 155x20
+ RenderBlock {P} at (0,167) size 784x31
+ RenderText {#text} at (0,13) size 155x18
text run at (0,13) width 155: "<ruby> is defined in the "
- RenderRuby (inline) {RUBY} at (0,0) size 125x20
- RenderRubyRun (anonymous) at (155,0) size 117x34
+ RenderRuby (inline) {RUBY} at (0,0) size 125x18
+ RenderRubyRun (anonymous) at (155,0) size 117x31
RenderRubyText {RT} at (0,0) size 117x13
RenderText {#text} at (0,0) size 117x13
text run at (0,0) width 117: "Hyper-text Markup Language"
- RenderRubyBase (anonymous) at (0,13) size 117x21
- RenderInline {SPAN} at (0,0) size 46x20
- RenderText {#text} at (35,0) size 46x20
+ RenderRubyBase (anonymous) at (0,13) size 117x18
+ RenderInline {SPAN} at (0,0) size 46x18
+ RenderText {#text} at (35,0) size 46x18
text run at (35,0) width 46: "HTML"
- RenderRubyRun (anonymous) at (272,13) size 8x21
- RenderRubyBase (anonymous) at (0,0) size 8x21
- RenderText {#text} at (0,0) size 8x20
+ RenderRubyRun (anonymous) at (272,13) size 8x18
+ RenderRubyBase (anonymous) at (0,0) size 8x18
+ RenderText {#text} at (0,0) size 8x18
text run at (0,0) width 8: "5"
- RenderText {#text} at (280,13) size 36x20
+ RenderText {#text} at (280,13) size 36x18
text run at (280,13) width 36: " spec."
diff --git a/LayoutTests/platform/win/fast/ruby/rubyDOM-remove-text2-expected.txt b/LayoutTests/platform/win/fast/ruby/rubyDOM-remove-text2-expected.txt
index dd8dc0b..ef25b30 100755
--- a/LayoutTests/platform/win/fast/ruby/rubyDOM-remove-text2-expected.txt
+++ b/LayoutTests/platform/win/fast/ruby/rubyDOM-remove-text2-expected.txt
@@ -3,41 +3,41 @@ layer 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 784x21
- RenderText {#text} at (0,0) size 733x20
+ RenderBlock {P} at (0,0) size 784x18
+ RenderText {#text} at (0,0) size 733x18
text run at (0,0) width 733: "The following is a test for DOM manipulation within <ruby>: Removing a ruby base object, leaving the base empty."
- RenderBlock {P} at (0,37) size 784x21
- RenderText {#text} at (0,0) size 436x20
+ RenderBlock {P} at (0,34) size 784x18
+ RenderText {#text} at (0,0) size 436x18
text run at (0,0) width 436: "Both lines should look identical (the first line is the one manipulated)."
- RenderBlock (anonymous) at (0,74) size 784x42
- RenderBR {BR} at (0,0) size 0x20
- RenderBR {BR} at (0,21) size 0x20
- RenderBlock {P} at (0,132) size 784x21
- RenderText {#text} at (0,0) size 155x20
+ RenderBlock (anonymous) at (0,68) size 784x36
+ RenderBR {BR} at (0,0) size 0x18
+ RenderBR {BR} at (0,18) size 0x18
+ RenderBlock {P} at (0,120) size 784x18
+ RenderText {#text} at (0,0) size 155x18
text run at (0,0) width 155: "<ruby> is defined in the "
- RenderRuby (inline) {RUBY} at (0,0) size 125x20
- RenderRubyRun (anonymous) at (155,6) size 117x13
+ RenderRuby (inline) {RUBY} at (0,0) size 125x18
+ RenderRubyRun (anonymous) at (155,4) size 117x13
RenderRubyText {RT} at (0,0) size 117x13
RenderText {#text} at (0,0) size 117x13
text run at (0,0) width 117: "Hyper-text Markup Language"
RenderRubyBase (anonymous) at (0,13) size 117x0
- RenderRubyRun (anonymous) at (272,0) size 8x21
- RenderRubyBase (anonymous) at (0,0) size 8x21
- RenderText {#text} at (0,0) size 8x20
+ RenderRubyRun (anonymous) at (272,0) size 8x18
+ RenderRubyBase (anonymous) at (0,0) size 8x18
+ RenderText {#text} at (0,0) size 8x18
text run at (0,0) width 8: "5"
- RenderText {#text} at (280,0) size 36x20
+ RenderText {#text} at (280,0) size 36x18
text run at (280,0) width 36: " spec."
- RenderBlock {P} at (0,169) size 784x21
- RenderText {#text} at (0,0) size 155x20
+ RenderBlock {P} at (0,154) size 784x18
+ RenderText {#text} at (0,0) size 155x18
text run at (0,0) width 155: "<ruby> is defined in the "
- RenderRuby (inline) {RUBY} at (0,0) size 125x20
- RenderRubyRun (anonymous) at (155,6) size 117x13
+ RenderRuby (inline) {RUBY} at (0,0) size 125x18
+ RenderRubyRun (anonymous) at (155,4) size 117x13
RenderRubyText {RT} at (0,0) size 117x13
RenderText {#text} at (0,0) size 117x13
text run at (0,0) width 117: "Hyper-text Markup Language"
- RenderRubyRun (anonymous) at (272,0) size 8x21
- RenderRubyBase (anonymous) at (0,0) size 8x21
- RenderText {#text} at (0,0) size 8x20
+ RenderRubyRun (anonymous) at (272,0) size 8x18
+ RenderRubyBase (anonymous) at (0,0) size 8x18
+ RenderText {#text} at (0,0) size 8x18
text run at (0,0) width 8: "5"
- RenderText {#text} at (280,0) size 36x20
+ RenderText {#text} at (280,0) size 36x18
text run at (280,0) width 36: " spec."
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list