Update CSS tests to revision 7a87ef71fc579e52d3438e009107aa442bc4021b

2026-04-29 10:57:43 +02:00 · 2015-10-06 12:33:05 +02:00
parent ad94ef5a96
commit 145aea3eeb
1196 changed files with 14344 additions and 6221 deletions
--- a/tests/wpt/css-tests/css21_dev/xhtml1/adjacent-000.xht
+++ b/tests/wpt/css-tests/css21_dev/xhtml1/adjacent-000.xht
@@ -4,6 +4,7 @@
  <title>CSS Test: Selectors: Adjacent selectors</title>
  <link rel="author" title="Gabriele Romanato" href="mailto:gabriele.romanato@gmail.com"/>
  <link rel="help" href="http://www.w3.org/TR/CSS21/selector.html#adjacent-selectors"/>
+  <link rel="match" href="reference/adjacent-000-ref.xht"/>
  <meta name="flags" content=""/>
  <meta name="assert" content="Browsers should apply each rule to the adjacent element"/>
 <style type="text/css">
--- a/tests/wpt/css-tests/css21_dev/xhtml1/adjacent-001.xht
+++ b/tests/wpt/css-tests/css21_dev/xhtml1/adjacent-001.xht
@@ -4,10 +4,11 @@
  <title>CSS Test: Selectors: Adjacent selectors without the space separator</title>
  <link rel="author" title="Gabriele Romanato" href="mailto:gabriele.romanato@gmail.com"/>
  <link rel="help" href="http://www.w3.org/TR/CSS21/selector.html#adjacent-selectors"/>
+  <link rel="match" href="reference/adjacent-000-ref.xht"/>
  <meta name="flags" content=""/>
  <meta name="assert" content="Browsers should apply each rule to the adjacent element also without the space separator"/>
 <style type="text/css">
-body &gt; p {color: silver}
+body &gt; p {color: gray}

 p+p {color: purple}
 p+div {color: black}
--- a/tests/wpt/css-tests/css21_dev/xhtml1/adjacent-002.xht
+++ b/tests/wpt/css-tests/css21_dev/xhtml1/adjacent-002.xht
@@ -4,10 +4,11 @@
  <title>CSS Test: Selectors: Adjacent selectors with the universal selector</title>
  <link rel="author" title="Gabriele Romanato" href="mailto:gabriele.romanato@gmail.com"/>
  <link rel="help" href="http://www.w3.org/TR/CSS21/selector.html#adjacent-selectors"/>
+  <link rel="match" href="reference/adjacent-000-ref.xht"/>
  <meta name="flags" content=""/>
  <meta name="assert" content="Browsers should apply each rule to the adjacent element when combined with the universal selector"/>
 <style type="text/css">
-body &gt; p {color: silver}
+body &gt; p {color: gray}

 body &gt; p + * {color: purple}
 p + p + *  {color: black}
--- a/tests/wpt/css-tests/css21_dev/xhtml1/chapter-18.xht
+++ b/tests/wpt/css-tests/css21_dev/xhtml1/chapter-18.xht
@@ -13,7 +13,7 @@
 <body>

  <h1>CSS 2.1 Conformance Test Suite</h1>
-  <h2>User interface (357 tests)</h2>
+  <h2>User interface (361 tests)</h2>
  <table width="100%">
    <col id="test-column"></col>
    <col id="refs-column"></col>
@@ -888,7 +888,7 @@
      <tr><th colspan="4" scope="rowgroup">
        <a href="#s18.4">+</a>
        <a href="http://www.w3.org/TR/CSS21/ui.html#dynamic-outlines">18.4 Dynamic outlines: the 'outline' property</a></th></tr>
-      <!-- 310 tests -->
+      <!-- 314 tests -->
      <tr id="outline-001-18.4" class="">
        <td>
            <a href="outline-001.xht">outline-001</a></td>
@@ -3188,6 +3188,50 @@
          </ul>
        </td>
      </tr>
+      <tr id="outline-style-001-18.4" class="">
+        <td>
+            <a href="outline-style-001.xht">outline-style-001</a></td>
+        <td><a href="reference/no-red-filler-text-ref.xht">=</a> </td>
+        <td></td>
+        <td>Outline-style set to 'none'
+          <ul class="assert">
+            <li>Outline style 'none' results in no outline.</li>
+          </ul>
+        </td>
+      </tr>
+      <tr id="outline-style-002-18.4" class="">
+        <td>
+            <a href="outline-style-002.xht">outline-style-002</a></td>
+        <td></td>
+        <td></td>
+        <td>Outline-style set to 'dotted'
+          <ul class="assert">
+            <li>Outline style 'dotted' results in a dotted outline.</li>
+          </ul>
+        </td>
+      </tr>
+      <tr id="outline-style-003-18.4" class="">
+        <td>
+            <a href="outline-style-003.xht">outline-style-003</a></td>
+        <td></td>
+        <td></td>
+        <td>Outline-style set to 'dashed'
+          <ul class="assert">
+            <li>Outline style 'dashed' results in a dashed outline.</li>
+          </ul>
+        </td>
+      </tr>
+      <tr id="outline-style-004-18.4" class="">
+        <td>
+            <a href="outline-style-004.xht">outline-style-004</a></td>
+        <td></td>
+        <td></td>
+        <td>Outline-style set to 'solid'
+          <ul class="assert">
+            <li>Outline style 'solid' results in a solid outline.</li>
+          </ul>
+        </td>
+      </tr>
      <tr id="outline-style-005-18.4" class="">
        <td>
            <a href="outline-style-005.xht">outline-style-005</a></td>
@@ -6452,7 +6496,51 @@
      </tr>
    </tbody>
    <tbody id="s18.4.#propdef-outline-style">
-      <!-- 21 tests -->
+      <!-- 25 tests -->
+      <tr id="outline-style-001-18.4.#propdef-outline-style" class="primary">
+        <td><strong>
+            <a href="outline-style-001.xht">outline-style-001</a></strong></td>
+        <td><a href="reference/no-red-filler-text-ref.xht">=</a> </td>
+        <td></td>
+        <td>Outline-style set to 'none'
+          <ul class="assert">
+            <li>Outline style 'none' results in no outline.</li>
+          </ul>
+        </td>
+      </tr>
+      <tr id="outline-style-002-18.4.#propdef-outline-style" class="primary">
+        <td><strong>
+            <a href="outline-style-002.xht">outline-style-002</a></strong></td>
+        <td></td>
+        <td></td>
+        <td>Outline-style set to 'dotted'
+          <ul class="assert">
+            <li>Outline style 'dotted' results in a dotted outline.</li>
+          </ul>
+        </td>
+      </tr>
+      <tr id="outline-style-003-18.4.#propdef-outline-style" class="primary">
+        <td><strong>
+            <a href="outline-style-003.xht">outline-style-003</a></strong></td>
+        <td></td>
+        <td></td>
+        <td>Outline-style set to 'dashed'
+          <ul class="assert">
+            <li>Outline style 'dashed' results in a dashed outline.</li>
+          </ul>
+        </td>
+      </tr>
+      <tr id="outline-style-004-18.4.#propdef-outline-style" class="primary">
+        <td><strong>
+            <a href="outline-style-004.xht">outline-style-004</a></strong></td>
+        <td></td>
+        <td></td>
+        <td>Outline-style set to 'solid'
+          <ul class="assert">
+            <li>Outline style 'solid' results in a solid outline.</li>
+          </ul>
+        </td>
+      </tr>
      <tr id="outline-style-005-18.4.#propdef-outline-style" class="primary">
        <td><strong>
            <a href="outline-style-005.xht">outline-style-005</a></strong></td>
--- a/tests/wpt/css-tests/css21_dev/xhtml1/chapter-5.xht
+++ b/tests/wpt/css-tests/css21_dev/xhtml1/chapter-5.xht
@@ -408,7 +408,7 @@
      <tr id="descendent-selector-007-5.5" class="primary">
        <td><strong>
            <a href="descendent-selector-007.xht">descendent-selector-007</a></strong></td>
-        <td></td>
+        <td><a href="reference/descendent-selector-002-ref.xht">=</a> </td>
        <td></td>
        <td>Grandchild selection
          <ul class="assert">
@@ -419,7 +419,7 @@
      <tr id="descendent-selector-008-5.5" class="primary">
        <td><strong>
            <a href="descendent-selector-008.xht">descendent-selector-008</a></strong></td>
-        <td></td>
+        <td><a href="reference/descendent-selector-004-ref.xht">=</a> </td>
        <td></td>
        <td>Descendent selector with ID attribute does not match elements without the ID attribute
          <ul class="assert">
@@ -430,7 +430,7 @@
      <tr id="descendent-selector-009-5.5" class="primary">
        <td><strong>
            <a href="descendent-selector-009.xht">descendent-selector-009</a></strong></td>
-        <td></td>
+        <td><a href="reference/descendent-selector-002-ref.xht">=</a> </td>
        <td></td>
        <td>Descendent selector with ID attribute
          <ul class="assert">
@@ -441,7 +441,7 @@
      <tr id="descendent-selector-010-5.5" class="primary">
        <td><strong>
            <a href="descendent-selector-010.xht">descendent-selector-010</a></strong></td>
-        <td></td>
+        <td><a href="reference/descendent-selector-002-ref.xht">=</a> </td>
        <td></td>
        <td>Descendent selector and tabs
          <ul class="assert">
@@ -452,7 +452,7 @@
      <tr id="descendent-selector-011-5.5" class="primary">
        <td><strong>
            <a href="descendent-selector-011.xht">descendent-selector-011</a></strong></td>
-        <td></td>
+        <td><a href="reference/descendent-selector-002-ref.xht">=</a> </td>
        <td></td>
        <td>Descendent selector and newlines
          <ul class="assert">
@@ -472,7 +472,7 @@
      <tr id="child-selector-001-5.6" class="primary">
        <td><strong>
            <a href="child-selector-001.xht">child-selector-001</a></strong></td>
