From 9e984bddbad9f45dbcfda147e4e0efbfa9a2a66c Mon Sep 17 00:00:00 2001 From: Xidorn Quan Date: Thu, 19 Feb 2015 22:54:05 +1300 Subject: [PATCH] Bug 1134069 part 1 - Move ruby autohiding reftests to w3c-css/submitted. r=dbaron --HG-- rename : layout/reftests/css-ruby/autohiding-1-ref.html => layout/reftests/w3c-css/submitted/ruby/ruby-autohide-001-ref.html rename : layout/reftests/css-ruby/autohiding-1.html => layout/reftests/w3c-css/submitted/ruby/ruby-autohide-001.html rename : layout/reftests/css-ruby/autohiding-2-ref.html => layout/reftests/w3c-css/submitted/ruby/ruby-autohide-002-ref.html rename : layout/reftests/css-ruby/autohiding-2.html => layout/reftests/w3c-css/submitted/ruby/ruby-autohide-002.html rename : layout/reftests/css-ruby/autohiding-3-ref.html => layout/reftests/w3c-css/submitted/ruby/ruby-autohide-003-ref.html rename : layout/reftests/css-ruby/autohiding-3.html => layout/reftests/w3c-css/submitted/ruby/ruby-autohide-003.html extra : source : 027c19d2d80767e22cdf281d69932714b8599545 --- layout/reftests/css-ruby/autohiding-1.html | 14 -------------- layout/reftests/css-ruby/reftest.list | 3 --- layout/reftests/w3c-css/submitted/reftest.list | 3 +++ .../reftests/w3c-css/submitted/ruby/reftest.list | 5 +++++ .../submitted/ruby/ruby-autohide-001-ref.html} | 4 ++-- .../submitted/ruby/ruby-autohide-001.html | 16 ++++++++++++++++ .../submitted/ruby/ruby-autohide-002-ref.html} | 4 ++-- .../submitted/ruby/ruby-autohide-002.html} | 12 +++++++----- .../submitted/ruby/ruby-autohide-003-ref.html} | 4 ++-- .../submitted/ruby/ruby-autohide-003.html} | 6 ++++-- 10 files changed, 41 insertions(+), 30 deletions(-) delete mode 100644 layout/reftests/css-ruby/autohiding-1.html create mode 100644 layout/reftests/w3c-css/submitted/ruby/reftest.list rename layout/reftests/{css-ruby/autohiding-1-ref.html => w3c-css/submitted/ruby/ruby-autohide-001-ref.html} (56%) create mode 100644 layout/reftests/w3c-css/submitted/ruby/ruby-autohide-001.html rename layout/reftests/{css-ruby/autohiding-2-ref.html => w3c-css/submitted/ruby/ruby-autohide-002-ref.html} (78%) rename layout/reftests/{css-ruby/autohiding-2.html => w3c-css/submitted/ruby/ruby-autohide-002.html} (68%) rename layout/reftests/{css-ruby/autohiding-3-ref.html => w3c-css/submitted/ruby/ruby-autohide-003-ref.html} (61%) rename layout/reftests/{css-ruby/autohiding-3.html => w3c-css/submitted/ruby/ruby-autohide-003.html} (50%) diff --git a/layout/reftests/css-ruby/autohiding-1.html b/layout/reftests/css-ruby/autohiding-1.html deleted file mode 100644 index 9c6ecfaaa34c..000000000000 --- a/layout/reftests/css-ruby/autohiding-1.html +++ /dev/null @@ -1,14 +0,0 @@ - - - - - Bug 1052123 - Autohide ruby annotations which are identical to their bases - - - - - 振り仮名 - ふりがな - - - diff --git a/layout/reftests/css-ruby/reftest.list b/layout/reftests/css-ruby/reftest.list index b5d108bf87e1..fe50d58ac0d0 100644 --- a/layout/reftests/css-ruby/reftest.list +++ b/layout/reftests/css-ruby/reftest.list @@ -1,8 +1,5 @@ default-preferences pref(layout.css.ruby.enabled,true) -== autohiding-1.html autohiding-1-ref.html -== autohiding-2.html autohiding-2-ref.html -== 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 diff --git a/layout/reftests/w3c-css/submitted/reftest.list b/layout/reftests/w3c-css/submitted/reftest.list index db589a8dbe56..9591070fbff1 100644 --- a/layout/reftests/w3c-css/submitted/reftest.list +++ b/layout/reftests/w3c-css/submitted/reftest.list @@ -34,6 +34,9 @@ include images3/reftest.list # Multi-column Layout 3 include multicol3/reftest.list +# Ruby Layout Module +include ruby/reftest.list + # Selectors Level 3 # include selectors3/reftest.list diff --git a/layout/reftests/w3c-css/submitted/ruby/reftest.list b/layout/reftests/w3c-css/submitted/ruby/reftest.list new file mode 100644 index 000000000000..1647fe22bd0d --- /dev/null +++ b/layout/reftests/w3c-css/submitted/ruby/reftest.list @@ -0,0 +1,5 @@ +# Tests for autohiding base-identical annotations +== ruby-autohide-001.html ruby-autohide-001-ref.html +== ruby-autohide-002.html ruby-autohide-002-ref.html +== ruby-autohide-003.html ruby-autohide-003-ref.html + diff --git a/layout/reftests/css-ruby/autohiding-1-ref.html b/layout/reftests/w3c-css/submitted/ruby/ruby-autohide-001-ref.html similarity index 56% rename from layout/reftests/css-ruby/autohiding-1-ref.html rename to layout/reftests/w3c-css/submitted/ruby/ruby-autohide-001-ref.html index 12f15a2e879b..43945ce1b207 100644 --- a/layout/reftests/css-ruby/autohiding-1-ref.html +++ b/layout/reftests/w3c-css/submitted/ruby/ruby-autohide-001-ref.html @@ -2,8 +2,8 @@ - Bug 1052123 - Autohide ruby annotations which are identical to their bases - + CSS Reference: Autohide ruby annotations which are identical to their bases + diff --git a/layout/reftests/w3c-css/submitted/ruby/ruby-autohide-001.html b/layout/reftests/w3c-css/submitted/ruby/ruby-autohide-001.html new file mode 100644 index 000000000000..6495e47ebc1a --- /dev/null +++ b/layout/reftests/w3c-css/submitted/ruby/ruby-autohide-001.html @@ -0,0 +1,16 @@ + + + + + CSS Test: Autohide ruby annotations which are identical to their bases + + + + + + + 振り仮名 + ふりがな + + + diff --git a/layout/reftests/css-ruby/autohiding-2-ref.html b/layout/reftests/w3c-css/submitted/ruby/ruby-autohide-002-ref.html similarity index 78% rename from layout/reftests/css-ruby/autohiding-2-ref.html rename to layout/reftests/w3c-css/submitted/ruby/ruby-autohide-002-ref.html index e389154bb661..afa0f3cd243c 100644 --- a/layout/reftests/css-ruby/autohiding-2-ref.html +++ b/layout/reftests/w3c-css/submitted/ruby/ruby-autohide-002-ref.html @@ -2,8 +2,8 @@ - Bug 1052123 - Autohide ruby annotations which are identical to their bases - + CSS Reference: Autohide ruby annotations which are identical to their bases +

