Bug 1111463 part 3 - Fix ruby reftests for default styles. r=dbaron
authorXidorn Quan <quanxunzhen@gmail.com>
Mon, 12 Jan 2015 12:52:19 +1100
changeset 249005 0cbf1255694dbd5fe91a8fed3dfdc4955445336b
parent 249004 82612d0c8c73cb1b0d3713ca4d18f0f793bddd99
child 249006 f433e2cda30722dde9556bc96ab34a15dac6a6b1
push id4489
push userraliiev@mozilla.com
push dateMon, 23 Feb 2015 15:17:55 +0000
treeherdermozilla-beta@fd7c3dc24146 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersdbaron
bugs1111463
milestone37.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1111463 part 3 - Fix ruby reftests for default styles. r=dbaron
layout/reftests/css-ruby/common.css
layout/reftests/css-ruby/ruby-whitespace-1-ref.html
layout/reftests/css-ruby/ruby-whitespace-1.html
layout/reftests/css-ruby/ruby-whitespace-2-ref.html
layout/reftests/css-ruby/ruby-whitespace-2.html
--- a/layout/reftests/css-ruby/common.css
+++ b/layout/reftests/css-ruby/common.css
@@ -1,36 +1,17 @@
-ruby {
-  display: ruby;
-}
 rbc {
   display: ruby-base-container;
 }
-rtc {
-  display: ruby-text-container;
-  font-size: 50%;
-  line-height: 1em;
-}
-rb {
-  display: ruby-base;
-  white-space: nowrap;
-}
-rt {
-  display: ruby-text;
-  white-space: nowrap;
-  font-size: 50%;
-  line-height: 1em;
-}
-rtc > rt {
+[pseudo] {
   font-size: inherit;
-  line-height: 1em;
-}
-[pseudo] {
-  font-size: inherit !important;
-  line-height: inherit !important;
+  line-height: inherit;
 }
 [pseudo] > rt {
   font-size: 50%;
 }
+[pseudo] > rt[pseudo] {
+  font-size: inherit;
+}
 
 .large {
   font-size: 200%;
 }
--- a/layout/reftests/css-ruby/ruby-whitespace-1-ref.html
+++ b/layout/reftests/css-ruby/ruby-whitespace-1-ref.html
@@ -1,11 +1,11 @@
 <html>
+<head>
 <meta charset="UTF-8">
-<head>
 <link rel="stylesheet" href="common.css">
 <style>
 body { line-height: 5em; }
 </style>
 </head>
 <body>
 
 <p>
--- a/layout/reftests/css-ruby/ruby-whitespace-1.html
+++ b/layout/reftests/css-ruby/ruby-whitespace-1.html
@@ -1,11 +1,11 @@
 <html>
+<head>
 <meta charset="UTF-8">
-<head>
 <link rel="stylesheet" href="common.css">
 <style>
 body { line-height: 5em; }
 </style>
 </head>
 <body>
 
 <p>
--- a/layout/reftests/css-ruby/ruby-whitespace-2-ref.html
+++ b/layout/reftests/css-ruby/ruby-whitespace-2-ref.html
@@ -1,12 +1,12 @@
 <!DOCTYPE html>
 <html>
+<head>
 <meta charset="UTF-8">
-<head>
 <link rel="stylesheet" href="common.css">
 </head>
 
 <body>
 
 <!-- Unclear how this should render. See http://lists.w3.org/Archives/Public/www-style/2014Jul/0620.html //-->
 abcd<ruby><rbc><rb><span> BASE</span></rb></rbc><rtc pseudo><rt>TEXT</rt></rtc></ruby>
 
--- a/layout/reftests/css-ruby/ruby-whitespace-2.html
+++ b/layout/reftests/css-ruby/ruby-whitespace-2.html
@@ -1,12 +1,12 @@
 <!DOCTYPE html>
 <html>
+<head>
 <meta charset="UTF-8">
-<head>
 <link rel="stylesheet" href="common.css">
 </head>
 
 <body>
 
 abcd<rbc> BASE</rbc><rt>TEXT</rt>
 
 abcd<rbc> <span>BASE</span></rbc><rt>TEXT</rt>