-        <td></td>
+        <td><a href="reference/child-selector-001-ref.xht">=</a> </td>
        <td></td>
        <td>Child selector does not match when there is no matching parent
          <ul class="assert">
@@ -483,7 +483,7 @@
      <tr id="child-selector-002-5.6" class="primary">
        <td><strong>
            <a href="child-selector-002.xht">child-selector-002</a></strong></td>
-        <td></td>
+        <td><a href="reference/child-selector-002-ref.xht">=</a> </td>
        <td></td>
        <td>Child selector without direct child
          <ul class="assert">
@@ -494,7 +494,7 @@
      <tr id="child-selector-003-5.6" class="primary">
        <td><strong>
            <a href="child-selector-003.xht">child-selector-003</a></strong></td>
-        <td></td>
+        <td><a href="reference/child-selector-003-ref.xht">=</a> </td>
        <td></td>
        <td>Child selector
          <ul class="assert">
@@ -514,7 +514,7 @@
      <tr id="adjacent-000-5.7" class="primary">
        <td><strong>
            <a href="adjacent-000.xht">adjacent-000</a></strong></td>
-        <td></td>
+        <td><a href="reference/adjacent-000-ref.xht">=</a> </td>
        <td></td>
        <td>Selectors: Adjacent selectors
          <ul class="assert">
@@ -525,7 +525,7 @@
      <tr id="adjacent-001-5.7" class="primary">
        <td><strong>
            <a href="adjacent-001.xht">adjacent-001</a></strong></td>
-        <td></td>
+        <td><a href="reference/adjacent-000-ref.xht">=</a> </td>
        <td></td>
        <td>Selectors: Adjacent selectors without the space separator
          <ul class="assert">
@@ -536,7 +536,7 @@
      <tr id="adjacent-002-5.7" class="primary">
        <td><strong>
            <a href="adjacent-002.xht">adjacent-002</a></strong></td>
-        <td></td>
+        <td><a href="reference/adjacent-000-ref.xht">=</a> </td>
        <td></td>
        <td>Selectors: Adjacent selectors with the universal selector
          <ul class="assert">
@@ -591,7 +591,7 @@
      <tr id="dynamic-sibling-combinator-001-5.7" class="primary dom">
        <td><strong>
            <a href="dynamic-sibling-combinator-001.xht">dynamic-sibling-combinator-001</a></strong></td>
-        <td></td>
+        <td><a href="reference/dynamic-sibling-combinator-001-ref.xht">=</a> </td>
        <td><abbr class="dom" title="Requires Document Object Model support">DOM/JS</abbr></td>
        <td>Testing dynamic changes and the '+' combinator
          <ul class="assert">
@@ -635,7 +635,7 @@
      <tr id="sibling-selector-001-5.7" class="primary">
        <td><strong>
            <a href="sibling-selector-001.xht">sibling-selector-001</a></strong></td>
-        <td></td>
+        <td><a href="reference/sibling-selector-001-ref.xht">=</a> </td>
        <td></td>
        <td>Simple sibling selector
          <ul class="assert">
@@ -657,7 +657,7 @@
      <tr id="sibling-selector-003-5.7" class="primary">
        <td><strong>
            <a href="sibling-selector-003.xht">sibling-selector-003</a></strong></td>
-        <td></td>
+        <td><a href="reference/sibling-selector-003-ref.xht">=</a> </td>
        <td></td>
        <td>Sibling selector with non element node
          <ul class="assert">
@@ -861,7 +861,7 @@
      <tr id="dynamic-sibling-combinator-001-5.8" class="dom">
        <td>
            <a href="dynamic-sibling-combinator-001.xht">dynamic-sibling-combinator-001</a></td>
-        <td></td>
+        <td><a href="reference/dynamic-sibling-combinator-001-ref.xht">=</a> </td>
        <td><abbr class="dom" title="Requires Document Object Model support">DOM/JS</abbr></td>
        <td>Testing dynamic changes and the '+' combinator
          <ul class="assert">
--- a/tests/wpt/css-tests/css21_dev/xhtml1/chapter-8.xht
+++ b/tests/wpt/css-tests/css21_dev/xhtml1/chapter-8.xht
@@ -41823,10 +41823,10 @@
    </tbody>
    <tbody id="s8.5.3.#value-def-border-style">
      <!-- 4 tests -->
-      <tr id="outline-style-001-8.5.3.#value-def-border-style" class="">
+      <tr id="outline-style-011-8.5.3.#value-def-border-style" class="">
        <td>
-            <a href="outline-style-001.xht">outline-style-001</a></td>
-        <td><a href="reference/outline-style-001-ref.xht">=</a> </td>
+            <a href="outline-style-011.xht">outline-style-011</a></td>
+        <td><a href="reference/outline-style-011-ref.xht">=</a> </td>
        <td></td>
        <td>outline-style - dotted (basic)
          <ul class="assert">
@@ -41834,10 +41834,10 @@
          </ul>
        </td>
      </tr>
-      <tr id="outline-style-002-8.5.3.#value-def-border-style" class="">
+      <tr id="outline-style-012-8.5.3.#value-def-border-style" class="">
        <td>
-            <a href="outline-style-002.xht">outline-style-002</a></td>
-        <td><a href="reference/outline-style-002-ref.xht">=</a> </td>
+            <a href="outline-style-012.xht">outline-style-012</a></td>
+        <td><a href="reference/outline-style-012-ref.xht">=</a> </td>
        <td></td>
        <td>outline-style - inherit (basic)
          <ul class="assert">
@@ -41845,10 +41845,10 @@
          </ul>
        </td>
      </tr>
-      <tr id="outline-style-003-8.5.3.#value-def-border-style" class="">
+      <tr id="outline-style-013-8.5.3.#value-def-border-style" class="">
        <td>
-            <a href="outline-style-003.xht">outline-style-003</a></td>
-        <td><a href="reference/outline-style-003-ref.xht">=</a> </td>
+            <a href="outline-style-013.xht">outline-style-013</a></td>
+        <td><a href="reference/outline-style-013-ref.xht">=</a> </td>
        <td></td>
        <td>outline-style - dashed (basic)
          <ul class="assert">
@@ -41856,10 +41856,10 @@
          </ul>
        </td>
      </tr>
-      <tr id="outline-style-004-8.5.3.#value-def-border-style" class="">
+      <tr id="outline-style-014-8.5.3.#value-def-border-style" class="">
        <td>
-            <a href="outline-style-004.xht">outline-style-004</a></td>
-        <td><a href="reference/outline-style-004-ref.xht">=</a> </td>
+            <a href="outline-style-014.xht">outline-style-014</a></td>
+        <td><a href="reference/outline-style-014-ref.xht">=</a> </td>
        <td></td>
        <td>outline-style - double (basic)
          <ul class="assert">
--- a/tests/wpt/css-tests/css21_dev/xhtml1/chapter-9.xht
+++ b/tests/wpt/css-tests/css21_dev/xhtml1/chapter-9.xht
@@ -13,7 +13,7 @@
 <body>

  <h1>CSS 2.1 Conformance Test Suite</h1>
-  <h2>Visual formatting model (1245 tests)</h2>
+  <h2>Visual formatting model (1244 tests)</h2>
  <table width="100%">
    <col id="test-column"></col>
    <col id="refs-column"></col>
@@ -1338,7 +1338,7 @@
      <tr><th colspan="4" scope="rowgroup">
        <a href="#s9.2.2">+</a>
        <a href="http://www.w3.org/TR/CSS21/visuren.html#inline-boxes">9.2.2 Inline-level elements and inline boxes</a></th></tr>
-      <!-- 19 tests -->
+      <!-- 18 tests -->
      <tr id="inline-block-alignment-002-9.2.2" class="ahem">
        <td>
            <a href="inline-block-alignment-002.xht">inline-block-alignment-002</a></td>
@@ -1405,17 +1405,6 @@
          </ul>
        </td>
      </tr>
-      <tr id="inline-block-alignment-008-9.2.2" class="ahem">
-        <td>
-            <a href="inline-block-alignment-008.xht">inline-block-alignment-008</a></td>
-        <td><a href="reference/inline-block-alignment-006-ref.xht">=</a> </td>
-        <td><abbr class="ahem" title="Requires Ahem font">Ahem</abbr></td>
-        <td>inline block alignment - alphabetical alignment with vertical layout
-          <ul class="assert">
-            <li>This test checks the generation of inline-block baseline. When 'writing-mode' is 'vertical-rl' and when 'text-orientation' is 'sideways-right', then the alphabetical baseline is used as the dominant baseline.</li>
-          </ul>
-        </td>
-      </tr>
      <tr id="inlines-002-9.2.2" class="primary">
        <td><strong>
            <a href="inlines-002.xht">inlines-002</a></strong></td>
--- a/tests/wpt/css-tests/css21_dev/xhtml1/child-selector-001.xht
+++ b/tests/wpt/css-tests/css21_dev/xhtml1/child-selector-001.xht
@@ -4,6 +4,7 @@
        <title>CSS Test: Child selector does not match when there is no matching parent</title>
        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
        <link rel="help" href="http://www.w3.org/TR/CSS21/selector.html#child-selectors" />
+        <link rel="match" href="reference/child-selector-001-ref.xht" />
        <meta name="flags" content="" />
        <meta name="assert" content="Child selectors only apply when parent and child elements match." />
        <style type="text/css">
--- a/tests/wpt/css-tests/css21_dev/xhtml1/child-selector-002.xht
+++ b/tests/wpt/css-tests/css21_dev/xhtml1/child-selector-002.xht
@@ -4,6 +4,7 @@
        <title>CSS Test: Child selector without direct child</title>
        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
        <link rel="help" href="http://www.w3.org/TR/CSS21/selector.html#child-selectors" />
+        <link rel="match" href="reference/child-selector-002-ref.xht" />
        <meta name="flags" content="" />
        <meta name="assert" content="Child selectors only apply to child elements when there is a direct parent child relationship." />
        <style type="text/css">