diff --git a/layout/reftests/css-ruby/autohiding-2.html b/layout/reftests/w3c-css/submitted/ruby/ruby-autohide-002.html similarity index 68% rename from layout/reftests/css-ruby/autohiding-2.html rename to layout/reftests/w3c-css/submitted/ruby/ruby-autohide-002.html index b05a87f658ec..d1137f208f59 100644 --- a/layout/reftests/css-ruby/autohiding-2.html +++ b/layout/reftests/w3c-css/submitted/ruby/ruby-autohide-002.html @@ -2,16 +2,18 @@ - Bug 1052123 - Autohide ruby annotations which are identical to their bases - + CSS Test: Autohide ruby annotations which are identical to their bases + + + diff --git a/layout/reftests/css-ruby/autohiding-3-ref.html b/layout/reftests/w3c-css/submitted/ruby/ruby-autohide-003-ref.html similarity index 61% rename from layout/reftests/css-ruby/autohiding-3-ref.html rename to layout/reftests/w3c-css/submitted/ruby/ruby-autohide-003-ref.html index 70549f0477bb..468b17d4ed81 100644 --- a/layout/reftests/css-ruby/autohiding-3-ref.html +++ b/layout/reftests/w3c-css/submitted/ruby/ruby-autohide-003-ref.html @@ -2,8 +2,8 @@ - Bug 1052123 - Autohide ruby annotations which are identical to their bases - + CSS Reference: Autohide ruby annotations which are identical to their bases + diff --git a/layout/reftests/css-ruby/autohiding-3.html b/layout/reftests/w3c-css/submitted/ruby/ruby-autohide-003.html similarity index 50% rename from layout/reftests/css-ruby/autohiding-3.html rename to layout/reftests/w3c-css/submitted/ruby/ruby-autohide-003.html index 1a39171877b7..4e81ecc6646e 100644 --- a/layout/reftests/css-ruby/autohiding-3.html +++ b/layout/reftests/w3c-css/submitted/ruby/ruby-autohide-003.html @@ -2,8 +2,10 @@ - Bug 1052123 - Autohide ruby annotations which are identical to their bases - + CSS Test: Autohide ruby annotations which are identical to their bases + + +