diff --git a/layout/reftests/css-ruby/box-properties-2-ref.html b/layout/reftests/css-ruby/box-properties-2-ref.html index 2c8ca8d69043..8bf2d754c2d4 100644 --- a/layout/reftests/css-ruby/box-properties-2-ref.html +++ b/layout/reftests/css-ruby/box-properties-2-ref.html @@ -6,14 +6,15 @@ - + base1
base3 -
text1
+
text1
+
diff --git a/layout/reftests/css-ruby/box-properties-2.html b/layout/reftests/css-ruby/box-properties-2.html index ae9f15283845..6b936303996f 100644 --- a/layout/reftests/css-ruby/box-properties-2.html +++ b/layout/reftests/css-ruby/box-properties-2.html @@ -6,7 +6,7 @@ - + base1
diff --git a/layout/reftests/css-ruby/box-properties-3-ref.html b/layout/reftests/css-ruby/box-properties-3-ref.html index a9e87f0574a5..465e54758463 100644 --- a/layout/reftests/css-ruby/box-properties-3-ref.html +++ b/layout/reftests/css-ruby/box-properties-3-ref.html @@ -11,7 +11,7 @@ base1 -
text1
+ text1
diff --git a/layout/reftests/css-ruby/intra-level-whitespace-1-ref.html b/layout/reftests/css-ruby/intra-level-whitespace-1-ref.html index 502452166fbc..7cc1050325cf 100644 --- a/layout/reftests/css-ruby/intra-level-whitespace-1-ref.html +++ b/layout/reftests/css-ruby/intra-level-whitespace-1-ref.html @@ -12,7 +12,7 @@

a b - xy + xy

ab diff --git a/layout/reftests/css-ruby/line-height-1-ref.html b/layout/reftests/css-ruby/line-height-1-ref.html index f12eb3ea567c..414ad51c7274 100644 --- a/layout/reftests/css-ruby/line-height-1-ref.html +++ b/layout/reftests/css-ruby/line-height-1-ref.html @@ -7,11 +7,15 @@ -

base
+
+ base + text +
diff --git a/layout/reftests/css-ruby/line-height-2-ref.html b/layout/reftests/css-ruby/line-height-2-ref.html index 9ed54600be19..58d6435c7bca 100644 --- a/layout/reftests/css-ruby/line-height-2-ref.html +++ b/layout/reftests/css-ruby/line-height-2-ref.html @@ -7,12 +7,16 @@ -
base
+
+ base + text +
next line diff --git a/layout/reftests/css-ruby/line-height-3-ref.html b/layout/reftests/css-ruby/line-height-3-ref.html index f919b1ace479..1773dc062b10 100644 --- a/layout/reftests/css-ruby/line-height-3-ref.html +++ b/layout/reftests/css-ruby/line-height-3-ref.html @@ -7,12 +7,18 @@ -
base
+
+ base + text + text +
next line diff --git a/layout/reftests/css-ruby/reftest.list b/layout/reftests/css-ruby/reftest.list index 74548778a263..4ff517eeed84 100644 --- a/layout/reftests/css-ruby/reftest.list +++ b/layout/reftests/css-ruby/reftest.list @@ -2,7 +2,7 @@ default-preferences pref(layout.css.ruby.enabled,true) == autohiding-1.html autohiding-1-ref.html == autohiding-2.html autohiding-2-ref.html -fails == autohiding-3.html autohiding-3-ref.html # bug 1107701 +== autohiding-3.html autohiding-3-ref.html == box-generation-1.html box-generation-1-ref.html == box-generation-2.html box-generation-2-ref.html == box-generation-3.html box-generation-3-ref.html @@ -35,7 +35,7 @@ fails == autohiding-3.html autohiding-3-ref.html # bug 1107701 == line-height-3.html line-height-3-ref.html load nested-ruby-1.html == no-transform.html no-transform-ref.html -fails-if(cocoaWidget) == relative-positioning-1.html relative-positioning-1-ref.html # bug 1120280 +== relative-positioning-1.html relative-positioning-1-ref.html == relative-positioning-2.html relative-positioning-2-ref.html == ruby-position-horizontal.html ruby-position-horizontal-ref.html pref(layout.css.vertical-text.enabled,true) fails == ruby-position-vertical-lr.html ruby-position-vertical-lr-ref.html # bug 1112474 diff --git a/layout/reftests/css-ruby/relative-positioning-1-ref.html b/layout/reftests/css-ruby/relative-positioning-1-ref.html index f8df05509207..7695a493f24d 100644 --- a/layout/reftests/css-ruby/relative-positioning-1-ref.html +++ b/layout/reftests/css-ruby/relative-positioning-1-ref.html @@ -3,27 +3,20 @@ Bug 1055658 - Relative positioning for ruby - + -
-
-
-
abc
-   +
+ +
+ abc
base -
+
+ diff --git a/layout/reftests/css-ruby/relative-positioning-2-ref.html b/layout/reftests/css-ruby/relative-positioning-2-ref.html index e77efbbeaa3c..b1dfa959ddcf 100644 --- a/layout/reftests/css-ruby/relative-positioning-2-ref.html +++ b/layout/reftests/css-ruby/relative-positioning-2-ref.html @@ -3,34 +3,28 @@ Bug 1055658 - Relative positioning for ruby - + - +
before -
-
-
+
+ +
text1 text2 text3
-   -
- base1 - base2 - base3 + base1 + base2 + base3 +
after
+ diff --git a/layout/reftests/css-ruby/utils.js b/layout/reftests/css-ruby/utils.js index 49a99d202a34..4b4182f2e843 100644 --- a/layout/reftests/css-ruby/utils.js +++ b/layout/reftests/css-ruby/utils.js @@ -1,5 +1,9 @@ +function getHeight(elem) { + return elem.getBoundingClientRect().height + 'px'; +} + function makeHeightMatchInlineBox(block, inline) { - var height = inline.getBoundingClientRect().height + 'px'; + var height = getHeight(inline); block.style.height = height; block.style.lineHeight = height; }