--- a/tests/wpt/css-tests/css21_dev/xhtml1/child-selector-003.xht
+++ b/tests/wpt/css-tests/css21_dev/xhtml1/child-selector-003.xht
@@ -4,6 +4,7 @@
        <title>CSS Test: Child selector</title>
        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
        <link rel="help" href="http://www.w3.org/TR/CSS21/selector.html#child-selectors" />
+        <link rel="match" href="reference/child-selector-003-ref.xht" />
        <meta name="flags" content="" />
        <meta name="assert" content="Child selectors apply to child elements." />
        <style type="text/css">
--- a/tests/wpt/css-tests/css21_dev/xhtml1/descendent-selector-007.xht
+++ b/tests/wpt/css-tests/css21_dev/xhtml1/descendent-selector-007.xht
@@ -4,6 +4,7 @@
        <title>CSS Test: Grandchild selection</title>
        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
        <link rel="help" href="http://www.w3.org/TR/CSS21/selector.html#descendant-selectors" />
+        <link rel="match" href="reference/descendent-selector-002-ref.xht" />
        <meta name="flags" content="" />
        <meta name="assert" content="Grandchild selection is applied only to elements which are grandchildren." />
        <style type="text/css">
--- a/tests/wpt/css-tests/css21_dev/xhtml1/descendent-selector-008.xht
+++ b/tests/wpt/css-tests/css21_dev/xhtml1/descendent-selector-008.xht
@@ -4,6 +4,7 @@
        <title>CSS Test: Descendent selector with ID attribute does not match elements without the ID attribute</title>
        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
        <link rel="help" href="http://www.w3.org/TR/CSS21/selector.html#descendant-selectors" />
+        <link rel="match" href="reference/descendent-selector-004-ref.xht" />
        <meta name="flags" content="" />
        <meta name="assert" content="Descendent selector with attribute applies only to applicable elements." />
        <style type="text/css">
--- a/tests/wpt/css-tests/css21_dev/xhtml1/descendent-selector-009.xht
+++ b/tests/wpt/css-tests/css21_dev/xhtml1/descendent-selector-009.xht
@@ -4,6 +4,7 @@
        <title>CSS Test: Descendent selector with ID attribute</title>
        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
        <link rel="help" href="http://www.w3.org/TR/CSS21/selector.html#descendant-selectors" />
+        <link rel="match" href="reference/descendent-selector-002-ref.xht" />
        <meta name="flags" content="" />
        <meta name="assert" content="Descendent selector with attribute applies only to applicable elements." />
        <style type="text/css">
--- a/tests/wpt/css-tests/css21_dev/xhtml1/descendent-selector-010.xht
+++ b/tests/wpt/css-tests/css21_dev/xhtml1/descendent-selector-010.xht
@@ -4,6 +4,7 @@
        <title>CSS Test: Descendent selector and tabs</title>
        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
        <link rel="help" href="http://www.w3.org/TR/CSS21/selector.html#descendant-selectors" />
+        <link rel="match" href="reference/descendent-selector-002-ref.xht" />
        <meta name="flags" content="" />
        <meta name="assert" content="A descendant selector can be separated by a tab." />
        <style type="text/css">
--- a/tests/wpt/css-tests/css21_dev/xhtml1/descendent-selector-011.xht
+++ b/tests/wpt/css-tests/css21_dev/xhtml1/descendent-selector-011.xht
@@ -4,6 +4,7 @@
        <title>CSS Test: Descendent selector and newlines</title>
        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
        <link rel="help" href="http://www.w3.org/TR/CSS21/selector.html#descendant-selectors" />
+        <link rel="match" href="reference/descendent-selector-002-ref.xht" />
        <meta name="flags" content="" />
        <meta name="assert" content="A descendant selector can be separated by a newline." />
        <style type="text/css">
--- a/tests/wpt/css-tests/css21_dev/xhtml1/dynamic-sibling-combinator-001.xht
+++ b/tests/wpt/css-tests/css21_dev/xhtml1/dynamic-sibling-combinator-001.xht
@@ -6,6 +6,7 @@
  <link rel="reviewer" title="Elika J. Etemad" href="http://fantasai.inkedblade.net/contact" />
  <link rel="help" href="http://www.w3.org/TR/CSS21/selector.html#adjacent-selectors" />
  <link rel="help" href="http://www.w3.org/TR/CSS21/selector.html#attribute-selectors" />
+  <link rel="match" href="reference/dynamic-sibling-combinator-001-ref.xht" />
  <meta name="flags" content="dom" />
  <meta name="assert" content="Dynamically changing an attribute should cause selectors using '+' to match as needed." />
  <style type="text/css"><![CDATA[
--- a/tests/wpt/css-tests/css21_dev/xhtml1/inline-block-alignment-002.xht
+++ b/tests/wpt/css-tests/css21_dev/xhtml1/inline-block-alignment-002.xht
@@ -3,7 +3,7 @@
  <head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
    <title>CSS Writing Modes Test: inline-block alignment - central alignment with vertical layout</title>
    <link rel="author" title="Hajime Shiozawa" href="mailto:hajime.shiozawa@gmail.com" />
-    <link rel="reviewer" title="Gerard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2015-07-20 -->
+    <link rel="reviewer" title="Gerard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2015-09-26 -->
    <link rel="help" title="CSS3 Writing modes: 4.3. Atomic Inline Baseline" href="http://www.w3.org/TR/css-writing-modes-3/#replaced-baselines" />
    <link rel="help" title="CSS2.1 9.2.2 Inline-level elements and inline boxes" href="http://www.w3.org/TR/CSS21/visuren.html#inline-boxes" />
    <link rel="match" href="reference/inline-block-alignment-002-ref.xht" />
@@ -14,7 +14,6 @@
    {
      color: orange;
      font: 60px/1 Ahem; /* computes to 60px/60px */
-      height: 4em;
      writing-mode: vertical-rl;
      text-orientation: mixed;
    }
--- a/tests/wpt/css-tests/css21_dev/xhtml1/inline-block-alignment-003.xht
+++ b/tests/wpt/css-tests/css21_dev/xhtml1/inline-block-alignment-003.xht
@@ -3,7 +3,7 @@
  <head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
    <title>CSS Writing Modes Test: inline-block alignment - central alignment with vertical layout</title>
    <link rel="author" title="Hajime Shiozawa" href="mailto:hajime.shiozawa@gmail.com" />
-    <link rel="reviewer" title="Gerard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2015-07-20 -->
+    <link rel="reviewer" title="Gerard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2015-09-26 -->
    <link rel="help" title="CSS3 Writing modes: 4.3. Atomic Inline Baseline" href="http://www.w3.org/TR/css-writing-modes-3/#replaced-baselines" />
    <link rel="help" title="CSS2.1 9.2.2 Inline-level elements and inline boxes" href="http://www.w3.org/TR/CSS21/visuren.html#inline-boxes" />
    <link rel="match" href="reference/inline-block-alignment-003-ref.xht" />
@@ -14,7 +14,6 @@
    {
      color: orange;
      font: 60px/1 Ahem; /* computes to 60px/60px */
-      height: 4em;
      writing-mode: vertical-lr;
      text-orientation: mixed;
    }
--- a/tests/wpt/css-tests/css21_dev/xhtml1/inline-block-alignment-004.xht
+++ b/tests/wpt/css-tests/css21_dev/xhtml1/inline-block-alignment-004.xht
@@ -3,7 +3,7 @@
  <head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
    <title>CSS Writing Modes Test: inline-block alignment - central alignment with vertical layout</title>
    <link rel="author" title="Hajime Shiozawa" href="mailto:hajime.shiozawa@gmail.com" />
-    <link rel="reviewer" title="Gerard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2015-07-20 -->
+    <link rel="reviewer" title="Gerard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2015-09-26 -->
    <link rel="help" title="CSS3 Writing modes: 4.3. Atomic Inline Baseline" href="http://www.w3.org/TR/css-writing-modes-3/#replaced-baselines" />
    <link rel="help" title="CSS2.1 9.2.2 Inline-level elements and inline boxes" href="http://www.w3.org/TR/CSS21/visuren.html#inline-boxes" />
    <link rel="match" href="reference/inline-block-alignment-002-ref.xht" />
@@ -14,7 +14,6 @@
    {
      color: orange;
      font: 60px/1 Ahem; /* computes to 60px/60px */
-      height: 4em;
      writing-mode: vertical-rl;
      text-orientation: upright;
    }
--- a/tests/wpt/css-tests/css21_dev/xhtml1/inline-block-alignment-005.xht
+++ b/tests/wpt/css-tests/css21_dev/xhtml1/inline-block-alignment-005.xht
@@ -3,7 +3,7 @@
  <head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
    <title>CSS Writing Modes Test: inline-block alignment - central alignment with vertical layout</title>
    <link rel="author" title="Hajime Shiozawa" href="mailto:hajime.shiozawa@gmail.com" />
-    <link rel="reviewer" title="Gerard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2015-07-20 -->
+    <link rel="reviewer" title="Gerard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2015-09-26 -->
    <link rel="help" title="CSS3 Writing modes: 4.3. Atomic Inline Baseline" href="http://www.w3.org/TR/css-writing-modes-3/#replaced-baselines" />
    <link rel="help" title="CSS2.1 9.2.2 Inline-level elements and inline boxes" href="http://www.w3.org/TR/CSS21/visuren.html#inline-boxes" />
    <link rel="match" href="reference/inline-block-alignment-003-ref.xht" />
@@ -14,7 +14,6 @@
    {
      color: orange;
      font: 60px/1 Ahem; /* computes to 60px/60px */
-      height: 4em;
      writing-mode: vertical-lr;
      text-orientation: upright;
    }
--- a/tests/wpt/css-tests/css21_dev/xhtml1/inline-block-alignment-006.xht
+++ b/tests/wpt/css-tests/css21_dev/xhtml1/inline-block-alignment-006.xht
@@ -3,7 +3,7 @@
  <head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
    <title>CSS Writing Modes Test: inline block alignment - alphabetical alignment with vertical layout</title>
    <link rel="author" title="Hajime Shiozawa" href="mailto:hajime.shiozawa@gmail.com" />
-    <link rel="reviewer" title="Gerard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2015-07-21 -->
+    <link rel="reviewer" title="Gerard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2015-09-26 -->
    <link rel="help" title="CSS3 Writing modes: 4.3. Atomic Inline Baseline" href="http://www.w3.org/TR/css-writing-modes-3/#replaced-baselines" />
    <link rel="help" title="CSS2.1 9.2.2 Inline-level elements and inline boxes" href="http://www.w3.org/TR/CSS21/visuren.html#inline-boxes" />
    <link rel="match" href="reference/inline-block-alignment-006-ref.xht" />
@@ -14,7 +14,6 @@
    {
      color: fuchsia;
      font: 60px/1 Ahem; /* computes to 60px/60px */
-      height: 4em;
      writing-mode: vertical-rl;
      text-orientation: sideways;
    }
--- a/tests/wpt/css-tests/css21_dev/xhtml1/inline-block-alignment-007.xht
+++ b/tests/wpt/css-tests/css21_dev/xhtml1/inline-block-alignment-007.xht
@@ -3,6 +3,7 @@
  <head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
    <title>CSS Writing Modes Test: inline block alignment - alphabetical alignment with vertical layout</title>
    <link rel="author" title="Hajime Shiozawa" href="mailto:hajime.shiozawa@gmail.com" />
+    <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2015-09-26 -->
    <link rel="help" title="CSS3 Writing modes: 4.3. Atomic Inline Baseline" href="http://www.w3.org/TR/css-writing-modes-3/#replaced-baselines" />
    <link rel="help" title="CSS2.1 9.2.2 Inline-level elements and inline boxes" href="http://www.w3.org/TR/CSS21/visuren.html#inline-boxes" />
    <link rel="match" href="reference/inline-block-alignment-006-ref.xht" />
@@ -13,7 +14,6 @@
    {
      color: fuchsia;
      font: 60px/1 Ahem; /* computes to 60px/60px */
-      height: 4em;
      writing-mode: vertical-lr;
      text-orientation: sideways;
    }
--- a/tests/wpt/css-tests/css21_dev/xhtml1/inline-block-alignment-008.xht
+++ b/tests/wpt/css-tests/css21_dev/xhtml1/inline-block-alignment-008.xht
@@ -1,61 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-  <head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-    <title>CSS Writing Modes Test: inline block alignment - alphabetical alignment with vertical layout</title>
-    <link rel="author" title="Hajime Shiozawa" href="mailto:hajime.shiozawa@gmail.com" />
-    <link rel="reviewer" title="Gerard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2015-07-21 -->
-    <link rel="help" title="CSS3 Writing modes: 4.3. Atomic Inline Baseline" href="http://www.w3.org/TR/css-writing-modes-3/#replaced-baselines" />
-    <link rel="help" title="CSS2.1 9.2.2 Inline-level elements and inline boxes" href="http://www.w3.org/TR/CSS21/visuren.html#inline-boxes" />
-    <link rel="match" href="reference/inline-block-alignment-006-ref.xht" />
-    <meta name="assert" content="This test checks the generation of inline-block baseline. When 'writing-mode' is 'vertical-rl' and when 'text-orientation' is 'sideways-right', then the alphabetical baseline is used as the dominant baseline." />
-    <meta name="flags" content="ahem" />
-    <style type="text/css"><![CDATA[
-    div#rl-sideways-right
-    {
-      color: fuchsia;
-      font: 60px/1 Ahem; /* computes to 60px/60px */
-      height: 4em;
-      writing-mode: vertical-rl;
-      text-orientation: sideways-right;
-    }
-
-    div#inline-block
-    {
-      display: inline-block;
-      padding-left: 0.5em; /* computes to 60px */
-      font-size: 2em; /* computes to 120px */
-      /*
-        such padding-left declaration is arbitrary and only serve to make the
-        test a bit more challenging.
-      */
-    }
-
-    span.block-descendant
-    {
-      display: block;
-    }
-
-    span#fuchsia30
-    {
-      padding-right: 4em; /* computes to 120px */
-      font-size: 0.5em; /* computes to 30px */
-      /*
-        such padding-right declaration is arbitrary and only serve to make the
-        test a bit more challenging.
-      */
-    }
-    ]]></style>
-
-  </head>
-
-  <body>
-
-  <p>Test passes if the <strong>left edge</strong> of an irregular polygon is straight and unbroken.</p>
-
-  <div id="rl-sideways-right">É<div id="inline-block">
-    <span class="block-descendant">B</span>
-    <span class="block-descendant last-line-box">É</span>
-  </div><span id="fuchsia30">É</span></div>
-
-  </body>
-</html>
--- a/tests/wpt/css-tests/css21_dev/xhtml1/outline-style-001.xht
+++ b/tests/wpt/css-tests/css21_dev/xhtml1/outline-style-001.xht
@@ -1,25 +1,23 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml"><head><meta charset="utf-8" />
-<title>CSS Basic User Interface Test: outline-style - dotted (basic)</title>
-<link href="http://www.intel.com/" rel="author" title="Intel" />
-<link href="mailto:shiyoux.tan@intel.com" rel="author" title="Shiyou Tan" />
-<link href="http://www.w3.org/TR/css3-ui/#outline-style" rel="help" title="7.3. 'outline-style' property" />
-<link href="http://www.w3.org/TR/CSS21/box.html#value-def-border-style" rel="help" />
-<link href="reference/outline-style-001-ref.xht" rel="match" />
-<meta content="" name="flags" />
-<meta content="Test checks that the outline style is dotted when outline-style set dotted" name="assert" />
-<style>
-  #test {
-    height: 100px;
-    margin: 30px;
-    outline-color: green;
-    outline-style: dotted;
-    outline-width: 4px;
-    width: 100px;
-  }
-</style>
-</head><body>
-  <p>Test passes if there is a blank square with <strong>a green dotted</strong> border.</p>
-  <div id="test"></div>
-
-</body></html>
+<html xmlns="http://www.w3.org/1999/xhtml">
+    <head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+        <title>CSS Test: Outline-style set to 'none'</title>
+        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
+        <link rel="help" href="http://www.w3.org/TR/CSS21/ui.html#propdef-outline-style" />
+        <link rel="help" href="http://www.w3.org/TR/CSS21/ui.html#dynamic-outlines" />
+        <link rel="match" href="reference/no-red-filler-text-ref.xht" />
+        <meta name="flags" content="" />
+        <meta name="assert" content="Outline style 'none' results in no outline." />
+        <style type="text/css">
+            div
+            {
+                outline-style: none;
+                outline-color: red;
+            }
+        </style>
+    </head>
+    <body>
+        <p>Test passes if there is no red visible on the page.</p>
+        <div>Filler Text</div>
+    </body>
+</html>
--- a/tests/wpt/css-tests/css21_dev/xhtml1/outline-style-002.xht
+++ b/tests/wpt/css-tests/css21_dev/xhtml1/outline-style-002.xht
@@ -1,35 +1,24 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml"><head><meta charset="utf-8" />
-<title>CSS Basic User Interface Test: outline-style - inherit (basic)</title>
-<link href="http://www.intel.com/" rel="author" title="Intel" />
-<link href="mailto:shiyoux.tan@intel.com" rel="author" title="Shiyou Tan" />
-<link href="http://www.w3.org/TR/css3-ui/#outline-style" rel="help" title="7.3. 'outline-style' property" />
-<link href="http://www.w3.org/TR/CSS21/box.html#value-def-border-style" rel="help" />
-<link href="reference/outline-style-002-ref.xht" rel="match" />
-<meta content="" name="flags" />
-<meta content="Test checks that the sub element outline style is same as parent element outline style when outline-style set inherit" name="assert" />
-<style>
-  #parent {
-    height: 110px;
-    margin: 30px;
-    outline-color: blue;
-    outline-style: dotted;
-    outline-width: 4px;
-    padding: 20px;
-    width: 110px;
-  }
-  #child {
-    height: 110px;
-    outline-color: green;
-    outline-style: inherit;
-    outline-width: 4px;
-    width: 110px;
-  }
-</style>
-</head><body>
-  <p>Test passes if there is a blank square with <strong>a green dotted</strong> border centered inside a blue dotted border.</p>
-  <div id="parent">
-    <div id="child"></div>
-  </div>
-
-</body></html>
+<html xmlns="http://www.w3.org/1999/xhtml">
+    <head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+        <title>CSS Test: Outline-style set to 'dotted'</title>
+        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
+        <link rel="help" href="http://www.w3.org/TR/CSS21/ui.html#propdef-outline-style" />
+        <link rel="help" href="http://www.w3.org/TR/CSS21/ui.html#dynamic-outlines" />
+        <meta name="flags" content="" />
+        <meta name="assert" content="Outline style 'dotted' results in a dotted outline." />
+        <style type="text/css">
+            div
+            {
+                height: 1in;
+                outline-style: dotted;
+                outline-color: blue;
+                width: 1in;
+            }
+        </style>
+    </head>
+    <body>
+        <p>Test passes if there is a dotted box below.</p>
+        <div></div>
+    </body>
+</html>
--- a/tests/wpt/css-tests/css21_dev/xhtml1/outline-style-003.xht
+++ b/tests/wpt/css-tests/css21_dev/xhtml1/outline-style-003.xht
@@ -1,25 +1,24 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml"><head><meta charset="utf-8" />
-<title>CSS Basic User Interface Test: outline-style - dashed (basic)</title>
-<link href="http://www.intel.com/" rel="author" title="Intel" />
-<link href="mailto:shiyoux.tan@intel.com" rel="author" title="Shiyou Tan" />
-<link href="http://www.w3.org/TR/css3-ui/#outline-style" rel="help" title="7.3. 'outline-style' property" />
-<link href="http://www.w3.org/TR/CSS21/box.html#value-def-border-style" rel="help" />
-<link href="reference/outline-style-003-ref.xht" rel="match" />
-<meta content="" name="flags" />
-<meta content="Test checks that the outline style is dashed when outline-style set dashed" name="assert" />
-<style>
-  #test {
-    height: 150px;
-    margin: 30px;
-    outline-color: green;
-    outline-style: dashed;
-    outline-width: 2px;
-    width: 150px;
-  }
-</style>
-</head><body>
-  <p>Test passes if there is a blank square whose border is <strong>green dashed</strong>.</p>
-  <div id="test"></div>
-
-</body></html>
+<html xmlns="http://www.w3.org/1999/xhtml">
+    <head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+        <title>CSS Test: Outline-style set to 'dashed'</title>
+        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
+        <link rel="help" href="http://www.w3.org/TR/CSS21/ui.html#propdef-outline-style" />
+        <link rel="help" href="http://www.w3.org/TR/CSS21/ui.html#dynamic-outlines" />
+        <meta name="flags" content="" />
+        <meta name="assert" content="Outline style 'dashed' results in a dashed outline." />
+        <style type="text/css">
+            div
+            {
+                height: 1in;
+                outline-style: dashed;
+                outline-color: blue;
+                width: 1in;
+            }
+        </style>
+    </head>
+    <body>
+        <p>Test passes if there is a dashed box below.</p>
+        <div>Filler Text</div>
+    </body>
+</html>
--- a/tests/wpt/css-tests/css21_dev/xhtml1/outline-style-004.xht
+++ b/tests/wpt/css-tests/css21_dev/xhtml1/outline-style-004.xht
@@ -1,25 +1,24 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml"><head><meta charset="utf-8" />
-<title>CSS Basic User Interface Test: outline-style - double (basic)</title>
-<link href="http://www.intel.com/" rel="author" title="Intel" />
-<link href="mailto:shiyoux.tan@intel.com" rel="author" title="Shiyou Tan" />
-<link href="http://www.w3.org/TR/css3-ui/#outline-style" rel="help" title="7.3. 'outline-style' property" />
-<link href="http://www.w3.org/TR/CSS21/box.html#value-def-border-style" rel="help" />
-<link href="reference/outline-style-004-ref.xht" rel="match" />
-<meta content="" name="flags" />
-<meta content="Test checks that the outline style is two solid lines when outline-style set double" name="assert" />
-<style>
-  #test {
-    height: 150px;
-    margin: 30px;
-    outline-color: green;
-    outline-style: double;
-    outline-width: 4px;
-    width: 150px;
-  }
-</style>
-</head><body>
-  <p>Test passes if there is a blank square whose border is <strong>two green solid lines</strong>.</p>
-  <div id="test"></div>
-
-</body></html>
+<html xmlns="http://www.w3.org/1999/xhtml">
+    <head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+        <title>CSS Test: Outline-style set to 'solid'</title>
+        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
+        <link rel="help" href="http://www.w3.org/TR/CSS21/ui.html#propdef-outline-style" />
+        <link rel="help" href="http://www.w3.org/TR/CSS21/ui.html#dynamic-outlines" />
+        <meta name="flags" content="" />
+        <meta name="assert" content="Outline style 'solid' results in a solid outline." />
+        <style type="text/css">
+            div
+            {
+                height: 1in;
+                outline-style: solid;
+                outline-color: blue;
+                width: 1in;
+            }
+        </style>
+    </head>
+    <body>
+        <p>Test passes if there is a box below.</p>
+        <div></div>
+    </body>
+</html>
--- a/tests/wpt/css-tests/css21_dev/xhtml1/outline-style-011.xht
+++ b/tests/wpt/css-tests/css21_dev/xhtml1/outline-style-011.xht
@@ -0,0 +1,25 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml"><head><meta charset="utf-8" />
+<title>CSS Basic User Interface Test: outline-style - dotted (basic)</title>
+<link href="http://www.intel.com/" rel="author" title="Intel" />
+<link href="mailto:shiyoux.tan@intel.com" rel="author" title="Shiyou Tan" />
+<link href="http://www.w3.org/TR/css3-ui/#outline-style" rel="help" title="7.3. 'outline-style' property" />
+<link href="http://www.w3.org/TR/CSS21/box.html#value-def-border-style" rel="help" />
+<link href="reference/outline-style-011-ref.xht" rel="match" />
+<meta content="" name="flags" />
+<meta content="Test checks that the outline style is dotted when outline-style set dotted" name="assert" />
+<style>
+  #test {
+    height: 100px;
+    margin: 30px;
+    outline-color: green;
+    outline-style: dotted;
+    outline-width: 4px;
+    width: 100px;
+  }
+</style>
+</head><body>
+  <p>Test passes if there is a blank square with <strong>a green dotted</strong> border.</p>
+  <div id="test"></div>
+
+</body></html>
--- a/tests/wpt/css-tests/css21_dev/xhtml1/outline-style-012.xht
+++ b/tests/wpt/css-tests/css21_dev/xhtml1/outline-style-012.xht
@@ -0,0 +1,35 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml"><head><meta charset="utf-8" />
+<title>CSS Basic User Interface Test: outline-style - inherit (basic)</title>
+<link href="http://www.intel.com/" rel="author" title="Intel" />
+<link href="mailto:shiyoux.tan@intel.com" rel="author" title="Shiyou Tan" />
+<link href="http://www.w3.org/TR/css3-ui/#outline-style" rel="help" title="7.3. 'outline-style' property" />
+<link href="http://www.w3.org/TR/CSS21/box.html#value-def-border-style" rel="help" />
+<link href="reference/outline-style-012-ref.xht" rel="match" />
+<meta content="" name="flags" />
+<meta content="Test checks that the sub element outline style is same as parent element outline style when outline-style set inherit" name="assert" />
+<style>
+  #parent {
+    height: 110px;
+    margin: 30px;
+    outline-color: blue;
+    outline-style: dotted;
+    outline-width: 4px;
+    padding: 20px;
+    width: 110px;
+  }
+  #child {
+    height: 110px;
+    outline-color: green;
+    outline-style: inherit;
+    outline-width: 4px;
+    width: 110px;
+  }
+</style>
+</head><body>
+  <p>Test passes if there is a blank square with <strong>a green dotted</strong> border centered inside a blue dotted border.</p>
+  <div id="parent">
+    <div id="child"></div>
+  </div>
+
+</body></html>
--- a/tests/wpt/css-tests/css21_dev/xhtml1/outline-style-013.xht
+++ b/tests/wpt/css-tests/css21_dev/xhtml1/outline-style-013.xht
@@ -0,0 +1,25 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml"><head><meta charset="utf-8" />
+<title>CSS Basic User Interface Test: outline-style - dashed (basic)</title>
+<link href="http://www.intel.com/" rel="author" title="Intel" />
+<link href="mailto:shiyoux.tan@intel.com" rel="author" title="Shiyou Tan" />
+<link href="http://www.w3.org/TR/css3-ui/#outline-style" rel="help" title="7.3. 'outline-style' property" />
+<link href="http://www.w3.org/TR/CSS21/box.html#value-def-border-style" rel="help" />
+<link href="reference/outline-style-013-ref.xht" rel="match" />
+<meta content="" name="flags" />
+<meta content="Test checks that the outline style is dashed when outline-style set dashed" name="assert" />
+<style>
+  #test {
+    height: 150px;
+    margin: 30px;
+    outline-color: green;
+    outline-style: dashed;
+    outline-width: 2px;
+    width: 150px;
+  }
+</style>
+</head><body>
+  <p>Test passes if there is a blank square whose border is <strong>green dashed</strong>.</p>
+  <div id="test"></div>
+
+</body></html>
--- a/tests/wpt/css-tests/css21_dev/xhtml1/outline-style-014.xht
+++ b/tests/wpt/css-tests/css21_dev/xhtml1/outline-style-014.xht
@@ -0,0 +1,25 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml"><head><meta charset="utf-8" />
+<title>CSS Basic User Interface Test: outline-style - double (basic)</title>
+<link href="http://www.intel.com/" rel="author" title="Intel" />
+<link href="mailto:shiyoux.tan@intel.com" rel="author" title="Shiyou Tan" />
+<link href="http://www.w3.org/TR/css3-ui/#outline-style" rel="help" title="7.3. 'outline-style' property" />
+<link href="http://www.w3.org/TR/CSS21/box.html#value-def-border-style" rel="help" />
+<link href="reference/outline-style-014-ref.xht" rel="match" />
+<meta content="" name="flags" />
+<meta content="Test checks that the outline style is two solid lines when outline-style set double" name="assert" />
+<style>
+  #test {
+    height: 150px;
+    margin: 30px;
+    outline-color: green;
+    outline-style: double;
+    outline-width: 4px;
+    width: 150px;
+  }
+</style>
+</head><body>
+  <p>Test passes if there is a blank square whose border is <strong>two green solid lines</strong>.</p>
+  <div id="test"></div>
+
+</body></html>
--- a/tests/wpt/css-tests/css21_dev/xhtml1/reference/adjacent-000-ref.xht
+++ b/tests/wpt/css-tests/css21_dev/xhtml1/reference/adjacent-000-ref.xht
@@ -0,0 +1,27 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+<title>CSS Reftest Reference</title>
+<link rel="author" title="Ms2ger" href="mailto:Ms2ger@gmail.com" />
+<style type="text/css">
+.gray {
+  color: gray;
+}
+.purple {
+  color: purple;
+}
+.black {
+  color: black;
+}
+.blue {
+  color: blue;
+}
+</style>
+</head>
+<body>
+<p class="gray">Filler text.</p>
+<p class="purple">This text should be purple.</p>
+<div class="black">This text should be black.</div>
+<h4 class="blue">This text should be blue.</h4>
+</body>
+</html>
--- a/tests/wpt/css-tests/css21_dev/xhtml1/reference/child-selector-001-ref.xht
+++ b/tests/wpt/css-tests/css21_dev/xhtml1/reference/child-selector-001-ref.xht
@@ -0,0 +1,11 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+<title>CSS Reftest Reference</title>
+<link rel="author" title="Ms2ger" href="mailto:Ms2ger@gmail.com" />
+</head>
+<body>
+<p>Test passes if there is no red visible on the page.</p>
+<h1>Filler Text</h1>
+</body>
+</html>
--- a/tests/wpt/css-tests/css21_dev/xhtml1/reference/child-selector-002-ref.xht
+++ b/tests/wpt/css-tests/css21_dev/xhtml1/reference/child-selector-002-ref.xht
@@ -0,0 +1,11 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+<title>CSS Reftest Reference</title>
+<link rel="author" title="Ms2ger" href="mailto:Ms2ger@gmail.com" />
+</head>
+<body>
+<p>Test passes if there is no red visible on the page.</p>
+<div><blockquote><h1>Filler Text</h1></blockquote></div>
+</body>
+</html>
--- a/tests/wpt/css-tests/css21_dev/xhtml1/reference/child-selector-003-ref.xht
+++ b/tests/wpt/css-tests/css21_dev/xhtml1/reference/child-selector-003-ref.xht
@@ -0,0 +1,16 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+<title>CSS Reftest Reference</title>
+<link rel="author" title="Ms2ger" href="mailto:Ms2ger@gmail.com" />
+<style type="text/css">
+h1 {
+  color: green;
+}
+</style>
+</head>
+<body>
+<p>Test passes if the "Filler Text" below is green.</p>
+<div><h1>Filler Text</h1></div>
+</body>
+</html>
--- a/tests/wpt/css-tests/css21_dev/xhtml1/reference/dynamic-sibling-combinator-001-ref.xht
+++ b/tests/wpt/css-tests/css21_dev/xhtml1/reference/dynamic-sibling-combinator-001-ref.xht
@@ -0,0 +1,24 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+<title>CSS Reftest Reference</title>
+<link rel="author" title="Ms2ger" href="mailto:Ms2ger@gmail.com" />
+<style type="text/css">
+div {
+  color: green;
+}
+</style>
+</head>
+<body>
+<div>This should be green</div>
+<div>This should be green</div>
+<div>This should be green</div>
+<div>This should be green</div>
+<div>This should be green</div>
+<div>This should be green</div>
+<div>This should be green</div>
+<div>This should be green</div>
+<div>This should be green</div>
+<div>This should be green</div>
+</body>
+</html>
--- a/tests/wpt/css-tests/css21_dev/xhtml1/reference/outline-style-011-ref.xht
+++ b/tests/wpt/css-tests/css21_dev/xhtml1/reference/outline-style-011-ref.xht
--- a/tests/wpt/css-tests/css21_dev/xhtml1/reference/outline-style-012-ref.xht
+++ b/tests/wpt/css-tests/css21_dev/xhtml1/reference/outline-style-012-ref.xht
--- a/tests/wpt/css-tests/css21_dev/xhtml1/reference/outline-style-013-ref.xht
+++ b/tests/wpt/css-tests/css21_dev/xhtml1/reference/outline-style-013-ref.xht
--- a/tests/wpt/css-tests/css21_dev/xhtml1/reference/outline-style-014-ref.xht
+++ b/tests/wpt/css-tests/css21_dev/xhtml1/reference/outline-style-014-ref.xht
--- a/tests/wpt/css-tests/css21_dev/xhtml1/reference/sibling-selector-001-ref.xht
+++ b/tests/wpt/css-tests/css21_dev/xhtml1/reference/sibling-selector-001-ref.xht
@@ -0,0 +1,17 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+<title>CSS Reftest Reference</title>
+<link rel="author" title="Ms2ger" href="mailto:Ms2ger@gmail.com" />
+<style type="text/css">
+.green {
+  color: green;
+}
+</style>
+</head>
+<body>
+<p>Test passes if the first line of "Filler Text" below is green, but the second line of "Filler Text" below is black.</p>
+<div class="green">Filler Text</div>
+<div>Filler Text</div>
+</body>
+</html>
--- a/tests/wpt/css-tests/css21_dev/xhtml1/reference/sibling-selector-003-ref.xht
+++ b/tests/wpt/css-tests/css21_dev/xhtml1/reference/sibling-selector-003-ref.xht
@@ -0,0 +1,17 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+<title>CSS Reftest Reference</title>
+<link rel="author" title="Ms2ger" href="mailto:Ms2ger@gmail.com" />
+<style type="text/css">
+.green {
+  color: green;
+}
+</style>
+</head>
+<body>
+<p>Test passes if the first line of "Filler Text" below is black, but the second line of "Filler Text" below is green.</p>
+<div>Filler Text</div>
+<div class="green">Filler Text</div>
+</body>
+</html>
--- a/tests/wpt/css-tests/css21_dev/xhtml1/reference/support/adobe-fonts/CSSHWOrientationTest.otf
+++ b/tests/wpt/css-tests/css21_dev/xhtml1/reference/support/adobe-fonts/CSSHWOrientationTest.otf
--- a/tests/wpt/css-tests/css21_dev/xhtml1/reference/support/adobe-fonts/README.md
+++ b/tests/wpt/css-tests/css21_dev/xhtml1/reference/support/adobe-fonts/README.md
@@ -3,7 +3,8 @@ CSS Orientation Test

 Overview
 ----
-CSS Orientation Test are special-purpose OpenType fonts. This open source project provides all of the source files that were used to build these OpenType fonts by using the AFDKO *makeotf* tool.
+CSS Orientation Test are special-purpose OpenType fonts. This open source project provides all of the source files 
+that were used to build these OpenType fonts by using the AFDKO *makeotf* tool.

 Getting Involved
 ----
@@ -14,20 +15,26 @@ Building

 Pre-built font binaries
 ----
-The installable font resources (font binaries) are not part of the source files. They are available on [Open@Adobe](https://sourceforge.net/projects/csso9ntestfonts.adobe/files/).
+The installable font resources (font binaries) are not part of the source files. 
+They are available at  https://github.com/adobe-fonts/css-orientation-test/
+The latest version of the font binaries is 1.005 (October 2015).


 Requirements
 ----

-For building binary font files from source, installation of the [Adobe Font Development Kit for OpenType](http://www.adobe.com/devnet/opentype/afdko.html) (AFDKO) is necessary. The AFDKO tools are widely used for font development today, and are part of most font editor applications.
+For building binary font files from source, installation of the 
+[Adobe Font Development Kit for OpenType](http://www.adobe.com/devnet/opentype/afdko.html) (AFDKO) 
+is necessary. The AFDKO tools are widely used for font development today, and are part of most font editor applications.

 Building the fonts
 ----

-The key to building OpenType fonts is *makeotf*, which is part of AFDKO. Information and usage instructions can be found by executing *makeotf -h*.
+The key to building OpenType fonts is *makeotf*, which is part of AFDKO. Information and usage instructions can be found 
+by executing *makeotf -h*.

-In this repository, all necessary files are in place for building the OpenType fonts. For example, build a binary OTF font for the full-width version like this, which also includes a post-process for inserting a "stub" 'DSIG' table:
+In this repository, all necessary files are in place for building the OpenType fonts. For example, build a binary OTF font 
+for the full-width version like this, which also includes a post-process for inserting a "stub" 'DSIG' table:

    % makeotf -f cidfont.ps -r -ch UnicodeAll-UTF32-H
    % sfntedit -a DSIG=DSIG.bin CSSFWOrientationTest.otf
--- a/tests/wpt/css-tests/css21_dev/xhtml1/reference/support/background-iframes-001.html
+++ b/tests/wpt/css-tests/css21_dev/xhtml1/reference/support/background-iframes-001.html
@@ -1,5 +1,6 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
 <html lang="en"><head>
+  <meta charset="utf-8">
  <title>Inner Frame</title>
  <link href="mailto:ian@hixie.ch" rel="author" title="Ian Hickson">
  <link href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" rel="reviewer" title="Gérard Talbot"> <!-- 2012-04-21 -->
--- a/tests/wpt/css-tests/css21_dev/xhtml1/reftest-toc.xht
+++ b/tests/wpt/css-tests/css21_dev/xhtml1/reftest-toc.xht
@@ -3376,6 +3376,30 @@
        <td rowspan="1"></td>
      </tr>
    </tbody>
+    <tbody id="adjacent-000" class="">
+      <tr>
+        <td rowspan="1" title="Selectors: Adjacent selectors">
+          <a href="adjacent-000.xht">adjacent-000</a></td>
+        <td><a href="reference/adjacent-000-ref.xht">=</a> </td>
+        <td rowspan="1"></td>
+      </tr>
+    </tbody>
+    <tbody id="adjacent-001" class="">
+      <tr>
+        <td rowspan="1" title="Selectors: Adjacent selectors without the space separator">
+          <a href="adjacent-001.xht">adjacent-001</a></td>
+        <td><a href="reference/adjacent-000-ref.xht">=</a> </td>
+        <td rowspan="1"></td>
+      </tr>
+    </tbody>
+    <tbody id="adjacent-002" class="">
+      <tr>
+        <td rowspan="1" title="Selectors: Adjacent selectors with the universal selector">
+          <a href="adjacent-002.xht">adjacent-002</a></td>
+        <td><a href="reference/adjacent-000-ref.xht">=</a> </td>
+        <td rowspan="1"></td>
+      </tr>
+    </tbody>
    <tbody id="adjacent-floats-001" class="">
      <tr>
        <td rowspan="1" title="Multiple floated boxes adjacent to each other">
@@ -21244,6 +21268,30 @@
        <td rowspan="1"></td>
      </tr>
    </tbody>
+    <tbody id="child-selector-001" class="">
+      <tr>
+        <td rowspan="1" title="Child selector does not match when there is no matching parent">
+          <a href="child-selector-001.xht">child-selector-001</a></td>
+        <td><a href="reference/child-selector-001-ref.xht">=</a> </td>
+        <td rowspan="1"></td>
+      </tr>
+    </tbody>
+    <tbody id="child-selector-002" class="">
+      <tr>
+        <td rowspan="1" title="Child selector without direct child">
+          <a href="child-selector-002.xht">child-selector-002</a></td>
+        <td><a href="reference/child-selector-002-ref.xht">=</a> </td>
+        <td rowspan="1"></td>
+      </tr>
+    </tbody>
+    <tbody id="child-selector-003" class="">
+      <tr>
+        <td rowspan="1" title="Child selector">
+          <a href="child-selector-003.xht">child-selector-003</a></td>
+        <td><a href="reference/child-selector-003-ref.xht">=</a> </td>
+        <td rowspan="1"></td>
+      </tr>
+    </tbody>
    <tbody id="class-selector-001" class="">
      <tr>
        <td rowspan="1" title="Class selectors with only a partial match of 'class' attribute">
@@ -24236,6 +24284,46 @@
        <td rowspan="1"></td>
      </tr>
    </tbody>
+    <tbody id="descendent-selector-007" class="">
+      <tr>
+        <td rowspan="1" title="Grandchild selection">
+          <a href="descendent-selector-007.xht">descendent-selector-007</a></td>
+        <td><a href="reference/descendent-selector-002-ref.xht">=</a> </td>
+        <td rowspan="1"></td>
+      </tr>
+    </tbody>
+    <tbody id="descendent-selector-008" class="">
+      <tr>
+        <td rowspan="1" title="Descendent selector with ID attribute does not match elements without the ID attribute">
+          <a href="descendent-selector-008.xht">descendent-selector-008</a></td>
+        <td><a href="reference/descendent-selector-004-ref.xht">=</a> </td>
+        <td rowspan="1"></td>
+      </tr>
+    </tbody>
+    <tbody id="descendent-selector-009" class="">
+      <tr>
+        <td rowspan="1" title="Descendent selector with ID attribute">
+          <a href="descendent-selector-009.xht">descendent-selector-009</a></td>
+        <td><a href="reference/descendent-selector-002-ref.xht">=</a> </td>
+        <td rowspan="1"></td>
+      </tr>
+    </tbody>
+    <tbody id="descendent-selector-010" class="">
+      <tr>
+        <td rowspan="1" title="Descendent selector and tabs">
+          <a href="descendent-selector-010.xht">descendent-selector-010</a></td>
+        <td><a href="reference/descendent-selector-002-ref.xht">=</a> </td>
+        <td rowspan="1"></td>
+      </tr>
+    </tbody>
+    <tbody id="descendent-selector-011" class="">
+      <tr>
+        <td rowspan="1" title="Descendent selector and newlines">
+          <a href="descendent-selector-011.xht">descendent-selector-011</a></td>
+        <td><a href="reference/descendent-selector-002-ref.xht">=</a> </td>
+        <td rowspan="1"></td>
+      </tr>
+    </tbody>
    <tbody id="direction-001" class="">
      <tr>
        <td rowspan="1" title="Direction set to 'ltr'">
@@ -24524,6 +24612,14 @@
        <td rowspan="1"></td>
      </tr>
    </tbody>
+    <tbody id="dynamic-sibling-combinator-001" class="dom">
+      <tr>
+        <td rowspan="1" title="Testing dynamic changes and the '+' combinator">
+          <a href="dynamic-sibling-combinator-001.xht">dynamic-sibling-combinator-001</a></td>
+        <td><a href="reference/dynamic-sibling-combinator-001-ref.xht">=</a> </td>
+        <td rowspan="1"><abbr class="dom" title="Requires Document Object Model support">DOM/JS</abbr></td>
+      </tr>
+    </tbody>
    <tbody id="dynamic-top-change-001" class="dom">
      <tr>
        <td rowspan="1" title="Inheriting 'top' changes from relpos grandparent">
@@ -29452,14 +29548,6 @@
        <td rowspan="1"><abbr class="ahem" title="Requires Ahem font">Ahem</abbr></td>
      </tr>
    </tbody>
-    <tbody id="inline-block-alignment-008" class="ahem">
-      <tr>
-        <td rowspan="1" title="inline block alignment - alphabetical alignment with vertical layout">
-          <a href="inline-block-alignment-008.xht">inline-block-alignment-008</a></td>
-        <td><a href="reference/inline-block-alignment-006-ref.xht">=</a> </td>
-        <td rowspan="1"><abbr class="ahem" title="Requires Ahem font">Ahem</abbr></td>
-      </tr>
-    </tbody>
    <tbody id="inline-block-height-001" class="">
      <tr>
        <td rowspan="1" title="Test for height:auto on inline-block">
@@ -38193,33 +38281,41 @@
    </tbody>
    <tbody id="outline-style-001" class="">
      <tr>
-        <td rowspan="1" title="outline-style - dotted (basic)">
+        <td rowspan="1" title="Outline-style set to 'none'">
          <a href="outline-style-001.xht">outline-style-001</a></td>
-        <td><a href="reference/outline-style-001-ref.xht">=</a> </td>
+        <td><a href="reference/no-red-filler-text-ref.xht">=</a> </td>
        <td rowspan="1"></td>
      </tr>
    </tbody>
-    <tbody id="outline-style-002" class="">
+    <tbody id="outline-style-011" class="">
+      <tr>
+        <td rowspan="1" title="outline-style - dotted (basic)">
+          <a href="outline-style-011.xht">outline-style-011</a></td>
+        <td><a href="reference/outline-style-011-ref.xht">=</a> </td>
+        <td rowspan="1"></td>
+      </tr>
+    </tbody>
+    <tbody id="outline-style-012" class="">
      <tr>
        <td rowspan="1" title="outline-style - inherit (basic)">
-          <a href="outline-style-002.xht">outline-style-002</a></td>
-        <td><a href="reference/outline-style-002-ref.xht">=</a> </td>
+          <a href="outline-style-012.xht">outline-style-012</a></td>
+        <td><a href="reference/outline-style-012-ref.xht">=</a> </td>
        <td rowspan="1"></td>
      </tr>
    </tbody>
-    <tbody id="outline-style-003" class="">
+    <tbody id="outline-style-013" class="">
      <tr>
        <td rowspan="1" title="outline-style - dashed (basic)">
-          <a href="outline-style-003.xht">outline-style-003</a></td>
-        <td><a href="reference/outline-style-003-ref.xht">=</a> </td>
+          <a href="outline-style-013.xht">outline-style-013</a></td>
+        <td><a href="reference/outline-style-013-ref.xht">=</a> </td>
        <td rowspan="1"></td>
      </tr>
    </tbody>
-    <tbody id="outline-style-004" class="">
+    <tbody id="outline-style-014" class="">
      <tr>
        <td rowspan="1" title="outline-style - double (basic)">
-          <a href="outline-style-004.xht">outline-style-004</a></td>
-        <td><a href="reference/outline-style-004-ref.xht">=</a> </td>
+          <a href="outline-style-014.xht">outline-style-014</a></td>
+        <td><a href="reference/outline-style-014-ref.xht">=</a> </td>
        <td rowspan="1"></td>
      </tr>
    </tbody>
@@ -43735,6 +43831,14 @@
        <td rowspan="1"></td>
      </tr>
    </tbody>
+    <tbody id="sibling-selector-001" class="">
+      <tr>
+        <td rowspan="1" title="Simple sibling selector">
+          <a href="sibling-selector-001.xht">sibling-selector-001</a></td>
+        <td><a href="reference/sibling-selector-001-ref.xht">=</a> </td>
+        <td rowspan="1"></td>
+      </tr>
+    </tbody>
    <tbody id="sibling-selector-002" class="">
      <tr>
        <td rowspan="1" title="Sibling selector with non-element node">
@@ -43743,6 +43847,14 @@
        <td rowspan="1"></td>
      </tr>
    </tbody>
+    <tbody id="sibling-selector-003" class="">
+      <tr>
+        <td rowspan="1" title="Sibling selector with non element node">
+          <a href="sibling-selector-003.xht">sibling-selector-003</a></td>
+        <td><a href="reference/sibling-selector-003-ref.xht">=</a> </td>
+        <td rowspan="1"></td>
+      </tr>
+    </tbody>
    <tbody id="sort-by-order-001" class="">
      <tr>
        <td rowspan="1" title="Casdading order - sort by order specified">
--- a/tests/wpt/css-tests/css21_dev/xhtml1/reftest.list
+++ b/tests/wpt/css-tests/css21_dev/xhtml1/reftest.list
@@ -418,6 +418,9 @@ abspos-width-002.xht == reference/ref-if-there-is-no-red.xht
 abspos-width-003.xht == reference/ref-if-there-is-no-red.xht
 abspos-width-004.xht == reference/ref-filled-green-100px-square.xht
 abspos-width-005.xht == reference/abspos-width-005-ref.xht
+adjacent-000.xht == reference/adjacent-000-ref.xht
+adjacent-001.xht == reference/adjacent-000-ref.xht
+adjacent-002.xht == reference/adjacent-000-ref.xht
 adjacent-floats-001.xht == reference/adjacent-floats-001-ref.xht
 after-content-display-001.xht == reference/after-content-display-001-ref.xht
 after-content-display-002.xht == reference/after-content-display-002-ref.xht
@@ -2662,6 +2665,9 @@ case-sensitive-005.xht == reference/case-sensitive-005-ref.xht
 case-sensitive-006.xht == reference/filler-text-below-green.xht
 case-sensitive-007.xht == reference/no-red-filler-text-ref.xht
 charset-attr-001.xht == reference/at-charset-ref.xht
+child-selector-001.xht == reference/child-selector-001-ref.xht
+child-selector-002.xht == reference/child-selector-002-ref.xht
+child-selector-003.xht == reference/child-selector-003-ref.xht
 class-selector-001.xht == reference/no-red-filler-text-ref.xht
 class-selector-002.xht == reference/filler-text-below-green.xht
 class-selector-003.xht == reference/filler-text-below-green.xht
@@ -3036,6 +3042,11 @@ descendent-selector-003.xht == reference/descendent-selector-002-ref.xht
 descendent-selector-004.xht == reference/descendent-selector-004-ref.xht
 descendent-selector-005.xht == reference/no-red-filler-text-ref.xht
 descendent-selector-006.xht == reference/descendent-selector-004-ref.xht
+descendent-selector-007.xht == reference/descendent-selector-002-ref.xht
+descendent-selector-008.xht == reference/descendent-selector-004-ref.xht
+descendent-selector-009.xht == reference/descendent-selector-002-ref.xht
+descendent-selector-010.xht == reference/descendent-selector-002-ref.xht
+descendent-selector-011.xht == reference/descendent-selector-002-ref.xht
 direction-001.xht == reference/direction-001-ref.xht
 direction-002.xht == reference/direction-002-ref.xht
 direction-003.xht == reference/direction-002-ref.xht
@@ -3072,6 +3083,7 @@ display-change-001.xht == reference/display-change-001-ref.xht
 display-none-001.xht == reference/ref-if-there-is-no-red.xht
 display-none-002.xht == reference/ref-if-there-is-no-red.xht
 display-none-003.xht == reference/ref-if-there-is-no-red.xht
+dynamic-sibling-combinator-001.xht == reference/dynamic-sibling-combinator-001-ref.xht
 dynamic-top-change-001.xht == reference/dynamic-top-change-001-ref.xht
 dynamic-top-change-002.xht == reference/dynamic-top-change-002-ref.xht
 dynamic-top-change-003.xht == reference/dynamic-top-change-002-ref.xht
@@ -3689,7 +3701,6 @@ inline-block-alignment-004.xht == reference/inline-block-alignment-002-ref.xht
 inline-block-alignment-005.xht == reference/inline-block-alignment-003-ref.xht
 inline-block-alignment-006.xht == reference/inline-block-alignment-006-ref.xht
 inline-block-alignment-007.xht == reference/inline-block-alignment-006-ref.xht
-inline-block-alignment-008.xht == reference/inline-block-alignment-006-ref.xht
 inline-block-height-001.xht == reference/inline-block-height-001-ref.xht
 inline-block-height-002.xht == reference/inline-block-height-002-ref.xht
 inline-block-non-replaced-height-001.xht == reference/height-percentage-001-ref.xht
@@ -4783,10 +4794,11 @@ outline-color-115.xht == reference/outline-color-115-ref.xht
 outline-color-applies-to-005.xht == reference/no-red-on-blank-page-ref.xht
 outline-color-applies-to-006.xht == reference/no-red-on-blank-page-ref.xht
 outline-layout-006.xht == reference/outline-layout-006-ref.xht
-outline-style-001.xht == reference/outline-style-001-ref.xht
-outline-style-002.xht == reference/outline-style-002-ref.xht
-outline-style-003.xht == reference/outline-style-003-ref.xht
-outline-style-004.xht == reference/outline-style-004-ref.xht
+outline-style-001.xht == reference/no-red-filler-text-ref.xht
+outline-style-011.xht == reference/outline-style-011-ref.xht
+outline-style-012.xht == reference/outline-style-012-ref.xht
+outline-style-013.xht == reference/outline-style-013-ref.xht
+outline-style-014.xht == reference/outline-style-014-ref.xht
 outline-style-applies-to-005.xht == reference/no-red-on-blank-page-ref.xht
 outline-style-applies-to-006.xht == reference/no-red-on-blank-page-ref.xht
 outline-width-002.xht == reference/no-red-filler-text-ref.xht
@@ -5476,7 +5488,9 @@ shand-font-000.xht == reference/shand-font-000-ref.xht
 shand-font-001.xht == reference/shand-font-000-ref.xht
 shand-font-002.xht == reference/shand-font-002-ref.xht
 shand-font-003.xht == reference/shand-font-002-ref.xht
+sibling-selector-001.xht == reference/sibling-selector-001-ref.xht
 sibling-selector-002.xht == reference/filler-text-below-green.xht
+sibling-selector-003.xht == reference/sibling-selector-003-ref.xht
 sort-by-order-001.xht == reference/ref-filled-green-100px-square.xht
 specificity-001.xht == reference/filler-text-below-green.xht
 specificity-002.xht == reference/filler-text-below-green.xht
--- a/tests/wpt/css-tests/css21_dev/xhtml1/sibling-selector-001.xht
+++ b/tests/wpt/css-tests/css21_dev/xhtml1/sibling-selector-001.xht
@@ -4,6 +4,7 @@
        <title>CSS Test: Simple sibling selector</title>
        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
        <link rel="help" href="http://www.w3.org/TR/CSS21/selector.html#adjacent-selectors" />
+        <link rel="match" href="reference/sibling-selector-001-ref.xht" />
        <meta name="flags" content="" />
        <meta name="assert" content="Sibling selector only applies to immediate siblings." />
        <style type="text/css">
--- a/tests/wpt/css-tests/css21_dev/xhtml1/sibling-selector-003.xht
+++ b/tests/wpt/css-tests/css21_dev/xhtml1/sibling-selector-003.xht
@@ -4,6 +4,7 @@
        <title>CSS Test: Sibling selector with non element node</title>
        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
        <link rel="help" href="http://www.w3.org/TR/CSS21/selector.html#adjacent-selectors" />
+        <link rel="match" href="reference/sibling-selector-003-ref.xht" />
        <meta name="flags" content="" />
        <meta name="assert" content="Sibling selector only applies to immediate siblings ignoring text nodes." />
        <style type="text/css">
--- a/tests/wpt/css-tests/css21_dev/xhtml1/support/adobe-fonts/CSSHWOrientationTest.otf
+++ b/tests/wpt/css-tests/css21_dev/xhtml1/support/adobe-fonts/CSSHWOrientationTest.otf
--- a/tests/wpt/css-tests/css21_dev/xhtml1/support/adobe-fonts/README.md
+++ b/tests/wpt/css-tests/css21_dev/xhtml1/support/adobe-fonts/README.md
@@ -3,7 +3,8 @@ CSS Orientation Test

 Overview
 ----
-CSS Orientation Test are special-purpose OpenType fonts. This open source project provides all of the source files that were used to build these OpenType fonts by using the AFDKO *makeotf* tool.
+CSS Orientation Test are special-purpose OpenType fonts. This open source project provides all of the source files 
+that were used to build these OpenType fonts by using the AFDKO *makeotf* tool.

 Getting Involved
 ----
@@ -14,20 +15,26 @@ Building

 Pre-built font binaries
 ----
-The installable font resources (font binaries) are not part of the source files. They are available on [Open@Adobe](https://sourceforge.net/projects/csso9ntestfonts.adobe/files/).
+The installable font resources (font binaries) are not part of the source files. 
+They are available at  https://github.com/adobe-fonts/css-orientation-test/
+The latest version of the font binaries is 1.005 (October 2015).


 Requirements
 ----

-For building binary font files from source, installation of the [Adobe Font Development Kit for OpenType](http://www.adobe.com/devnet/opentype/afdko.html) (AFDKO) is necessary. The AFDKO tools are widely used for font development today, and are part of most font editor applications.
+For building binary font files from source, installation of the 
+[Adobe Font Development Kit for OpenType](http://www.adobe.com/devnet/opentype/afdko.html) (AFDKO) 
+is necessary. The AFDKO tools are widely used for font development today, and are part of most font editor applications.

 Building the fonts
 ----

-The key to building OpenType fonts is *makeotf*, which is part of AFDKO. Information and usage instructions can be found by executing *makeotf -h*.
+The key to building OpenType fonts is *makeotf*, which is part of AFDKO. Information and usage instructions can be found 
+by executing *makeotf -h*.

-In this repository, all necessary files are in place for building the OpenType fonts. For example, build a binary OTF font for the full-width version like this, which also includes a post-process for inserting a "stub" 'DSIG' table:
+In this repository, all necessary files are in place for building the OpenType fonts. For example, build a binary OTF font 
+for the full-width version like this, which also includes a post-process for inserting a "stub" 'DSIG' table:

    % makeotf -f cidfont.ps -r -ch UnicodeAll-UTF32-H
    % sfntedit -a DSIG=DSIG.bin CSSFWOrientationTest.otf
--- a/tests/wpt/css-tests/css21_dev/xhtml1/support/background-iframes-001.html
+++ b/tests/wpt/css-tests/css21_dev/xhtml1/support/background-iframes-001.html
@@ -1,5 +1,6 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
 <html lang="en"><head>
+  <meta charset="utf-8">
  <title>Inner Frame</title>
  <link href="mailto:ian@hixie.ch" rel="author" title="Ian Hickson">
  <link href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" rel="reviewer" title="Gérard Talbot"> <!-- 2012-04-21 -->
--- a/tests/wpt/css-tests/css21_dev/xhtml1/toc.xht
+++ b/tests/wpt/css-tests/css21_dev/xhtml1/toc.xht
@@ -62,7 +62,7 @@
    <tbody id="s9">
      <tr><th><a href="chapter-9.xht">Chapter 9 - 
        Visual formatting model</a></th>
-      <td>(1245 Tests)</td></tr>
+      <td>(1244 Tests)</td></tr>
    </tbody>
    <tbody id="s10">
      <tr><th><a href="chapter-10.xht">Chapter 10 - 
@@ -107,7 +107,7 @@
    <tbody id="s18">
      <tr><th><a href="chapter-18.xht">Chapter 18 - 
        User interface</a></th>
-      <td>(357 Tests)</td></tr>
+      <td>(361 Tests)</td></tr>
    </tbody>
    <tbody id="sA">
      <tr><th><a href="chapter-A.xht">Appendix A -