Bug 1253189 part 3 - Update existing received w3c reftests. draft
authorXidorn Quan <quanxunzhen@gmail.com>
Thu, 03 Mar 2016 17:18:42 +0800
changeset 336656 397f4bb22e10675368b023c2b5bbc17ae720dade
parent 336652 89d6e63b737bfe5d21e6e35bb7f8ce57795998c8
child 336657 f657f91d6251967650b6c84f5fd54c65b67fe195
push id12165
push userxquan@mozilla.com
push dateFri, 04 Mar 2016 01:03:25 +0000
bugs1253189
milestone47.0a1
Bug 1253189 part 3 - Update existing received w3c reftests. MozReview-Commit-ID: 2ixqFjX7yT1
layout/reftests/w3c-css/received/css-namespaces-3/prefix-001.xml
layout/reftests/w3c-css/received/css-namespaces-3/prefix-002.xml
layout/reftests/w3c-css/received/css-namespaces-3/prefix-003.xml
layout/reftests/w3c-css/received/css-namespaces-3/prefix-004.xml
layout/reftests/w3c-css/received/css-namespaces-3/prefix-005.xml
layout/reftests/w3c-css/received/css-namespaces-3/prefix-006.xml
layout/reftests/w3c-css/received/css-namespaces-3/ref-lime-1-block.xml
layout/reftests/w3c-css/received/css-namespaces-3/ref-lime-1-generic.xml
layout/reftests/w3c-css/received/css-namespaces-3/ref-lime-1.xml
layout/reftests/w3c-css/received/css-namespaces-3/ref-lime-2-generic.xml
layout/reftests/w3c-css/received/css-namespaces-3/ref-lime-2.xml
layout/reftests/w3c-css/received/css-namespaces-3/ref-lime-3.xml
layout/reftests/w3c-css/received/css-namespaces-3/ref-lime-5.xml
layout/reftests/w3c-css/received/css-namespaces-3/ref-lime-6.xml
layout/reftests/w3c-css/received/css-namespaces-3/scope-001.xml
layout/reftests/w3c-css/received/css-namespaces-3/scope-002.xml
layout/reftests/w3c-css/received/css-namespaces-3/support/fail.css
layout/reftests/w3c-css/received/css-namespaces-3/support/scope-002a.css
layout/reftests/w3c-css/received/css-namespaces-3/support/scope-002b.css
layout/reftests/w3c-css/received/css-namespaces-3/support/syntax-007.css
layout/reftests/w3c-css/received/css-namespaces-3/syntax-001.xml
layout/reftests/w3c-css/received/css-namespaces-3/syntax-002.xml
layout/reftests/w3c-css/received/css-namespaces-3/syntax-003.xml
layout/reftests/w3c-css/received/css-namespaces-3/syntax-004.xml
layout/reftests/w3c-css/received/css-namespaces-3/syntax-005.xml
layout/reftests/w3c-css/received/css-namespaces-3/syntax-006.xml
layout/reftests/w3c-css/received/css-namespaces-3/syntax-007.xml
layout/reftests/w3c-css/received/css-namespaces-3/syntax-008.xml
layout/reftests/w3c-css/received/css-namespaces-3/syntax-009.xml
layout/reftests/w3c-css/received/css-namespaces-3/syntax-010.xml
layout/reftests/w3c-css/received/css-namespaces-3/syntax-011.xml
layout/reftests/w3c-css/received/css-namespaces-3/syntax-012.xml
layout/reftests/w3c-css/received/css-namespaces-3/syntax-013.xml
layout/reftests/w3c-css/received/css-namespaces-3/syntax-014.xml
layout/reftests/w3c-css/received/css-namespaces-3/syntax-015.xml
layout/reftests/w3c-css/received/css3-conditional/at-media-whitespace-optional-001.html
layout/reftests/w3c-css/received/css3-conditional/at-media-whitespace-optional-002.html
layout/reftests/w3c-css/received/css3-conditional/at-supports-001-ref.html
layout/reftests/w3c-css/received/css3-conditional/at-supports-001.html
layout/reftests/w3c-css/received/css3-conditional/at-supports-002.html
layout/reftests/w3c-css/received/css3-conditional/at-supports-003.html
layout/reftests/w3c-css/received/css3-conditional/at-supports-004.html
layout/reftests/w3c-css/received/css3-conditional/at-supports-005.html
layout/reftests/w3c-css/received/css3-conditional/at-supports-006.html
layout/reftests/w3c-css/received/css3-conditional/at-supports-007.html
layout/reftests/w3c-css/received/css3-conditional/at-supports-008.html
layout/reftests/w3c-css/received/css3-conditional/at-supports-009.html
layout/reftests/w3c-css/received/css3-conditional/at-supports-010.html
layout/reftests/w3c-css/received/css3-conditional/at-supports-011.html
layout/reftests/w3c-css/received/css3-conditional/at-supports-012.html
layout/reftests/w3c-css/received/css3-conditional/at-supports-013.html
layout/reftests/w3c-css/received/css3-conditional/at-supports-014.html
layout/reftests/w3c-css/received/css3-conditional/at-supports-015.html
layout/reftests/w3c-css/received/css3-conditional/at-supports-016.html
layout/reftests/w3c-css/received/css3-conditional/at-supports-017.html
layout/reftests/w3c-css/received/css3-conditional/at-supports-018.html
layout/reftests/w3c-css/received/css3-conditional/at-supports-019.html
layout/reftests/w3c-css/received/css3-conditional/at-supports-020.html
layout/reftests/w3c-css/received/css3-conditional/at-supports-021.html
layout/reftests/w3c-css/received/css3-conditional/at-supports-022.html
layout/reftests/w3c-css/received/css3-conditional/at-supports-023.html
layout/reftests/w3c-css/received/css3-conditional/at-supports-024.html
layout/reftests/w3c-css/received/css3-conditional/at-supports-025.html
layout/reftests/w3c-css/received/css3-conditional/at-supports-026.html
layout/reftests/w3c-css/received/css3-conditional/at-supports-027-ref.html
layout/reftests/w3c-css/received/css3-conditional/at-supports-027.html
layout/reftests/w3c-css/received/css3-conditional/at-supports-028.html
layout/reftests/w3c-css/received/css3-conditional/at-supports-029.html
layout/reftests/w3c-css/received/css3-conditional/at-supports-030.html
layout/reftests/w3c-css/received/css3-conditional/at-supports-031.html
layout/reftests/w3c-css/received/css3-conditional/at-supports-032.html
layout/reftests/w3c-css/received/css3-conditional/at-supports-033.html
layout/reftests/w3c-css/received/css3-conditional/at-supports-034.html
layout/reftests/w3c-css/received/css3-conditional/at-supports-035.html
layout/reftests/w3c-css/received/css3-conditional/at-supports-036.html
layout/reftests/w3c-css/received/css3-conditional/at-supports-037.html
layout/reftests/w3c-css/received/css3-conditional/at-supports-038.html
layout/reftests/w3c-css/received/css3-conditional/at-supports-039.html
layout/reftests/w3c-css/received/css3-conditional/background-lime.html
layout/reftests/w3c-css/received/css3-namespace/prefix-001.xml
layout/reftests/w3c-css/received/css3-namespace/prefix-002.xml
layout/reftests/w3c-css/received/css3-namespace/prefix-003.xml
layout/reftests/w3c-css/received/css3-namespace/prefix-004.xml
layout/reftests/w3c-css/received/css3-namespace/prefix-005.xml
layout/reftests/w3c-css/received/css3-namespace/prefix-006.xml
layout/reftests/w3c-css/received/css3-namespace/ref-lime-1-block.xml
layout/reftests/w3c-css/received/css3-namespace/ref-lime-1-generic.xml
layout/reftests/w3c-css/received/css3-namespace/ref-lime-1.xml
layout/reftests/w3c-css/received/css3-namespace/ref-lime-2-generic.xml
layout/reftests/w3c-css/received/css3-namespace/ref-lime-2.xml
layout/reftests/w3c-css/received/css3-namespace/ref-lime-3.xml
layout/reftests/w3c-css/received/css3-namespace/ref-lime-5.xml
layout/reftests/w3c-css/received/css3-namespace/ref-lime-6.xml
layout/reftests/w3c-css/received/css3-namespace/scope-001.xml
layout/reftests/w3c-css/received/css3-namespace/scope-002.xml
layout/reftests/w3c-css/received/css3-namespace/support/fail.css
layout/reftests/w3c-css/received/css3-namespace/support/scope-002a.css
layout/reftests/w3c-css/received/css3-namespace/support/scope-002b.css
layout/reftests/w3c-css/received/css3-namespace/support/syntax-007.css
layout/reftests/w3c-css/received/css3-namespace/syntax-001.xml
layout/reftests/w3c-css/received/css3-namespace/syntax-002.xml
layout/reftests/w3c-css/received/css3-namespace/syntax-003.xml
layout/reftests/w3c-css/received/css3-namespace/syntax-004.xml
layout/reftests/w3c-css/received/css3-namespace/syntax-005.xml
layout/reftests/w3c-css/received/css3-namespace/syntax-006.xml
layout/reftests/w3c-css/received/css3-namespace/syntax-007.xml
layout/reftests/w3c-css/received/css3-namespace/syntax-008.xml
layout/reftests/w3c-css/received/css3-namespace/syntax-009.xml
layout/reftests/w3c-css/received/css3-namespace/syntax-010.xml
layout/reftests/w3c-css/received/css3-namespace/syntax-011.xml
layout/reftests/w3c-css/received/css3-namespace/syntax-012.xml
layout/reftests/w3c-css/received/css3-namespace/syntax-013.xml
layout/reftests/w3c-css/received/css3-namespace/syntax-014.xml
layout/reftests/w3c-css/received/css3-namespace/syntax-015.xml
layout/reftests/w3c-css/received/import.log
layout/reftests/w3c-css/received/reftest.list
rename from layout/reftests/w3c-css/received/css3-namespace/prefix-001.xml
rename to layout/reftests/w3c-css/received/css-namespaces-3/prefix-001.xml
--- a/layout/reftests/w3c-css/received/css3-namespace/prefix-001.xml
+++ b/layout/reftests/w3c-css/received/css-namespaces-3/prefix-001.xml
@@ -1,13 +1,13 @@
 <html xmlns="http://www.w3.org/1999/xhtml">
  <head>
   <link rel="author" title="Anne van Kesteren" href="http://annevankesteren.nl/"/>
   <link rel="author" title="Opera Software ASA" href="http://opera.com/"/>
-  <link rel="help" href="http://www.w3.org/TR/css3-namespace/#prefixes"/>
+  <link rel="help" href="http://www.w3.org/TR/css-namespaces-3/#prefixes"/>
   <link rel="match" href="reftest/ref-lime-1.xml"/>
   <title>CSS Namespaces Test Suite: prefix case-sensitivity</title>
   <style>
    @namespace Foo "y";
    @namespace foo "x";
    test { background:red }
    Foo|test { background:lime }
    foo|test { background:red }
rename from layout/reftests/w3c-css/received/css3-namespace/prefix-002.xml
rename to layout/reftests/w3c-css/received/css-namespaces-3/prefix-002.xml
--- a/layout/reftests/w3c-css/received/css3-namespace/prefix-002.xml
+++ b/layout/reftests/w3c-css/received/css-namespaces-3/prefix-002.xml
@@ -1,13 +1,13 @@
 <html xmlns="http://www.w3.org/1999/xhtml">
  <head>
   <link rel="author" title="Anne van Kesteren" href="http://annevankesteren.nl/"/>
   <link rel="author" title="Opera Software ASA" href="http://opera.com/"/>
-  <link rel="help" href="http://www.w3.org/TR/css3-namespace/#prefixes"/>
+  <link rel="help" href="http://www.w3.org/TR/css-namespaces-3/#prefixes"/>
   <link rel="match" href="reftest/ref-lime-1.xml"/>
   <title>CSS Namespaces Test Suite: empty string prefix (Explicit element namespace)</title>
   <style>
    @namespace foo "";
    t { background:red }
    foo|t { background:lime }
   </style>
  </head>
rename from layout/reftests/w3c-css/received/css3-namespace/prefix-003.xml
rename to layout/reftests/w3c-css/received/css-namespaces-3/prefix-003.xml
--- a/layout/reftests/w3c-css/received/css3-namespace/prefix-003.xml
+++ b/layout/reftests/w3c-css/received/css-namespaces-3/prefix-003.xml
@@ -1,13 +1,13 @@
 <root>
  <head xmlns="http://www.w3.org/1999/xhtml">
   <link rel="author" title="Anne van Kesteren" href="http://annevankesteren.nl/"/>
   <link rel="author" title="Opera Software ASA" href="http://opera.com/"/>
-  <link rel="help" href="http://www.w3.org/TR/css3-namespace/#prefixes"/>
+  <link rel="help" href="http://www.w3.org/TR/css-namespaces-3/#prefixes"/>
   <link rel="match" href="reftest/ref-lime-1-generic.xml"/>
   <title>CSS Namespaces Test Suite: empty string prefix (Implied element namespace)</title>
   <style>
    @namespace foo "";
    t { background:red }
    foo|t { background:lime }
   </style>
  </head>
rename from layout/reftests/w3c-css/received/css3-namespace/prefix-004.xml
rename to layout/reftests/w3c-css/received/css-namespaces-3/prefix-004.xml
--- a/layout/reftests/w3c-css/received/css3-namespace/prefix-004.xml
+++ b/layout/reftests/w3c-css/received/css-namespaces-3/prefix-004.xml
@@ -1,13 +1,13 @@
 <root>
  <head xmlns="http://www.w3.org/1999/xhtml">
   <link rel="author" title="Anne van Kesteren" href="http://annevankesteren.nl/"/>
   <link rel="author" title="Opera Software ASA" href="http://opera.com/"/>
-  <link rel="help" href="http://www.w3.org/TR/css3-namespace/#prefixes"/>
+  <link rel="help" href="http://www.w3.org/TR/css-namespaces-3/#prefixes"/>
   <link rel="match" href="reftest/ref-lime-2-generic.xml"/>
   <title>CSS Namespaces Test Suite: empty string default namespace</title>
   <style>
    @namespace "";
    @namespace x "test";
    *|t, *|root { display:block }
    *|t, t[x] { background:lime }
    t { background:red }
rename from layout/reftests/w3c-css/received/css3-namespace/prefix-005.xml
rename to layout/reftests/w3c-css/received/css-namespaces-3/prefix-005.xml
--- a/layout/reftests/w3c-css/received/css3-namespace/prefix-005.xml
+++ b/layout/reftests/w3c-css/received/css-namespaces-3/prefix-005.xml
@@ -1,14 +1,14 @@
 <root>
  <head xmlns="http://www.w3.org/1999/xhtml">
   <link rel="author" title="Anne van Kesteren" href="http://annevankesteren.nl/"/>
   <link rel="author" title="Opera Software ASA" href="http://opera.com/"/>
   <link rel="author" title="Boris Zbarsky" href="https://bugzilla.mozilla.org/show_bug.cgi?id=458381#c4"/>
-  <link rel="help" href="http://www.w3.org/TR/css3-namespace/#prefixes"/>
+  <link rel="help" href="http://www.w3.org/TR/css-namespaces-3/#prefixes"/>
   <link rel="match" href="reftest/ref-lime-2-generic.xml"/>
   <title>CSS Namespaces Test Suite: no default namespace</title>
   <style>
    @namespace x "test";
    root *|* { background:red; display:block }
    head { display:none }
    t { background: lime }
   </style>
rename from layout/reftests/w3c-css/received/css3-namespace/prefix-006.xml
rename to layout/reftests/w3c-css/received/css-namespaces-3/prefix-006.xml
--- a/layout/reftests/w3c-css/received/css3-namespace/prefix-006.xml
+++ b/layout/reftests/w3c-css/received/css-namespaces-3/prefix-006.xml
@@ -1,13 +1,13 @@
 <html xmlns="http://www.w3.org/1999/xhtml">
  <head>
   <link rel="author" title="Anne van Kesteren" href="http://annevankesteren.nl/"/>
   <link rel="author" title="Opera Software ASA" href="http://opera.com/"/>
-  <link rel="help" href="http://www.w3.org/TR/css3-namespace/#prefixes"/>
+  <link rel="help" href="http://www.w3.org/TR/css-namespaces-3/#prefixes"/>
   <link rel="match" href="reftest/ref-lime-2.xml"/>
   <title>CSS Namespaces Test Suite: no prefix</title>
   <style>
    @namespace "test";
    |t { background:lime }
    t { background:red }
   </style>
   <style>
rename from layout/reftests/w3c-css/received/css3-namespace/ref-lime-1-block.xml
rename to layout/reftests/w3c-css/received/css-namespaces-3/ref-lime-1-block.xml
--- a/layout/reftests/w3c-css/received/css3-namespace/ref-lime-1-block.xml
+++ b/layout/reftests/w3c-css/received/css-namespaces-3/ref-lime-1-block.xml
@@ -1,10 +1,10 @@
 <html xmlns="http://www.w3.org/1999/xhtml">
  <head>
   <link rel="author" title="L. David Baron" href="http://dbaron.org/"/>
-  <link rel="author" title="Mozilla Foundation" href="http://mozilla.org/"/>
+  <link rel="author" title="Mozilla" href="http://mozilla.org/"/>
   <title>CSS Namespaces Test Suite reference</title>
  </head>
  <body>
   <p style="background: lime">This sentence should have a green background.</p>
  </body>
 </html>
rename from layout/reftests/w3c-css/received/css3-namespace/ref-lime-1-generic.xml
rename to layout/reftests/w3c-css/received/css-namespaces-3/ref-lime-1-generic.xml
--- a/layout/reftests/w3c-css/received/css3-namespace/ref-lime-1-generic.xml
+++ b/layout/reftests/w3c-css/received/css-namespaces-3/ref-lime-1-generic.xml
@@ -1,11 +1,11 @@
 <root>
  <head xmlns="http://www.w3.org/1999/xhtml">
   <link rel="author" title="L. David Baron" href="http://dbaron.org/"/>
-  <link rel="author" title="Mozilla Foundation" href="http://mozilla.org/"/>
+  <link rel="author" title="Mozilla" href="http://mozilla.org/"/>
   <title>CSS Namespaces Test Suite reference</title>
   <style>
    t { background:lime }
   </style>
  </head>
  <t>This sentence should have a green background.</t>
 </root>
rename from layout/reftests/w3c-css/received/css3-namespace/ref-lime-1.xml
rename to layout/reftests/w3c-css/received/css-namespaces-3/ref-lime-1.xml
--- a/layout/reftests/w3c-css/received/css3-namespace/ref-lime-1.xml
+++ b/layout/reftests/w3c-css/received/css-namespaces-3/ref-lime-1.xml
@@ -1,10 +1,10 @@
 <html xmlns="http://www.w3.org/1999/xhtml">
  <head>
   <link rel="author" title="L. David Baron" href="http://dbaron.org/"/>
-  <link rel="author" title="Mozilla Foundation" href="http://mozilla.org/"/>
+  <link rel="author" title="Mozilla" href="http://mozilla.org/"/>
   <title>CSS Namespaces Test Suite reference</title>
  </head>
  <body>
   <p><test style="background: lime">This sentence should have a green background.</test></p>
  </body>
 </html>
rename from layout/reftests/w3c-css/received/css3-namespace/ref-lime-2-generic.xml
rename to layout/reftests/w3c-css/received/css-namespaces-3/ref-lime-2-generic.xml
--- a/layout/reftests/w3c-css/received/css3-namespace/ref-lime-2-generic.xml
+++ b/layout/reftests/w3c-css/received/css-namespaces-3/ref-lime-2-generic.xml
@@ -1,12 +1,12 @@
 <root>
  <head xmlns="http://www.w3.org/1999/xhtml">
   <link rel="author" title="L. David Baron" href="http://dbaron.org/"/>
-  <link rel="author" title="Mozilla Foundation" href="http://mozilla.org/"/>
+  <link rel="author" title="Mozilla" href="http://mozilla.org/"/>
   <title>CSS Namespaces Test Suite reference</title>
   <style>
    t, root { display:block }
    t { background:lime }
   </style>
  </head>
  <t>This sentence should have a green background.</t>
  <t>This sentence should have a green background.</t>
rename from layout/reftests/w3c-css/received/css3-namespace/ref-lime-2.xml
rename to layout/reftests/w3c-css/received/css-namespaces-3/ref-lime-2.xml
--- a/layout/reftests/w3c-css/received/css3-namespace/ref-lime-2.xml
+++ b/layout/reftests/w3c-css/received/css-namespaces-3/ref-lime-2.xml
@@ -1,11 +1,11 @@
 <html xmlns="http://www.w3.org/1999/xhtml">
  <head>
   <link rel="author" title="L. David Baron" href="http://dbaron.org/"/>
-  <link rel="author" title="Mozilla Foundation" href="http://mozilla.org/"/>
+  <link rel="author" title="Mozilla" href="http://mozilla.org/"/>
   <title>CSS Namespaces Test Suite reference</title>
  </head>
  <body>
   <p><test style="background: lime">This sentence should have a green background.</test></p>
   <p><test style="background: lime">This sentence should have a green background.</test></p>
  </body>
 </html>
rename from layout/reftests/w3c-css/received/css3-namespace/ref-lime-3.xml
rename to layout/reftests/w3c-css/received/css-namespaces-3/ref-lime-3.xml
--- a/layout/reftests/w3c-css/received/css3-namespace/ref-lime-3.xml
+++ b/layout/reftests/w3c-css/received/css-namespaces-3/ref-lime-3.xml
@@ -1,12 +1,12 @@
 <html xmlns="http://www.w3.org/1999/xhtml">
  <head>
   <link rel="author" title="L. David Baron" href="http://dbaron.org/"/>
-  <link rel="author" title="Mozilla Foundation" href="http://mozilla.org/"/>
+  <link rel="author" title="Mozilla" href="http://mozilla.org/"/>
   <title>CSS Namespaces Test Suite reference</title>
  </head>
  <body>
   <p><test style="background: lime">This sentence should have a green background.</test></p>
   <p><test style="background: lime">This sentence should have a green background.</test></p>
   <p><test style="background: lime">This sentence should have a green background.</test></p>
  </body>
 </html>
rename from layout/reftests/w3c-css/received/css3-namespace/ref-lime-5.xml
rename to layout/reftests/w3c-css/received/css-namespaces-3/ref-lime-5.xml
--- a/layout/reftests/w3c-css/received/css3-namespace/ref-lime-5.xml
+++ b/layout/reftests/w3c-css/received/css-namespaces-3/ref-lime-5.xml
@@ -1,12 +1,12 @@
 <html xmlns="http://www.w3.org/1999/xhtml">
  <head>
   <link rel="author" title="L. David Baron" href="http://dbaron.org/"/>
-  <link rel="author" title="Mozilla Foundation" href="http://mozilla.org/"/>
+  <link rel="author" title="Mozilla" href="http://mozilla.org/"/>
   <title>CSS Namespaces Test Suite reference</title>
  </head>
  <body>
   <p><test style="background: lime">This sentence should have a green background.</test></p>
   <p><test style="background: lime">This sentence should have a green background.</test></p>
   <p><test style="background: lime">This sentence should have a green background.</test></p>
   <p><test style="background: lime">This sentence should have a green background.</test></p>
   <p><test style="background: lime">This sentence should have a green background.</test></p>
rename from layout/reftests/w3c-css/received/css3-namespace/ref-lime-6.xml
rename to layout/reftests/w3c-css/received/css-namespaces-3/ref-lime-6.xml
--- a/layout/reftests/w3c-css/received/css3-namespace/ref-lime-6.xml
+++ b/layout/reftests/w3c-css/received/css-namespaces-3/ref-lime-6.xml
@@ -1,12 +1,12 @@
 <html xmlns="http://www.w3.org/1999/xhtml">
  <head>
   <link rel="author" title="L. David Baron" href="http://dbaron.org/"/>
-  <link rel="author" title="Mozilla Foundation" href="http://mozilla.org/"/>
+  <link rel="author" title="Mozilla" href="http://mozilla.org/"/>
   <title>CSS Namespaces Test Suite reference</title>
  </head>
  <body>
   <p><test style="background: lime">This sentence should have a green background.</test></p>
   <p><test style="background: lime">This sentence should have a green background.</test></p>
   <p><test style="background: lime">This sentence should have a green background.</test></p>
   <p><test style="background: lime">This sentence should have a green background.</test></p>
   <p><test style="background: lime">This sentence should have a green background.</test></p>
rename from layout/reftests/w3c-css/received/css3-namespace/scope-001.xml
rename to layout/reftests/w3c-css/received/css-namespaces-3/scope-001.xml
--- a/layout/reftests/w3c-css/received/css3-namespace/scope-001.xml
+++ b/layout/reftests/w3c-css/received/css-namespaces-3/scope-001.xml
@@ -1,13 +1,13 @@
 <html xmlns="http://www.w3.org/1999/xhtml">
  <head>
   <link rel="author" title="Anne van Kesteren" href="http://annevankesteren.nl/"/>
   <link rel="author" title="Opera Software ASA" href="http://opera.com/"/>
-  <link rel="help" href="http://www.w3.org/TR/css3-namespace/#scope"/>
+  <link rel="help" href="http://www.w3.org/TR/css-namespaces-3/#scope"/>
   <link rel="match" href="reftest/ref-lime-1.xml"/>
   <meta name="flags" content="invalid"/>
   <title>CSS Namespaces Test Suite: scope &lt;style></title>
   <style>
    @namespace x url("test");
    test { background:lime }
   </style>
   <style>
rename from layout/reftests/w3c-css/received/css3-namespace/scope-002.xml
rename to layout/reftests/w3c-css/received/css-namespaces-3/scope-002.xml
--- a/layout/reftests/w3c-css/received/css3-namespace/scope-002.xml
+++ b/layout/reftests/w3c-css/received/css-namespaces-3/scope-002.xml
@@ -1,13 +1,13 @@
 <html xmlns="http://www.w3.org/1999/xhtml">
  <head>
   <link rel="author" title="Anne van Kesteren" href="http://annevankesteren.nl/"/>
   <link rel="author" title="Opera Software ASA" href="http://opera.com/"/>
-  <link rel="help" href="http://www.w3.org/TR/css3-namespace/#scope"/>
+  <link rel="help" href="http://www.w3.org/TR/css-namespaces-3/#scope"/>
   <link rel="match" href="reftest/ref-lime-1.xml"/>
   <title>CSS Namespaces Test Suite: scope @import</title>
   <style>
    test { background:lime }
   </style>
   <style>
    @import url("support/scope-002a.css");
    @import url("support/scope-002b.css");
rename from layout/reftests/w3c-css/received/css3-namespace/support/fail.css
rename to layout/reftests/w3c-css/received/css-namespaces-3/support/fail.css
rename from layout/reftests/w3c-css/received/css3-namespace/support/scope-002a.css
rename to layout/reftests/w3c-css/received/css-namespaces-3/support/scope-002a.css
rename from layout/reftests/w3c-css/received/css3-namespace/support/scope-002b.css
rename to layout/reftests/w3c-css/received/css-namespaces-3/support/scope-002b.css
rename from layout/reftests/w3c-css/received/css3-namespace/support/syntax-007.css
rename to layout/reftests/w3c-css/received/css-namespaces-3/support/syntax-007.css
rename from layout/reftests/w3c-css/received/css3-namespace/syntax-001.xml
rename to layout/reftests/w3c-css/received/css-namespaces-3/syntax-001.xml
--- a/layout/reftests/w3c-css/received/css3-namespace/syntax-001.xml
+++ b/layout/reftests/w3c-css/received/css-namespaces-3/syntax-001.xml
@@ -1,13 +1,13 @@
 <html xmlns="http://www.w3.org/1999/xhtml">
  <head>
   <link rel="author" title="Anne van Kesteren" href="http://annevankesteren.nl/"/>
   <link rel="author" title="Opera Software ASA" href="http://opera.com/"/>
-  <link rel="help" href="http://www.w3.org/TR/css3-namespace/#syntax"/>
+  <link rel="help" href="http://www.w3.org/TR/css-namespaces-3/#syntax"/>
   <link rel="match" href="reftest/ref-lime-1-block.xml"/>
   <title>CSS Namespaces Test Suite: @namespace case-insensitivity</title>
   <style>
    @NAmespace x "http://www.w3.org/1999/xhtml";
    x|p { background: lime }
   </style>
  </head>
  <body>
rename from layout/reftests/w3c-css/received/css3-namespace/syntax-002.xml
rename to layout/reftests/w3c-css/received/css-namespaces-3/syntax-002.xml
--- a/layout/reftests/w3c-css/received/css3-namespace/syntax-002.xml
+++ b/layout/reftests/w3c-css/received/css-namespaces-3/syntax-002.xml
@@ -1,13 +1,13 @@
 <html xmlns="http://www.w3.org/1999/xhtml">
  <head>
   <link rel="author" title="Anne van Kesteren" href="http://annevankesteren.nl/"/>
   <link rel="author" title="Opera Software ASA" href="http://opera.com/"/>
-  <link rel="help" href="http://www.w3.org/TR/css3-namespace/#syntax"/>
+  <link rel="help" href="http://www.w3.org/TR/css-namespaces-3/#syntax"/>
   <link rel="match" href="reftest/ref-lime-1-block.xml"/>
   <title>CSS Namespaces Test Suite: @namespace syntax with escapes</title>
   <style>
    @\N\000041 mes\pac\65  x "http://www.w3.org/1999/xhtml";
    x|p { background: lime }
   </style>
  </head>
  <body>
rename from layout/reftests/w3c-css/received/css3-namespace/syntax-003.xml
rename to layout/reftests/w3c-css/received/css-namespaces-3/syntax-003.xml
--- a/layout/reftests/w3c-css/received/css3-namespace/syntax-003.xml
+++ b/layout/reftests/w3c-css/received/css-namespaces-3/syntax-003.xml
@@ -1,13 +1,13 @@
 <html xmlns="http://www.w3.org/1999/xhtml">
  <head>
   <link rel="author" title="Anne van Kesteren" href="http://annevankesteren.nl/"/>
   <link rel="author" title="Opera Software ASA" href="http://opera.com/"/>
-  <link rel="help" href="http://www.w3.org/TR/css3-namespace/#syntax"/>
+  <link rel="help" href="http://www.w3.org/TR/css-namespaces-3/#syntax"/>
   <link rel="match" href="reftest/ref-lime-5.xml"/>
   <title>CSS Namespaces Test Suite: @namespace default namespace syntax</title>
   <style>
    *|test { background:red }
   </style>
   <style>
    @namespace url(test-a);
    test { background:lime }
rename from layout/reftests/w3c-css/received/css3-namespace/syntax-004.xml
rename to layout/reftests/w3c-css/received/css-namespaces-3/syntax-004.xml
--- a/layout/reftests/w3c-css/received/css3-namespace/syntax-004.xml
+++ b/layout/reftests/w3c-css/received/css-namespaces-3/syntax-004.xml
@@ -1,13 +1,13 @@
 <html xmlns="http://www.w3.org/1999/xhtml">
  <head>
   <link rel="author" title="Anne van Kesteren" href="http://annevankesteren.nl/"/>
   <link rel="author" title="Opera Software ASA" href="http://opera.com/"/>
-  <link rel="help" href="http://www.w3.org/TR/css3-namespace/#syntax"/>
+  <link rel="help" href="http://www.w3.org/TR/css-namespaces-3/#syntax"/>
   <link rel="match" href="reftest/ref-lime-1.xml"/>
   <title>CSS Namespaces Test Suite: @namespace url() with escape</title>
   <style>
    @namespace u\00072l("test");
    *|test { background:red }
    test { background: lime }
   </style>
  </head>
rename from layout/reftests/w3c-css/received/css3-namespace/syntax-005.xml
rename to layout/reftests/w3c-css/received/css-namespaces-3/syntax-005.xml
--- a/layout/reftests/w3c-css/received/css3-namespace/syntax-005.xml
+++ b/layout/reftests/w3c-css/received/css-namespaces-3/syntax-005.xml
@@ -1,13 +1,13 @@
 <html xmlns="http://www.w3.org/1999/xhtml">
  <head>
   <link rel="author" title="Anne van Kesteren" href="http://annevankesteren.nl/"/>
   <link rel="author" title="Opera Software ASA" href="http://opera.com/"/>
-  <link rel="help" href="http://www.w3.org/TR/css3-namespace/#syntax"/>
+  <link rel="help" href="http://www.w3.org/TR/css-namespaces-3/#syntax"/>
   <link rel="match" href="reftest/ref-lime-5.xml"/>
   <title>CSS Namespaces Test Suite: @namespace string and url() syntax</title>
   <style>
    test { background:red }
   </style>
   <style>
    @namespace a url(test-a);
    @namespace b url('test-b');
rename from layout/reftests/w3c-css/received/css3-namespace/syntax-006.xml
rename to layout/reftests/w3c-css/received/css-namespaces-3/syntax-006.xml
--- a/layout/reftests/w3c-css/received/css3-namespace/syntax-006.xml
+++ b/layout/reftests/w3c-css/received/css-namespaces-3/syntax-006.xml
@@ -1,13 +1,13 @@
 <html xmlns="http://www.w3.org/1999/xhtml">
  <head>
   <link rel="author" title="Anne van Kesteren" href="http://annevankesteren.nl/"/>
   <link rel="author" title="Opera Software ASA" href="http://opera.com/"/>
-  <link rel="help" href="http://www.w3.org/TR/css3-namespace/#syntax"/>
+  <link rel="help" href="http://www.w3.org/TR/css-namespaces-3/#syntax"/>
   <link rel="match" href="reftest/ref-lime-1.xml"/>
   <meta name="flags" content="invalid"/>
   <title>CSS Namespaces Test Suite: invalid ordering of @namespace and @import</title>
   <style>
    @namespace x u\00072l("test");
    @import url("support/fail.css");
    @namespace url("test2");
    x|test { background:lime }
rename from layout/reftests/w3c-css/received/css3-namespace/syntax-007.xml
rename to layout/reftests/w3c-css/received/css-namespaces-3/syntax-007.xml
--- a/layout/reftests/w3c-css/received/css3-namespace/syntax-007.xml
+++ b/layout/reftests/w3c-css/received/css-namespaces-3/syntax-007.xml
@@ -1,13 +1,13 @@
 <html xmlns="http://www.w3.org/1999/xhtml">
  <head>
   <link rel="author" title="Anne van Kesteren" href="http://annevankesteren.nl/"/>
   <link rel="author" title="Opera Software ASA" href="http://opera.com/"/>
-  <link rel="help" href="http://www.w3.org/TR/css3-namespace/#syntax"/>
+  <link rel="help" href="http://www.w3.org/TR/css-namespaces-3/#syntax"/>
   <link rel="match" href="reftest/ref-lime-1.xml"/>
   <title>CSS Namespaces Test Suite: @namespace and @charset</title>
   <link rel="stylesheet" href="support/syntax-007.css"/>
  </head>
  <body>
   <p><test xmlns="test">This sentence should have a green background.</test></p>
  </body>
 </html>
rename from layout/reftests/w3c-css/received/css3-namespace/syntax-008.xml
rename to layout/reftests/w3c-css/received/css-namespaces-3/syntax-008.xml
--- a/layout/reftests/w3c-css/received/css3-namespace/syntax-008.xml
+++ b/layout/reftests/w3c-css/received/css-namespaces-3/syntax-008.xml
@@ -1,13 +1,13 @@
 <html xmlns="http://www.w3.org/1999/xhtml">
  <head>
   <link rel="author" title="Anne van Kesteren" href="http://annevankesteren.nl/"/>
   <link rel="author" title="Opera Software ASA" href="http://opera.com/"/>
-  <link rel="help" href="http://www.w3.org/TR/css3-namespace/#syntax"/>
+  <link rel="help" href="http://www.w3.org/TR/css-namespaces-3/#syntax"/>
   <link rel="match" href="reftest/ref-lime-2.xml"/>
   <title>CSS Namespaces Test Suite: escapes in prefix</title>
   <style>
    @namespace \72x url("test");
    t { background:red }
    r\78|t { background:lime }
   </style>
   <style>
rename from layout/reftests/w3c-css/received/css3-namespace/syntax-009.xml
rename to layout/reftests/w3c-css/received/css-namespaces-3/syntax-009.xml
--- a/layout/reftests/w3c-css/received/css3-namespace/syntax-009.xml
+++ b/layout/reftests/w3c-css/received/css-namespaces-3/syntax-009.xml
@@ -1,13 +1,13 @@
 <html xmlns="http://www.w3.org/1999/xhtml">
  <head>
   <link rel="author" title="Anne van Kesteren" href="http://annevankesteren.nl/"/>
   <link rel="author" title="Opera Software ASA" href="http://opera.com/"/>
-  <link rel="help" href="http://www.w3.org/TR/css3-namespace/#syntax"/>
+  <link rel="help" href="http://www.w3.org/TR/css-namespaces-3/#syntax"/>
   <link rel="match" href="reftest/ref-lime-1.xml"/>
   <title>CSS Namespaces Test Suite: escaped vertical bar in qualified name</title>
   <style>
    @namespace x "test";
    test { background:red }
    x|test { background:lime }
    x\00007Ctest { background:red }
   </style>
rename from layout/reftests/w3c-css/received/css3-namespace/syntax-010.xml
rename to layout/reftests/w3c-css/received/css-namespaces-3/syntax-010.xml
--- a/layout/reftests/w3c-css/received/css3-namespace/syntax-010.xml
+++ b/layout/reftests/w3c-css/received/css-namespaces-3/syntax-010.xml
@@ -1,13 +1,13 @@
 <html xmlns="http://www.w3.org/1999/xhtml">
  <head>
   <link rel="author" title="Anne van Kesteren" href="http://annevankesteren.nl/"/>
   <link rel="author" title="Opera Software ASA" href="http://opera.com/"/>
-  <link rel="help" href="http://www.w3.org/TR/css3-namespace/#syntax"/>
+  <link rel="help" href="http://www.w3.org/TR/css-namespaces-3/#syntax"/>
   <link rel="match" href="reftest/ref-lime-3.xml"/>
   <meta name="flags" content="invalid"/>
   <title>CSS Namespaces Test Suite: duplicate @namespace declarations</title>
   <style>
    @namespace "1";
    @namespace dummy "yummy";
    @namespace "2";
    *|t { background:lime }
rename from layout/reftests/w3c-css/received/css3-namespace/syntax-011.xml
rename to layout/reftests/w3c-css/received/css-namespaces-3/syntax-011.xml
--- a/layout/reftests/w3c-css/received/css3-namespace/syntax-011.xml
+++ b/layout/reftests/w3c-css/received/css-namespaces-3/syntax-011.xml
@@ -1,13 +1,13 @@
 <html xmlns="http://www.w3.org/1999/xhtml">
  <head>
   <link rel="author" title="Anne van Kesteren" href="http://annevankesteren.nl/"/>
   <link rel="author" title="Opera Software ASA" href="http://opera.com/"/>
-  <link rel="help" href="http://www.w3.org/TR/css3-namespace/#syntax"/>
+  <link rel="help" href="http://www.w3.org/TR/css-namespaces-3/#syntax"/>
   <link rel="match" href="reftest/ref-lime-6.xml"/>
   <title>CSS Namespaces Test Suite: string comparison (no URI resolving)</title>
   <style>
    @namespace url("http://example.com/");
    *|t { background:lime }
    t { background:red }
   </style>
   <style>
rename from layout/reftests/w3c-css/received/css3-namespace/syntax-012.xml
rename to layout/reftests/w3c-css/received/css-namespaces-3/syntax-012.xml
--- a/layout/reftests/w3c-css/received/css3-namespace/syntax-012.xml
+++ b/layout/reftests/w3c-css/received/css-namespaces-3/syntax-012.xml
@@ -1,28 +1,28 @@
 <html xmlns="http://www.w3.org/1999/xhtml">
  <head>
   <link rel="author" title="Anne van Kesteren" href="http://annevankesteren.nl/"/>
   <link rel="author" title="Opera Software ASA" href="http://opera.com/"/>
-  <link rel="help" href="http://www.w3.org/TR/css3-namespace/#syntax"/>
+  <link rel="help" href="http://www.w3.org/TR/css-namespaces-3/#syntax"/>
   <link rel="match" href="reftest/ref-lime-3.xml"/>
   <title>CSS Namespaces Test Suite: whitespace and comment handling</title>
   <style>
    test { background:red }
   </style>
   <style>
    @namespace/* test */
    a
    url(
 test-a );
 
    @namespace/**/b/**/url(	'test-b'
 );
 
-   @namespace	c	url("test-c"	
+   @namespace	c	url("test-c"
 );
 
    a|test, b|test, c|test { background:lime }
   </style>
  </head>
  <body>
   <p><test xmlns="test-a">This sentence should have a green background.</test></p>
   <p><test xmlns="test-b">This sentence should have a green background.</test></p>
rename from layout/reftests/w3c-css/received/css3-namespace/syntax-013.xml
rename to layout/reftests/w3c-css/received/css-namespaces-3/syntax-013.xml
--- a/layout/reftests/w3c-css/received/css3-namespace/syntax-013.xml
+++ b/layout/reftests/w3c-css/received/css-namespaces-3/syntax-013.xml
@@ -1,14 +1,14 @@
 <html xmlns="http://www.w3.org/1999/xhtml">
  <head>
   <link rel="author" title="Anne van Kesteren" href="http://annevankesteren.nl/"/>
   <link rel="author" title="Opera Software ASA" href="http://opera.com/"/>
   <link rel="author" title="Elika J. Etemad" href="http://fantasai.inkedblade.net/contact"/>
-  <link rel="help" href="http://www.w3.org/TR/css3-namespace/#syntax"/>
+  <link rel="help" href="http://www.w3.org/TR/css-namespaces-3/#syntax"/>
   <link rel="match" href="reftest/ref-lime-5.xml"/>
   <meta name="flags" content="invalid"/>
   <title>CSS Namespaces Test Suite: @namespace error handling</title>
   <style>
    t, t2, t3, t4, t5 { background:red }
   </style>
   <style>
    @namespace "test" {}
rename from layout/reftests/w3c-css/received/css3-namespace/syntax-014.xml
rename to layout/reftests/w3c-css/received/css-namespaces-3/syntax-014.xml
--- a/layout/reftests/w3c-css/received/css3-namespace/syntax-014.xml
+++ b/layout/reftests/w3c-css/received/css-namespaces-3/syntax-014.xml
@@ -1,13 +1,13 @@
 <html xmlns="http://www.w3.org/1999/xhtml">
  <head>
   <link rel="author" title="Anne van Kesteren" href="http://annevankesteren.nl/"/>
   <link rel="author" title="Opera Software ASA" href="http://opera.com/"/>
-  <link rel="help" href="http://www.w3.org/TR/css3-namespace/#syntax"/>
+  <link rel="help" href="http://www.w3.org/TR/css-namespaces-3/#syntax"/>
   <link rel="match" href="reftest/ref-lime-3.xml"/>
   <meta name="flags" content="invalid"/>
   <title>CSS Namespaces Test Suite: @namespace and invalid at-rules</title>
   <style>
    t, t2, t3 { background:red }
   </style>
   <style>
    @import x {}
rename from layout/reftests/w3c-css/received/css3-namespace/syntax-015.xml
rename to layout/reftests/w3c-css/received/css-namespaces-3/syntax-015.xml
--- a/layout/reftests/w3c-css/received/css3-namespace/syntax-015.xml
+++ b/layout/reftests/w3c-css/received/css-namespaces-3/syntax-015.xml
@@ -1,13 +1,13 @@
 <html xmlns="http://www.w3.org/1999/xhtml">
  <head>
   <link rel="author" title="Anne van Kesteren" href="http://annevankesteren.nl/"/>
   <link rel="author" title="Opera Software ASA" href="http://opera.com/"/>
-  <link rel="help" href="http://www.w3.org/TR/css3-namespace/#syntax"/>
+  <link rel="help" href="http://www.w3.org/TR/css-namespaces-3/#syntax"/>
   <link rel="match" href="reftest/ref-lime-1.xml"/>
   <title>CSS Namespaces Test Suite: invalid URI</title>
   <style>
    @namespace x url("test");
    @namespace x url("}x&lt; >x{");
    t { background:lime }
    x|t { background:red }
   </style>
new file mode 100644
--- /dev/null
+++ b/layout/reftests/w3c-css/received/css3-conditional/at-media-whitespace-optional-001.html
@@ -0,0 +1,17 @@
+<!DOCTYPE html>
+<html>
+ <head>
+  <title>CSS Test: DESCRIPTION OF TEST</title>
+  <link rel="author" title="L. David Baron" href="http://dbaron.org/">
+  <link rel="author" title="Mozilla Corporation" href="http://mozilla.com/">
+  <link rel="match" href="reference/background-lime.html">
+  <link rel="help" href="http://www.w3.org/TR/css3-conditional/#at-media">
+  <meta name="assert" content="Whitespace after the MEDIA_SYM token is optional (S*).">
+  <style>
+   @media{ body { background: lime; color: black; } }
+  </style>
+ </head>
+ <body>
+   This page should have a light green background.
+ </body>
+</html>
new file mode 100644
--- /dev/null
+++ b/layout/reftests/w3c-css/received/css3-conditional/at-media-whitespace-optional-002.html
@@ -0,0 +1,17 @@
+<!DOCTYPE html>
+<html>
+ <head>
+  <title>CSS Test: DESCRIPTION OF TEST</title>
+  <link rel="author" title="L. David Baron" href="http://dbaron.org/">
+  <link rel="author" title="Mozilla Corporation" href="http://mozilla.com/">
+  <link rel="match" href="reference/background-lime.html">
+  <link rel="help" href="http://www.w3.org/TR/css3-conditional/#at-media">
+  <meta name="assert" content="Whitespace after the MEDIA_SYM token is optional (S*).">
+  <style>
+   @media(min-width:0px){ body { background: lime; color: black; } }
+  </style>
+ </head>
+ <body>
+   This page should have a light green background.
+ </body>
+</html>
--- a/layout/reftests/w3c-css/received/css3-conditional/at-supports-001-ref.html
+++ b/layout/reftests/w3c-css/received/css3-conditional/at-supports-001-ref.html
@@ -1,13 +1,14 @@
 <!doctype html>
 <html>
 	<head>
 		<title>CSS Reftest Reference</title>
-		<link rel="author" title="Florian Rivoal" href="mailto:florianr@opera.com">
+		<link rel="author" title="Florian Rivoal" href="http://florian.rivoal.net/">
+		<link rel="author" href="http://opera.com" title="Opera Software ASA">
 		<style>
 			div {
 				background-color:green;
 				height:100px;
 				width:100px;
 			}
 		</style>
 	</head>
--- a/layout/reftests/w3c-css/received/css3-conditional/at-supports-001.html
+++ b/layout/reftests/w3c-css/received/css3-conditional/at-supports-001.html
@@ -1,12 +1,13 @@
 <!doctype html>
 <head>
 	<title>CSS Test (Conditional Rules): Support for simple passing conditions in @supports</title>
-	<link rel="author" title="Florian Rivoal" href="mailto:florianr@opera.com">
+	<link rel="author" title="Florian Rivoal" href="http://florian.rivoal.net/">
+	<link rel="author" href="http://opera.com" title="Opera Software ASA">
 	<link rel="help" href="http://www.w3.org/TR/css3-conditional/#at-supports">
 	<link rel="match" href="at-supports-001-ref.html">
 	<meta name="flags" content="">
 	<style>
 		div {
 			background-color:red;
 			height:100px;
 			width:100px;
--- a/layout/reftests/w3c-css/received/css3-conditional/at-supports-002.html
+++ b/layout/reftests/w3c-css/received/css3-conditional/at-supports-002.html
@@ -1,13 +1,14 @@
 <!doctype html>
 <html>
 	<head>
 		<title>CSS Test (Conditional Rules): Support for @supports within @media</title>
-		<link rel="author" title="Florian Rivoal" href="mailto:florianr@opera.com">
+		<link rel="author" title="Florian Rivoal" href="http://florian.rivoal.net/">
+		<link rel="author" href="http://opera.com" title="Opera Software ASA">
 		<link rel="help" href="http://www.w3.org/TR/css3-conditional/#at-supports">
 		<link rel="match" href="at-supports-001-ref.html">
 		<meta name="flags" content="">
 		<style>
 			div {
 				background-color:red;
 				height:100px;
 				width:100px;
--- a/layout/reftests/w3c-css/received/css3-conditional/at-supports-003.html
+++ b/layout/reftests/w3c-css/received/css3-conditional/at-supports-003.html
@@ -1,13 +1,14 @@
 <!doctype html>
 <html>
 	<head>
 		<title>CSS Test (Conditional Rules): Support for @media within @supports</title>
-		<link rel="author" title="Florian Rivoal" href="mailto:florianr@opera.com">
+		<link rel="author" title="Florian Rivoal" href="http://florian.rivoal.net/">
+		<link rel="author" href="http://opera.com" title="Opera Software ASA">
 		<link rel="help" href="http://www.w3.org/TR/css3-conditional/#at-supports">
 		<link rel="match" href="at-supports-001-ref.html">
 		<meta name="flags" content="">
 		<style>
 			div {
 				background-color:red;
 				height:100px;
 				width:100px;
--- a/layout/reftests/w3c-css/received/css3-conditional/at-supports-004.html
+++ b/layout/reftests/w3c-css/received/css3-conditional/at-supports-004.html
@@ -1,13 +1,14 @@
 <!doctype html>
 <html>
 	<head>
 		<title>CSS Test (Conditional Rules): @supports within non-matching @media should not apply</title>
-		<link rel="author" title="Florian Rivoal" href="mailto:florianr@opera.com">
+		<link rel="author" title="Florian Rivoal" href="http://florian.rivoal.net/">
+		<link rel="author" href="http://opera.com" title="Opera Software ASA">
 		<link rel="help" href="http://www.w3.org/TR/css3-conditional/#at-supports">
 		<link rel="match" href="at-supports-001-ref.html">
 		<meta name="flags" content="">
 		<style>
 			div {
 				background-color:red;
 				height:100px;
 				width:100px;
--- a/layout/reftests/w3c-css/received/css3-conditional/at-supports-005.html
+++ b/layout/reftests/w3c-css/received/css3-conditional/at-supports-005.html
@@ -1,13 +1,14 @@
 <!doctype html>
 <html>
 	<head>
 		<title>CSS Test (Conditional Rules): non-matching @media within @supports should not apply</title>
-		<link rel="author" title="Florian Rivoal" href="mailto:florianr@opera.com">
+		<link rel="author" title="Florian Rivoal" href="http://florian.rivoal.net/">
+		<link rel="author" href="http://opera.com" title="Opera Software ASA">
 		<link rel="help" href="http://www.w3.org/TR/css3-conditional/#at-supports">
 		<link rel="match" href="at-supports-001-ref.html">
 		<meta name="flags" content="">
 		<style>
 			div {
 				background-color:red;
 				height:100px;
 				width:100px;
--- a/layout/reftests/w3c-css/received/css3-conditional/at-supports-006.html
+++ b/layout/reftests/w3c-css/received/css3-conditional/at-supports-006.html
@@ -1,13 +1,14 @@
 <!doctype html>
 <html>
 	<head>
 		<title>CSS Test (Conditional Rules): Nested parens around conditions in @supports should work</title>
-		<link rel="author" title="Florian Rivoal" href="mailto:florianr@opera.com">
+		<link rel="author" title="Florian Rivoal" href="http://florian.rivoal.net/">
+		<link rel="author" href="http://opera.com" title="Opera Software ASA">
 		<link rel="help" href="http://www.w3.org/TR/css3-conditional/#at-supports">
 		<link rel="match" href="at-supports-001-ref.html">
 		<meta name="flags" content="">
 		<style>
 			div {
 				background-color:red;
 				height:100px;
 				width:100px;
--- a/layout/reftests/w3c-css/received/css3-conditional/at-supports-007.html
+++ b/layout/reftests/w3c-css/received/css3-conditional/at-supports-007.html
@@ -1,13 +1,14 @@
 <!doctype html>
 <html>
 	<head>
 		<title>CSS Test (Conditional Rules): Conjunctions of passing simple conditions in @supports should pass</title>
-		<link rel="author" title="Florian Rivoal" href="mailto:florianr@opera.com">
+		<link rel="author" title="Florian Rivoal" href="http://florian.rivoal.net/">
+		<link rel="author" href="http://opera.com" title="Opera Software ASA">
 		<link rel="help" href="http://www.w3.org/TR/css3-conditional/#at-supports">
 		<link rel="match" href="at-supports-001-ref.html">
 		<meta name="flags" content="">
 		<style>
 			div {
 				background-color:red;
 				height:100px;
 				width:100px;
--- a/layout/reftests/w3c-css/received/css3-conditional/at-supports-008.html
+++ b/layout/reftests/w3c-css/received/css3-conditional/at-supports-008.html
@@ -1,13 +1,14 @@
 <!doctype html>
 <html>
 	<head>
 		<title>CSS Test (Conditional Rules): Disjunctions with at least a passing simple condition in @supports should pass</title>
-		<link rel="author" title="Florian Rivoal" href="mailto:florianr@opera.com">
+		<link rel="author" title="Florian Rivoal" href="http://florian.rivoal.net/">
+		<link rel="author" href="http://opera.com" title="Opera Software ASA">
 		<link rel="help" href="http://www.w3.org/TR/css3-conditional/#at-supports">
 		<link rel="match" href="at-supports-001-ref.html">
 		<meta name="flags" content="">
 		<style>
 			div {
 				background-color:red;
 				height:100px;
 				width:100px;
--- a/layout/reftests/w3c-css/received/css3-conditional/at-supports-009.html
+++ b/layout/reftests/w3c-css/received/css3-conditional/at-supports-009.html
@@ -1,13 +1,14 @@
 <!doctype html>
 <html>
 	<head>
 		<title>CSS Test (Conditional Rules): Negations of failing simple conditions in @supports should pass</title>
-		<link rel="author" title="Florian Rivoal" href="mailto:florianr@opera.com">
+		<link rel="author" title="Florian Rivoal" href="http://florian.rivoal.net/">
+		<link rel="author" href="http://opera.com" title="Opera Software ASA">
 		<link rel="help" href="http://www.w3.org/TR/css3-conditional/#at-supports">
 		<link rel="match" href="at-supports-001-ref.html">
 		<meta name="flags" content="">
 		<style>
 			div {
 				background-color:red;
 				height:100px;
 				width:100px;
--- a/layout/reftests/w3c-css/received/css3-conditional/at-supports-010.html
+++ b/layout/reftests/w3c-css/received/css3-conditional/at-supports-010.html
@@ -1,13 +1,14 @@
 <!doctype html>
 <html>
 	<head>
 		<title>CSS Test (Conditional Rules): Combinations of conjuctions, disjunctions, and negations of simple conditions in @supports should work</title>
-		<link rel="author" title="Florian Rivoal" href="mailto:florianr@opera.com">
+		<link rel="author" title="Florian Rivoal" href="http://florian.rivoal.net/">
+		<link rel="author" href="http://opera.com" title="Opera Software ASA">
 		<link rel="help" href="http://www.w3.org/TR/css3-conditional/#at-supports">
 		<link rel="match" href="at-supports-001-ref.html">
 		<meta name="flags" content="">
 		<style>
 			div {
 				background-color:red;
 				height:100px;
 				width:100px;
--- a/layout/reftests/w3c-css/received/css3-conditional/at-supports-011.html
+++ b/layout/reftests/w3c-css/received/css3-conditional/at-supports-011.html
@@ -1,13 +1,14 @@
 <!doctype html>
 <html>
 	<head>
 		<title>CSS Test (Conditional Rules): Conditions not enclosed in parens in @supports should not work</title>
-		<link rel="author" title="Florian Rivoal" href="mailto:florianr@opera.com">
+		<link rel="author" title="Florian Rivoal" href="http://florian.rivoal.net/">
+		<link rel="author" href="http://opera.com" title="Opera Software ASA">
 		<link rel="help" href="http://www.w3.org/TR/css3-conditional/#at-supports">
 		<link rel="match" href="at-supports-001-ref.html">
 		<meta name="flags" content="invalid">
 		<style>
 			div {
 				background-color:red;
 				height:100px;
 				width:100px;
--- a/layout/reftests/w3c-css/received/css3-conditional/at-supports-012.html
+++ b/layout/reftests/w3c-css/received/css3-conditional/at-supports-012.html
@@ -1,13 +1,14 @@
 <!doctype html>
 <html>
 	<head>
 		<title>CSS Test (Conditional Rules): Conjunctions with more than two terms in @supports should work</title>
-		<link rel="author" title="Florian Rivoal" href="mailto:florianr@opera.com">
+		<link rel="author" title="Florian Rivoal" href="http://florian.rivoal.net/">
+		<link rel="author" href="http://opera.com" title="Opera Software ASA">
 		<link rel="help" href="http://www.w3.org/TR/css3-conditional/#at-supports">
 		<link rel="match" href="at-supports-001-ref.html">
 		<meta name="flags" content="">
 		<style>
 			div {
 				background-color:red;
 				height:100px;
 				width:100px;
--- a/layout/reftests/w3c-css/received/css3-conditional/at-supports-013.html
+++ b/layout/reftests/w3c-css/received/css3-conditional/at-supports-013.html
@@ -1,13 +1,14 @@
 <!doctype html>
 <html>
 	<head>
 		<title>CSS Test (Conditional Rules): Disjunction with more than two terms in @supports should work</title>
-		<link rel="author" title="Florian Rivoal" href="mailto:florianr@opera.com">
+		<link rel="author" title="Florian Rivoal" href="http://florian.rivoal.net/">
+		<link rel="author" href="http://opera.com" title="Opera Software ASA">
 		<link rel="help" href="http://www.w3.org/TR/css3-conditional/#at-supports">
 		<link rel="match" href="at-supports-001-ref.html">
 		<meta name="flags" content="">
 		<style>
 			div {
 				background-color:red;
 				height:100px;
 				width:100px;
--- a/layout/reftests/w3c-css/received/css3-conditional/at-supports-014.html
+++ b/layout/reftests/w3c-css/received/css3-conditional/at-supports-014.html
@@ -1,26 +1,27 @@
 <!doctype html>
 <html>
 	<head>
 		<title>CSS Test (Conditional Rules): Negations in @supports should not work if "not" isn't follow by a space</title>
-		<link rel="author" title="Florian Rivoal" href="mailto:florianr@opera.com">
+		<link rel="author" title="Florian Rivoal" href="http://florian.rivoal.net/">
+		<link rel="author" href="http://opera.com" title="Opera Software ASA">
 		<link rel="help" href="http://www.w3.org/TR/css3-conditional/#at-supports">
 		<link rel="match" href="at-supports-001-ref.html">
-		<meta name="flags" content="">
+		<meta name="flags" content="invalid">
 		<style>
 			div {
 				background-color:red;
 				height:100px;
 				width:100px;
 			}
 			@supports (width: 0) {
 				div { background-color:green; }
 			}
-			@supports (not(foo: baz)) {
+			@supports not(foo: baz) {
 				div { background-color:red; }
 			}
 		</style>
 	</head>
 	<body>
 		<p>Test passes if there is a <strong>filled green square</strong> and <strong>no red</strong>.</p>
 		<div></div>
 	</body>
--- a/layout/reftests/w3c-css/received/css3-conditional/at-supports-015.html
+++ b/layout/reftests/w3c-css/received/css3-conditional/at-supports-015.html
@@ -1,13 +1,14 @@
 <!doctype html>
 <html>
 	<head>
 		<title>CSS Test (Conditional Rules): Bizarre syntax that still conforms to the core grammar should succesfully parse in @supports</title>
-		<link rel="author" title="Florian Rivoal" href="mailto:florianr@opera.com">
+		<link rel="author" title="Florian Rivoal" href="http://florian.rivoal.net/">
+		<link rel="author" href="http://opera.com" title="Opera Software ASA">
 		<link rel="help" href="http://www.w3.org/TR/css3-conditional/#at-supports">
 		<link rel="match" href="at-supports-001-ref.html">
 		<meta name="flags" content="">
 		<style>
 			div {
 				background-color:red;
 				height:100px;
 				width:100px;
--- a/layout/reftests/w3c-css/received/css3-conditional/at-supports-016.html
+++ b/layout/reftests/w3c-css/received/css3-conditional/at-supports-016.html
@@ -1,13 +1,14 @@
 <!doctype html>
 <html>
 	<head>
 		<title>CSS Test (Conditional Rules): In @supports, parens are required to mix conjunctions with disjunctions</title>
-		<link rel="author" title="Florian Rivoal" href="mailto:florianr@opera.com">
+		<link rel="author" title="Florian Rivoal" href="http://florian.rivoal.net/">
+		<link rel="author" href="http://opera.com" title="Opera Software ASA">
 		<link rel="help" href="http://www.w3.org/TR/css3-conditional/#at-supports">
 		<link rel="match" href="at-supports-001-ref.html">
 		<meta name="flags" content="invalid">
 		<style>
 			div{
 				background-color:red;
 				height:100px;
 				width:100px;
--- a/layout/reftests/w3c-css/received/css3-conditional/at-supports-017.html
+++ b/layout/reftests/w3c-css/received/css3-conditional/at-supports-017.html
@@ -1,13 +1,14 @@
 <!doctype html>
 <html>
 	<head>
 		<title>CSS Test (Conditional Rules): In @supports, functions can be parsed successfully</title>
-		<link rel="author" title="Florian Rivoal" href="mailto:florianr@opera.com">
+		<link rel="author" title="Florian Rivoal" href="http://florian.rivoal.net/">
+		<link rel="author" href="http://opera.com" title="Opera Software ASA">
 		<link rel="help" href="http://www.w3.org/TR/css3-conditional/#at-supports">
 		<link rel="match" href="at-supports-001-ref.html">
 		<meta name="flags" content="">
 		<style>
 			div {
 				background:red;
 				height:100px;
 				width:100px;
--- a/layout/reftests/w3c-css/received/css3-conditional/at-supports-018.html
+++ b/layout/reftests/w3c-css/received/css3-conditional/at-supports-018.html
@@ -1,13 +1,14 @@
 <!doctype html>
 <html>
 	<head>
 		<title>CSS Test (Conditional Rules): In @supports conditions, the arguments of a function can begin with spaces</title>
-		<link rel="author" title="Florian Rivoal" href="mailto:florianr@opera.com">
+		<link rel="author" title="Florian Rivoal" href="http://florian.rivoal.net/">
+		<link rel="author" href="http://opera.com" title="Opera Software ASA">
 		<link rel="help" href="http://www.w3.org/TR/css3-conditional/#at-supports">
 		<link rel="match" href="at-supports-001-ref.html">
 		<meta name="flags" content="">
 		<style>
 			div {
 				background:red;
 				height:100px;
 				width:100px;
--- a/layout/reftests/w3c-css/received/css3-conditional/at-supports-019.html
+++ b/layout/reftests/w3c-css/received/css3-conditional/at-supports-019.html
@@ -1,13 +1,14 @@
 <!doctype html>
 <html>
 	<head>
 		<title>CSS Test (Conditional Rules): Incorrect syntax in @supports recovers properly</title>
-		<link rel="author" title="Florian Rivoal" href="mailto:florianr@opera.com">
+		<link rel="author" title="Florian Rivoal" href="http://florian.rivoal.net/">
+		<link rel="author" href="http://opera.com" title="Opera Software ASA">
 		<link rel="help" href="http://www.w3.org/TR/css3-conditional/#at-supports">
 		<link rel="match" href="at-supports-001-ref.html">
 		<meta name="flags" content="invalid">
 		<style>
 			div {
 				background-color:red;
 				height:100px;
 				width:100px;
--- a/layout/reftests/w3c-css/received/css3-conditional/at-supports-020.html
+++ b/layout/reftests/w3c-css/received/css3-conditional/at-supports-020.html
@@ -1,13 +1,14 @@
 <!doctype html>
 <html>
 	<head>
 		<title>CSS Test (Conditional Rules): Incorrect syntax in @supports recovers properly</title>
-		<link rel="author" title="Florian Rivoal" href="mailto:florianr@opera.com">
+		<link rel="author" title="Florian Rivoal" href="http://florian.rivoal.net/">
+		<link rel="author" href="http://opera.com" title="Opera Software ASA">
 		<link rel="help" href="http://www.w3.org/TR/css3-conditional/#at-supports">
 		<link rel="match" href="at-supports-001-ref.html">
 		<meta name="flags" content="invalid">
 		<style>
 			div {
 				background-color:red;
 				height:100px;
 				width:100px;
--- a/layout/reftests/w3c-css/received/css3-conditional/at-supports-021.html
+++ b/layout/reftests/w3c-css/received/css3-conditional/at-supports-021.html
@@ -1,13 +1,14 @@
 <!doctype html>
 <html>
 	<head>
 		<title>CSS Test (Conditional Rules): Incorrect syntax in @supports recovers properly</title>
-		<link rel="author" title="Florian Rivoal" href="mailto:florianr@opera.com">
+		<link rel="author" title="Florian Rivoal" href="http://florian.rivoal.net/">
+		<link rel="author" href="http://opera.com" title="Opera Software ASA">
 		<link rel="help" href="http://www.w3.org/TR/css3-conditional/#at-supports">
 		<link rel="match" href="at-supports-001-ref.html">
 		<meta name="flags" content="invalid">
 		<style>
 			div {
 				background-color:red;
 				height:100px;
 				width:100px;
--- a/layout/reftests/w3c-css/received/css3-conditional/at-supports-022.html
+++ b/layout/reftests/w3c-css/received/css3-conditional/at-supports-022.html
@@ -1,13 +1,14 @@
 <!doctype html>
 <html>
 	<head>
 		<title>CSS Test (Conditional Rules): Incorrect syntax in @supports recovers properly</title>
-		<link rel="author" title="Florian Rivoal" href="mailto:florianr@opera.com">
+		<link rel="author" title="Florian Rivoal" href="http://florian.rivoal.net/">
+		<link rel="author" href="http://opera.com" title="Opera Software ASA">
 		<link rel="help" href="http://www.w3.org/TR/css3-conditional/#at-supports">
 		<link rel="match" href="at-supports-001-ref.html">
 		<meta name="flags" content="invalid">
 		<style>
 			div {
 				background-color:red;
 				height:100px;
 				width:100px;
--- a/layout/reftests/w3c-css/received/css3-conditional/at-supports-023.html
+++ b/layout/reftests/w3c-css/received/css3-conditional/at-supports-023.html
@@ -1,13 +1,14 @@
 <!doctype html>
 <html>
 	<head>
 		<title>CSS Test (Conditional Rules): Incorrect syntax in nested @supports recovers properly</title>
-		<link rel="author" title="Florian Rivoal" href="mailto:florianr@opera.com">
+		<link rel="author" title="Florian Rivoal" href="http://florian.rivoal.net/">
+		<link rel="author" href="http://opera.com" title="Opera Software ASA">
 		<link rel="help" href="http://www.w3.org/TR/css3-conditional/#at-supports">
 		<link rel="match" href="at-supports-001-ref.html">
 		<meta name="flags" content="invalid">
 		<style>
 			div {
 				background-color:red;
 				height:100px;
 				width:100px;
--- a/layout/reftests/w3c-css/received/css3-conditional/at-supports-024.html
+++ b/layout/reftests/w3c-css/received/css3-conditional/at-supports-024.html
@@ -1,13 +1,14 @@
 <!doctype html>
 <html>
 	<head>
 		<title>CSS Test (Conditional Rules): Incorrect syntax in @supports recovers properly</title>
-		<link rel="author" title="Florian Rivoal" href="mailto:florianr@opera.com">
+		<link rel="author" title="Florian Rivoal" href="http://florian.rivoal.net/">
+		<link rel="author" href="http://opera.com" title="Opera Software ASA">
 		<link rel="help" href="http://www.w3.org/TR/css3-conditional/#at-supports">
 		<link rel="match" href="at-supports-001-ref.html">
 		<meta name="flags" content="invalid">
 		<style>
 			div {
 				background-color:red;
 				height:100px;
 				width:100px;
--- a/layout/reftests/w3c-css/received/css3-conditional/at-supports-025.html
+++ b/layout/reftests/w3c-css/received/css3-conditional/at-supports-025.html
@@ -1,13 +1,14 @@
 <!doctype html>
 <html>
 	<head>
 		<title>CSS Test (Conditional Rules): Incorrect syntax in @supports recovers properly</title>
-		<link rel="author" title="Florian Rivoal" href="mailto:florianr@opera.com">
+		<link rel="author" title="Florian Rivoal" href="http://florian.rivoal.net/">
+		<link rel="author" href="http://opera.com" title="Opera Software ASA">
 		<link rel="help" href="http://www.w3.org/TR/css3-conditional/#at-supports">
 		<link rel="match" href="at-supports-001-ref.html">
 		<meta name="flags" content="invalid">
 		<style>
 			div {
 				background-color:red;
 				height:100px;
 				width:100px;
--- a/layout/reftests/w3c-css/received/css3-conditional/at-supports-026.html
+++ b/layout/reftests/w3c-css/received/css3-conditional/at-supports-026.html
@@ -1,13 +1,14 @@
 <!doctype html>
 <html>
 	<head>
 		<title>CSS Test (Conditional Rules): Incorrect syntax in @supports recovers properly</title>
-		<link rel="author" title="Florian Rivoal" href="mailto:florianr@opera.com">
+		<link rel="author" title="Florian Rivoal" href="http://florian.rivoal.net/">
+		<link rel="author" href="http://opera.com" title="Opera Software ASA">
 		<link rel="help" href="http://www.w3.org/TR/css3-conditional/#at-supports">
 		<link rel="match" href="at-supports-001-ref.html">
 		<meta name="flags" content="invalid">
 		<style>
 			div {
 				background-color:red;
 				height:100px;
 				width:100px;
--- a/layout/reftests/w3c-css/received/css3-conditional/at-supports-027-ref.html
+++ b/layout/reftests/w3c-css/received/css3-conditional/at-supports-027-ref.html
@@ -1,13 +1,14 @@
 <!doctype html>
 <html>
 	<head>
 		<title>CSS Reftest Reference</title>
-		<link rel="author" title="Florian Rivoal" href="mailto:florianr@opera.com">
+		<link rel="author" title="Florian Rivoal" href="http://florian.rivoal.net/">
+		<link rel="author" href="http://opera.com" title="Opera Software ASA">
 		<style>
 			div {
 				background-color:green;
 				height:100px;
 				width:100px;
 			}
 		</style>
 	</head>
--- a/layout/reftests/w3c-css/received/css3-conditional/at-supports-027.html
+++ b/layout/reftests/w3c-css/received/css3-conditional/at-supports-027.html
@@ -1,22 +1,23 @@
 <!doctype html>
 <html>
 	<head>
 		<title>CSS Test (Conditional Rules): Incorrect syntax in @supports recovers properly</title>
-		<link rel="author" title="Florian Rivoal" href="mailto:florianr@opera.com">
+		<link rel="author" title="Florian Rivoal" href="http://florian.rivoal.net/">
+		<link rel="author" href="http://opera.com" title="Opera Software ASA">
 		<link rel="help" href="http://www.w3.org/TR/css3-conditional/#at-supports">
 		<link rel="match" href="at-supports-027-ref.html">
 		<meta name="flags" content="invalid">
 		<style>
 			@supports (margin:0) { div { background-color:green; } }
 			div {
 				height:100px;
 				width:100px;
 			}
-			@supports (margin: 0) 
+			@supports (margin: 0)
 		</style>
 	</head>
 	<body>
 		<p>Test passes if there is a <strong>filled green square</strong>.</p>
 		<div></div>
 	</body>
 </html>
--- a/layout/reftests/w3c-css/received/css3-conditional/at-supports-028.html
+++ b/layout/reftests/w3c-css/received/css3-conditional/at-supports-028.html
@@ -1,13 +1,14 @@
 <!doctype html>
 <html>
 	<head>
 		<title>CSS Test (Conditional Rules): Incorrect syntax in @supports recovers properly</title>
-		<link rel="author" title="Florian Rivoal" href="mailto:florianr@opera.com">
+		<link rel="author" title="Florian Rivoal" href="http://florian.rivoal.net/">
+		<link rel="author" href="http://opera.com" title="Opera Software ASA">
 		<link rel="help" href="http://www.w3.org/TR/css3-conditional/#at-supports">
 		<link rel="match" href="at-supports-001-ref.html">
 		<meta name="flags" content="invalid">
 		<style>
 			div {
 				background-color:red;
 				height:100px;
 				width:100px;
--- a/layout/reftests/w3c-css/received/css3-conditional/at-supports-029.html
+++ b/layout/reftests/w3c-css/received/css3-conditional/at-supports-029.html
@@ -1,13 +1,14 @@
 <!doctype html>
 <html>
 	<head>
 		<title>CSS Test (Conditional Rules): Incorrect syntax in @supports recovers properly</title>
-		<link rel="author" title="Florian Rivoal" href="mailto:florianr@opera.com">
+		<link rel="author" title="Florian Rivoal" href="http://florian.rivoal.net/">
+		<link rel="author" href="http://opera.com" title="Opera Software ASA">
 		<link rel="help" href="http://www.w3.org/TR/css3-conditional/#at-supports">
 		<link rel="match" href="at-supports-027-ref.html">
 		<meta name="flags" content="invalid">
 		<style>
 			@supports (margin:0) { div { background-color:green; } }
 			div {
 				height:100px;
 				width:100px;
--- a/layout/reftests/w3c-css/received/css3-conditional/at-supports-030.html
+++ b/layout/reftests/w3c-css/received/css3-conditional/at-supports-030.html
@@ -1,13 +1,14 @@
 <!doctype html>
 <html>
 	<head>
 		<title>CSS Test (Conditional Rules): Incorrect syntax in @supports recovers properly</title>
-		<link rel="author" title="Florian Rivoal" href="mailto:florianr@opera.com">
+		<link rel="author" title="Florian Rivoal" href="http://florian.rivoal.net/">
+		<link rel="author" href="http://opera.com" title="Opera Software ASA">
 		<link rel="help" href="http://www.w3.org/TR/css3-conditional/#at-supports">
 		<link rel="match" href="at-supports-001-ref.html">
 		<meta name="flags" content="invalid">
 		<style>
 			div {
 				background-color:red;
 				height:100px;
 				width:100px;
--- a/layout/reftests/w3c-css/received/css3-conditional/at-supports-031.html
+++ b/layout/reftests/w3c-css/received/css3-conditional/at-supports-031.html
@@ -1,13 +1,14 @@
 <!doctype html>
 <html>
 	<head>
 		<title>CSS Test (Conditional Rules): Incorrect syntax in @supports recovers properly</title>
-		<link rel="author" title="Florian Rivoal" href="mailto:florianr@opera.com">
+		<link rel="author" title="Florian Rivoal" href="http://florian.rivoal.net/">
+		<link rel="author" href="http://opera.com" title="Opera Software ASA">
 		<link rel="help" href="http://www.w3.org/TR/css3-conditional/#at-supports">
 		<link rel="match" href="at-supports-001-ref.html">
 		<meta name="flags" content="invalid">
 		<style>
 			div {
 				background-color:red;
 				height:100px;
 				width:100px;
--- a/layout/reftests/w3c-css/received/css3-conditional/at-supports-032.html
+++ b/layout/reftests/w3c-css/received/css3-conditional/at-supports-032.html
@@ -1,13 +1,14 @@
 <!doctype html>
 <html>
 	<head>
 		<title>CSS Test (Conditional Rules): Incorrect syntax in @supports recovers properly</title>
-		<link rel="author" title="Florian Rivoal" href="mailto:florianr@opera.com">
+		<link rel="author" title="Florian Rivoal" href="http://florian.rivoal.net/">
+		<link rel="author" href="http://opera.com" title="Opera Software ASA">
 		<link rel="help" href="http://www.w3.org/TR/css3-conditional/#at-supports">
 		<link rel="match" href="at-supports-001-ref.html">
 		<meta name="flags" content="invalid">
 		<style>
 			div {
 				background-color:red;
 				height:100px;
 				width:100px;
--- a/layout/reftests/w3c-css/received/css3-conditional/at-supports-033.html
+++ b/layout/reftests/w3c-css/received/css3-conditional/at-supports-033.html
@@ -1,13 +1,14 @@
 <!doctype html>
 <html>
 	<head>
 		<title>CSS Test (Conditional Rules): Incorrect syntax in @supports recovers properly</title>
-		<link rel="author" title="Florian Rivoal" href="mailto:florianr@opera.com">
+		<link rel="author" title="Florian Rivoal" href="http://florian.rivoal.net/">
+		<link rel="author" href="http://opera.com" title="Opera Software ASA">
 		<link rel="help" href="http://www.w3.org/TR/css3-conditional/#at-supports">
 		<link rel="match" href="at-supports-001-ref.html">
 		<meta name="flags" content="invalid">
 		<style>
 			div {
 				background-color:red;
 				height:100px;
 				width:100px;
new file mode 100644
--- /dev/null
+++ b/layout/reftests/w3c-css/received/css3-conditional/at-supports-034.html
@@ -0,0 +1,42 @@
+<!DOCTYPE html>
+<html>
+	<head>
+		<meta charset="utf-8">
+		<title>CSS Test (Conditional Rules): Incorrect syntax of supports condition</title>
+		<link rel="author" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/">
+		<link rel="help" href="http://www.w3.org/TR/css3-conditional/#at-supports" title="6. Feature queries: the '@supports' rule">
+		<link rel="match" href="at-supports-001-ref.html">
+		<meta name="flags" content="invalid">
+		<meta name="assert" content="Each individual single supports condition must be enclosed by one opening parenthesis '(' and one closing parenthesis ')'.">
+
+    <!--
+
+    supports_condition_in_parens
+      : ( '(' S* supports_condition ')' S* ) | supports_declaration_condition |
+        general_enclosed
+      ;
+
+    -->
+
+		<style>
+			div
+			{
+				background-color: red;
+				height: 100px;
+				width: 100px;
+			}
+
+			@supports (margin: 0 or padding: 0) {	div {background-color: red !important;} }
+
+			@supports (margin: 0) { div {background-color: green;} }
+		</style>
+	</head>
+
+	<body>
+
+		<p>Test passes if there is a <strong>filled green square</strong> and <strong>no red</strong>.</p>
+
+		<div></div>
+
+	</body>
+</html>
new file mode 100644
--- /dev/null
+++ b/layout/reftests/w3c-css/received/css3-conditional/at-supports-035.html
@@ -0,0 +1,42 @@
+<!DOCTYPE html>
+<html>
+	<head>
+		<meta charset="utf-8">
+		<title>CSS Test (Conditional Rules): Incorrect syntax of supports condition</title>
+		<link rel="author" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/">
+		<link rel="help" href="http://www.w3.org/TR/css3-conditional/#at-supports" title="6. Feature queries: the '@supports' rule">
+		<link rel="match" href="at-supports-001-ref.html">
+		<meta name="flags" content="invalid">
+		<meta name="assert" content="Each individual single supports condition must be enclosed by one opening parenthesis '(' and one closing parenthesis ')'.">
+
+    <!--
+
+    supports_condition_in_parens
+      : ( '(' S* supports_condition ')' S* ) | supports_declaration_condition |
+        general_enclosed
+      ;
+
+    -->
+
+		<style>
+			div
+			{
+				background-color: red;
+				height: 100px;
+				width: 100px;
+			}
+
+			@supports (margin: 0) { div {background-color: green;} }
+
+			@supports (margin: 0 or padding: 0) {	div {background-color: red;} }
+		</style>
+	</head>
+
+	<body>
+
+		<p>Test passes if there is a <strong>filled green square</strong> and <strong>no red</strong>.</p>
+
+		<div></div>
+
+	</body>
+</html>
new file mode 100644
--- /dev/null
+++ b/layout/reftests/w3c-css/received/css3-conditional/at-supports-036.html
@@ -0,0 +1,45 @@
+<!DOCTYPE html>
+<html>
+	<head>
+		<meta charset="utf-8">
+		<title>CSS Test (Conditional Rules): Incorrect syntax of supports condition</title>
+		<link rel="author" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/">
+		<link rel="help" href="http://www.w3.org/TR/css3-conditional/#at-supports" title="6. Feature queries: the '@supports' rule">
+		<link rel="match" href="at-supports-001-ref.html">
+		<meta name="flags" content="invalid">
+		<meta name="assert" content="Each individual single supports condition must be enclosed by one opening parenthesis '(' and one closing parenthesis ')'.">
+
+    <!--
+
+    supports_condition_in_parens
+      : ( '(' S* supports_condition ')' S* ) | supports_declaration_condition |
+        general_enclosed
+      ;
+
+    -->
+
+		<style>
+			div
+			{
+				background-color: red;
+				height: 100px;
+				width: 100px;
+			}
+
+			@supports (margin: 0 and padding: 0)
+			{
+				div {background-color: red !important;}
+			}
+
+			@supports (margin: 0) { div {background-color: green;} }
+		</style>
+	</head>
+
+	<body>
+
+		<p>Test passes if there is a <strong>filled green square</strong> and <strong>no red</strong>.</p>
+
+		<div></div>
+
+	</body>
+</html>
new file mode 100644
--- /dev/null
+++ b/layout/reftests/w3c-css/received/css3-conditional/at-supports-037.html
@@ -0,0 +1,43 @@
+<!DOCTYPE html>
+<html>
+	<head>
+		<meta charset="utf-8">
+		<title>CSS Test (Conditional Rules): Incorrect syntax of supports condition</title>
+		<link rel="author" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/">
+		<link rel="help" href="http://www.w3.org/TR/css3-conditional/#at-supports" title="6. Feature queries: the '@supports' rule">
+		<link rel="match" href="at-supports-001-ref.html">
+		<meta name="flags" content="invalid">
+		<meta name="assert" content="Each individual single supports condition must be enclosed by one opening parenthesis '(' and one closing parenthesis ')'.">
+
+    <!--
+
+    supports_condition_in_parens
+      : ( '(' S* supports_condition ')' S* ) | supports_declaration_condition |
+        general_enclosed
+      ;
+
+    -->
+
+		<style>
+			div
+			{
+				background-color: red;
+				height: 100px;
+				width: 100px;
+			}
+
+			@supports (margin: 0) { div {background-color: green;} }
+
+			@supports (margin: 0 and padding: 0) {	div {background-color: red;}	}
+
+		</style>
+	</head>
+
+	<body>
+
+		<p>Test passes if there is a <strong>filled green square</strong> and <strong>no red</strong>.</p>
+
+		<div></div>
+
+	</body>
+</html>
new file mode 100644
--- /dev/null
+++ b/layout/reftests/w3c-css/received/css3-conditional/at-supports-038.html
@@ -0,0 +1,42 @@
+<!DOCTYPE html>
+<html>
+	<head>
+		<meta charset="utf-8">
+		<title>CSS Test (Conditional Rules): a supports condition declaration can not end with a semi-colon</title>
+		<link rel="author" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/">
+		<link rel="help" href="http://www.w3.org/TR/css3-conditional/#at-supports" title="6. Feature queries: the '@supports' rule">
+		<link rel="match" href="at-supports-001-ref.html">
+		<meta name="flags" content="invalid">
+		<meta name="assert" content="Each individual single supports condition declaration can not end up with a semi-colon ';'. A semi-colon is a punctuation separator of multiple CSS declarations and thus is not part of an individual CSS declaration per se.">
+
+    <!--
+
+    supports_condition_in_parens
+      : ( '(' S* supports_condition ')' S* ) | supports_declaration_condition |
+        general_enclosed
+      ;
+
+    -->
+
+		<style>
+			div
+			{
+				background-color: red;
+				height: 100px;
+				width: 100px;
+			}
+
+			@supports (margin: 0;) { div {background-color: red !important;} }
+
+			@supports (margin: 0) { div {background-color: green;} }
+		</style>
+	</head>
+
+	<body>
+
+		<p>Test passes if there is a <strong>filled green square</strong> and <strong>no red</strong>.</p>
+
+		<div></div>
+
+	</body>
+</html>
new file mode 100644
--- /dev/null
+++ b/layout/reftests/w3c-css/received/css3-conditional/at-supports-039.html
@@ -0,0 +1,42 @@
+<!DOCTYPE html>
+<html>
+	<head>
+		<meta charset="utf-8">
+		<title>CSS Test (Conditional Rules): a supports condition declaration can not end with a semi-colon</title>
+		<link rel="author" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/">
+		<link rel="help" href="http://www.w3.org/TR/css3-conditional/#at-supports" title="6. Feature queries: the '@supports' rule">
+		<link rel="match" href="at-supports-001-ref.html">
+		<meta name="flags" content="invalid">
+		<meta name="assert" content="Each individual single supports condition declaration can not end up with a semi-colon ';'. A semi-colon is a punctuation separator of multiple CSS declarations and thus is not part of an individual CSS declaration per se.">
+
+    <!--
+
+    supports_condition_in_parens
+      : ( '(' S* supports_condition ')' S* ) | supports_declaration_condition |
+        general_enclosed
+      ;
+
+    -->
+
+		<style>
+			div
+			{
+				background-color: red;
+				height: 100px;
+				width: 100px;
+			}
+
+			@supports (margin: 0) { div {background-color: green;} }
+
+			@supports (margin: 0;) { div {background-color: red;}	}
+		</style>
+	</head>
+
+	<body>
+
+		<p>Test passes if there is a <strong>filled green square</strong> and <strong>no red</strong>.</p>
+
+		<div></div>
+
+	</body>
+</html>
new file mode 100644
--- /dev/null
+++ b/layout/reftests/w3c-css/received/css3-conditional/background-lime.html
@@ -0,0 +1,14 @@
+<!DOCTYPE html>
+<html>
+ <head>
+  <title>CSS Test Reference</title>
+  <link rel="author" title="L. David Baron" href="http://dbaron.org/">
+  <link rel="author" title="Mozilla Corporation" href="http://mozilla.com/">
+  <style>
+   body { background: lime; color: black; }
+  </style>
+ </head>
+ <body>
+   This page should have a light green background.
+ </body>
+</html>
--- a/layout/reftests/w3c-css/received/import.log
+++ b/layout/reftests/w3c-css/received/import.log
@@ -1,72 +1,81 @@
-Importing revision: b02c8a260a95cfe4b925c3a82920b2b8b57ce7c6
-from repository: https://hg.csswg.org/test
-Importing approved/css3-namespace/src/prefix-001.xml to css3-namespace/prefix-001.xml
-Importing approved/css3-namespace/src/support/fail.css to css3-namespace/support/fail.css
-Importing approved/css3-namespace/src/support/syntax-007.css to css3-namespace/support/syntax-007.css
-Importing approved/css3-namespace/src/support/scope-002a.css to css3-namespace/support/scope-002a.css
-Importing approved/css3-namespace/src/support/scope-002b.css to css3-namespace/support/scope-002b.css
-Importing approved/css3-namespace/src/reftest/ref-lime-1.xml to css3-namespace/ref-lime-1.xml
-Importing approved/css3-namespace/src/prefix-002.xml to css3-namespace/prefix-002.xml
-Importing approved/css3-namespace/src/prefix-003.xml to css3-namespace/prefix-003.xml
-Importing approved/css3-namespace/src/reftest/ref-lime-1-generic.xml to css3-namespace/ref-lime-1-generic.xml
-Importing approved/css3-namespace/src/prefix-004.xml to css3-namespace/prefix-004.xml
-Importing approved/css3-namespace/src/reftest/ref-lime-2-generic.xml to css3-namespace/ref-lime-2-generic.xml
-Importing approved/css3-namespace/src/prefix-005.xml to css3-namespace/prefix-005.xml
-Importing approved/css3-namespace/src/prefix-006.xml to css3-namespace/prefix-006.xml
-Importing approved/css3-namespace/src/reftest/ref-lime-2.xml to css3-namespace/ref-lime-2.xml
-Importing approved/css3-namespace/src/scope-001.xml to css3-namespace/scope-001.xml
-Importing approved/css3-namespace/src/scope-002.xml to css3-namespace/scope-002.xml
-Importing approved/css3-namespace/src/syntax-001.xml to css3-namespace/syntax-001.xml
-Importing approved/css3-namespace/src/reftest/ref-lime-1-block.xml to css3-namespace/ref-lime-1-block.xml
-Importing approved/css3-namespace/src/syntax-002.xml to css3-namespace/syntax-002.xml
-Importing approved/css3-namespace/src/syntax-003.xml to css3-namespace/syntax-003.xml
-Importing approved/css3-namespace/src/reftest/ref-lime-5.xml to css3-namespace/ref-lime-5.xml
-Importing approved/css3-namespace/src/syntax-004.xml to css3-namespace/syntax-004.xml
-Importing approved/css3-namespace/src/syntax-005.xml to css3-namespace/syntax-005.xml
-Importing approved/css3-namespace/src/syntax-006.xml to css3-namespace/syntax-006.xml
-Importing approved/css3-namespace/src/syntax-007.xml to css3-namespace/syntax-007.xml
-Importing approved/css3-namespace/src/syntax-008.xml to css3-namespace/syntax-008.xml
-Importing approved/css3-namespace/src/syntax-009.xml to css3-namespace/syntax-009.xml
-Importing approved/css3-namespace/src/syntax-010.xml to css3-namespace/syntax-010.xml
-Importing approved/css3-namespace/src/reftest/ref-lime-3.xml to css3-namespace/ref-lime-3.xml
-Importing approved/css3-namespace/src/syntax-011.xml to css3-namespace/syntax-011.xml
-Importing approved/css3-namespace/src/reftest/ref-lime-6.xml to css3-namespace/ref-lime-6.xml
-Importing approved/css3-namespace/src/syntax-012.xml to css3-namespace/syntax-012.xml
-Importing approved/css3-namespace/src/syntax-013.xml to css3-namespace/syntax-013.xml
-Importing approved/css3-namespace/src/syntax-014.xml to css3-namespace/syntax-014.xml
-Importing approved/css3-namespace/src/syntax-015.xml to css3-namespace/syntax-015.xml
-Importing contributors/opera/submitted/css3-conditional/at-supports-001.html to css3-conditional/at-supports-001.html
-Importing contributors/opera/submitted/css3-conditional/at-supports-001-ref.html to css3-conditional/at-supports-001-ref.html
-Importing contributors/opera/submitted/css3-conditional/at-supports-002.html to css3-conditional/at-supports-002.html
-Importing contributors/opera/submitted/css3-conditional/at-supports-003.html to css3-conditional/at-supports-003.html
-Importing contributors/opera/submitted/css3-conditional/at-supports-004.html to css3-conditional/at-supports-004.html
-Importing contributors/opera/submitted/css3-conditional/at-supports-005.html to css3-conditional/at-supports-005.html
-Importing contributors/opera/submitted/css3-conditional/at-supports-006.html to css3-conditional/at-supports-006.html
-Importing contributors/opera/submitted/css3-conditional/at-supports-007.html to css3-conditional/at-supports-007.html
-Importing contributors/opera/submitted/css3-conditional/at-supports-008.html to css3-conditional/at-supports-008.html
-Importing contributors/opera/submitted/css3-conditional/at-supports-009.html to css3-conditional/at-supports-009.html
-Importing contributors/opera/submitted/css3-conditional/at-supports-010.html to css3-conditional/at-supports-010.html
-Importing contributors/opera/submitted/css3-conditional/at-supports-011.html to css3-conditional/at-supports-011.html
-Importing contributors/opera/submitted/css3-conditional/at-supports-012.html to css3-conditional/at-supports-012.html
-Importing contributors/opera/submitted/css3-conditional/at-supports-013.html to css3-conditional/at-supports-013.html
-Importing contributors/opera/submitted/css3-conditional/at-supports-014.html to css3-conditional/at-supports-014.html
-Importing contributors/opera/submitted/css3-conditional/at-supports-015.html to css3-conditional/at-supports-015.html
-Importing contributors/opera/submitted/css3-conditional/at-supports-016.html to css3-conditional/at-supports-016.html
-Importing contributors/opera/submitted/css3-conditional/at-supports-017.html to css3-conditional/at-supports-017.html
-Importing contributors/opera/submitted/css3-conditional/at-supports-018.html to css3-conditional/at-supports-018.html
-Importing contributors/opera/submitted/css3-conditional/at-supports-019.html to css3-conditional/at-supports-019.html
-Importing contributors/opera/submitted/css3-conditional/at-supports-020.html to css3-conditional/at-supports-020.html
-Importing contributors/opera/submitted/css3-conditional/at-supports-021.html to css3-conditional/at-supports-021.html
-Importing contributors/opera/submitted/css3-conditional/at-supports-022.html to css3-conditional/at-supports-022.html
-Importing contributors/opera/submitted/css3-conditional/at-supports-023.html to css3-conditional/at-supports-023.html
-Importing contributors/opera/submitted/css3-conditional/at-supports-024.html to css3-conditional/at-supports-024.html
-Importing contributors/opera/submitted/css3-conditional/at-supports-025.html to css3-conditional/at-supports-025.html
-Importing contributors/opera/submitted/css3-conditional/at-supports-026.html to css3-conditional/at-supports-026.html
-Importing contributors/opera/submitted/css3-conditional/at-supports-027.html to css3-conditional/at-supports-027.html
-Importing contributors/opera/submitted/css3-conditional/at-supports-027-ref.html to css3-conditional/at-supports-027-ref.html
-Importing contributors/opera/submitted/css3-conditional/at-supports-028.html to css3-conditional/at-supports-028.html
-Importing contributors/opera/submitted/css3-conditional/at-supports-029.html to css3-conditional/at-supports-029.html
-Importing contributors/opera/submitted/css3-conditional/at-supports-030.html to css3-conditional/at-supports-030.html
-Importing contributors/opera/submitted/css3-conditional/at-supports-031.html to css3-conditional/at-supports-031.html
-Importing contributors/opera/submitted/css3-conditional/at-supports-032.html to css3-conditional/at-supports-032.html
-Importing contributors/opera/submitted/css3-conditional/at-supports-033.html to css3-conditional/at-supports-033.html
+Importing revision: a72171340915f3252ce528a3b052409c68aeec2a
+from repository: https://hg.csswg.org/test
+Importing css-conditional-3/at-media-whitespace-optional-001.html to css3-conditional/at-media-whitespace-optional-001.html
+Importing css-conditional-3/reference/background-lime.html to css3-conditional/background-lime.html
+Importing css-conditional-3/at-media-whitespace-optional-002.html to css3-conditional/at-media-whitespace-optional-002.html
+Importing css-conditional-3/at-supports-001.html to css3-conditional/at-supports-001.html
+Importing css-conditional-3/at-supports-001-ref.html to css3-conditional/at-supports-001-ref.html
+Importing css-conditional-3/at-supports-002.html to css3-conditional/at-supports-002.html
+Importing css-conditional-3/at-supports-003.html to css3-conditional/at-supports-003.html
+Importing css-conditional-3/at-supports-004.html to css3-conditional/at-supports-004.html
+Importing css-conditional-3/at-supports-005.html to css3-conditional/at-supports-005.html
+Importing css-conditional-3/at-supports-006.html to css3-conditional/at-supports-006.html
+Importing css-conditional-3/at-supports-007.html to css3-conditional/at-supports-007.html
+Importing css-conditional-3/at-supports-008.html to css3-conditional/at-supports-008.html
+Importing css-conditional-3/at-supports-009.html to css3-conditional/at-supports-009.html
+Importing css-conditional-3/at-supports-010.html to css3-conditional/at-supports-010.html
+Importing css-conditional-3/at-supports-011.html to css3-conditional/at-supports-011.html
+Importing css-conditional-3/at-supports-012.html to css3-conditional/at-supports-012.html
+Importing css-conditional-3/at-supports-013.html to css3-conditional/at-supports-013.html
+Importing css-conditional-3/at-supports-014.html to css3-conditional/at-supports-014.html
+Importing css-conditional-3/at-supports-015.html to css3-conditional/at-supports-015.html
+Importing css-conditional-3/at-supports-016.html to css3-conditional/at-supports-016.html
+Importing css-conditional-3/at-supports-017.html to css3-conditional/at-supports-017.html
+Importing css-conditional-3/at-supports-018.html to css3-conditional/at-supports-018.html
+Importing css-conditional-3/at-supports-019.html to css3-conditional/at-supports-019.html
+Importing css-conditional-3/at-supports-020.html to css3-conditional/at-supports-020.html
+Importing css-conditional-3/at-supports-021.html to css3-conditional/at-supports-021.html
+Importing css-conditional-3/at-supports-022.html to css3-conditional/at-supports-022.html
+Importing css-conditional-3/at-supports-023.html to css3-conditional/at-supports-023.html
+Importing css-conditional-3/at-supports-024.html to css3-conditional/at-supports-024.html
+Importing css-conditional-3/at-supports-025.html to css3-conditional/at-supports-025.html
+Importing css-conditional-3/at-supports-026.html to css3-conditional/at-supports-026.html
+Importing css-conditional-3/at-supports-027.html to css3-conditional/at-supports-027.html
+Importing css-conditional-3/at-supports-027-ref.html to css3-conditional/at-supports-027-ref.html
+Importing css-conditional-3/at-supports-028.html to css3-conditional/at-supports-028.html
+Importing css-conditional-3/at-supports-029.html to css3-conditional/at-supports-029.html
+Importing css-conditional-3/at-supports-030.html to css3-conditional/at-supports-030.html
+Importing css-conditional-3/at-supports-031.html to css3-conditional/at-supports-031.html
+Importing css-conditional-3/at-supports-032.html to css3-conditional/at-supports-032.html
+Importing css-conditional-3/at-supports-033.html to css3-conditional/at-supports-033.html
+Importing css-conditional-3/at-supports-034.html to css3-conditional/at-supports-034.html
+Importing css-conditional-3/at-supports-035.html to css3-conditional/at-supports-035.html
+Importing css-conditional-3/at-supports-036.html to css3-conditional/at-supports-036.html
+Importing css-conditional-3/at-supports-037.html to css3-conditional/at-supports-037.html
+Importing css-conditional-3/at-supports-038.html to css3-conditional/at-supports-038.html
+Importing css-conditional-3/at-supports-039.html to css3-conditional/at-supports-039.html
+Importing css-namespaces-1/prefix-001.xml to css-namespaces-3/prefix-001.xml
+Importing css-namespaces-1/support/fail.css to css-namespaces-3/support/fail.css
+Importing css-namespaces-1/support/scope-002a.css to css-namespaces-3/support/scope-002a.css
+Importing css-namespaces-1/support/scope-002b.css to css-namespaces-3/support/scope-002b.css
+Importing css-namespaces-1/support/syntax-007.css to css-namespaces-3/support/syntax-007.css
+Importing css-namespaces-1/reftest/ref-lime-1.xml to css-namespaces-3/ref-lime-1.xml
+Importing css-namespaces-1/prefix-002.xml to css-namespaces-3/prefix-002.xml
+Importing css-namespaces-1/prefix-003.xml to css-namespaces-3/prefix-003.xml
+Importing css-namespaces-1/reftest/ref-lime-1-generic.xml to css-namespaces-3/ref-lime-1-generic.xml
+Importing css-namespaces-1/prefix-004.xml to css-namespaces-3/prefix-004.xml
+Importing css-namespaces-1/reftest/ref-lime-2-generic.xml to css-namespaces-3/ref-lime-2-generic.xml
+Importing css-namespaces-1/prefix-005.xml to css-namespaces-3/prefix-005.xml
+Importing css-namespaces-1/prefix-006.xml to css-namespaces-3/prefix-006.xml
+Importing css-namespaces-1/reftest/ref-lime-2.xml to css-namespaces-3/ref-lime-2.xml
+Importing css-namespaces-1/scope-001.xml to css-namespaces-3/scope-001.xml
+Importing css-namespaces-1/scope-002.xml to css-namespaces-3/scope-002.xml
+Importing css-namespaces-1/syntax-001.xml to css-namespaces-3/syntax-001.xml
+Importing css-namespaces-1/reftest/ref-lime-1-block.xml to css-namespaces-3/ref-lime-1-block.xml
+Importing css-namespaces-1/syntax-002.xml to css-namespaces-3/syntax-002.xml
+Importing css-namespaces-1/syntax-003.xml to css-namespaces-3/syntax-003.xml
+Importing css-namespaces-1/reftest/ref-lime-5.xml to css-namespaces-3/ref-lime-5.xml
+Importing css-namespaces-1/syntax-004.xml to css-namespaces-3/syntax-004.xml
+Importing css-namespaces-1/syntax-005.xml to css-namespaces-3/syntax-005.xml
+Importing css-namespaces-1/syntax-006.xml to css-namespaces-3/syntax-006.xml
+Importing css-namespaces-1/syntax-007.xml to css-namespaces-3/syntax-007.xml
+Importing css-namespaces-1/syntax-008.xml to css-namespaces-3/syntax-008.xml
+Importing css-namespaces-1/syntax-009.xml to css-namespaces-3/syntax-009.xml
+Importing css-namespaces-1/syntax-010.xml to css-namespaces-3/syntax-010.xml
+Importing css-namespaces-1/reftest/ref-lime-3.xml to css-namespaces-3/ref-lime-3.xml
+Importing css-namespaces-1/syntax-011.xml to css-namespaces-3/syntax-011.xml
+Importing css-namespaces-1/reftest/ref-lime-6.xml to css-namespaces-3/ref-lime-6.xml
+Importing css-namespaces-1/syntax-012.xml to css-namespaces-3/syntax-012.xml
+Importing css-namespaces-1/syntax-013.xml to css-namespaces-3/syntax-013.xml
+Importing css-namespaces-1/syntax-014.xml to css-namespaces-3/syntax-014.xml
+Importing css-namespaces-1/syntax-015.xml to css-namespaces-3/syntax-015.xml
--- a/layout/reftests/w3c-css/received/reftest.list
+++ b/layout/reftests/w3c-css/received/reftest.list
@@ -1,58 +1,66 @@
-# THIS FILE IS AUTOGENERATED BY import-tests.py
-# DO NOT EDIT!
-== css3-namespace/prefix-001.xml css3-namespace/ref-lime-1.xml
-== css3-namespace/prefix-002.xml css3-namespace/ref-lime-1.xml
-== css3-namespace/prefix-003.xml css3-namespace/ref-lime-1-generic.xml
-== css3-namespace/prefix-004.xml css3-namespace/ref-lime-2-generic.xml
-== css3-namespace/prefix-005.xml css3-namespace/ref-lime-2-generic.xml
-== css3-namespace/prefix-006.xml css3-namespace/ref-lime-2.xml
-== css3-namespace/scope-001.xml css3-namespace/ref-lime-1.xml
-== css3-namespace/scope-002.xml css3-namespace/ref-lime-1.xml
-== css3-namespace/syntax-001.xml css3-namespace/ref-lime-1-block.xml
-== css3-namespace/syntax-002.xml css3-namespace/ref-lime-1-block.xml
-== css3-namespace/syntax-003.xml css3-namespace/ref-lime-5.xml
-== css3-namespace/syntax-004.xml css3-namespace/ref-lime-1.xml
-== css3-namespace/syntax-005.xml css3-namespace/ref-lime-5.xml
-== css3-namespace/syntax-006.xml css3-namespace/ref-lime-1.xml
-== css3-namespace/syntax-007.xml css3-namespace/ref-lime-1.xml
-== css3-namespace/syntax-008.xml css3-namespace/ref-lime-2.xml
-== css3-namespace/syntax-009.xml css3-namespace/ref-lime-1.xml
-== css3-namespace/syntax-010.xml css3-namespace/ref-lime-3.xml
-== css3-namespace/syntax-011.xml css3-namespace/ref-lime-6.xml
-== css3-namespace/syntax-012.xml css3-namespace/ref-lime-3.xml
-== css3-namespace/syntax-013.xml css3-namespace/ref-lime-5.xml
-== css3-namespace/syntax-014.xml css3-namespace/ref-lime-3.xml
-== css3-namespace/syntax-015.xml css3-namespace/ref-lime-1.xml
-== css3-conditional/at-supports-001.html css3-conditional/at-supports-001-ref.html
-== css3-conditional/at-supports-002.html css3-conditional/at-supports-001-ref.html
-== css3-conditional/at-supports-003.html css3-conditional/at-supports-001-ref.html
-== css3-conditional/at-supports-004.html css3-conditional/at-supports-001-ref.html
-== css3-conditional/at-supports-005.html css3-conditional/at-supports-001-ref.html
-== css3-conditional/at-supports-006.html css3-conditional/at-supports-001-ref.html
-== css3-conditional/at-supports-007.html css3-conditional/at-supports-001-ref.html
-== css3-conditional/at-supports-008.html css3-conditional/at-supports-001-ref.html
-== css3-conditional/at-supports-009.html css3-conditional/at-supports-001-ref.html
-== css3-conditional/at-supports-010.html css3-conditional/at-supports-001-ref.html
-== css3-conditional/at-supports-011.html css3-conditional/at-supports-001-ref.html
-== css3-conditional/at-supports-012.html css3-conditional/at-supports-001-ref.html
-== css3-conditional/at-supports-013.html css3-conditional/at-supports-001-ref.html
-== css3-conditional/at-supports-014.html css3-conditional/at-supports-001-ref.html
-== css3-conditional/at-supports-015.html css3-conditional/at-supports-001-ref.html
-== css3-conditional/at-supports-016.html css3-conditional/at-supports-001-ref.html
-== css3-conditional/at-supports-017.html css3-conditional/at-supports-001-ref.html
-== css3-conditional/at-supports-018.html css3-conditional/at-supports-001-ref.html
-== css3-conditional/at-supports-019.html css3-conditional/at-supports-001-ref.html
-== css3-conditional/at-supports-020.html css3-conditional/at-supports-001-ref.html
-== css3-conditional/at-supports-021.html css3-conditional/at-supports-001-ref.html
-== css3-conditional/at-supports-022.html css3-conditional/at-supports-001-ref.html
-== css3-conditional/at-supports-023.html css3-conditional/at-supports-001-ref.html
-== css3-conditional/at-supports-024.html css3-conditional/at-supports-001-ref.html
-== css3-conditional/at-supports-025.html css3-conditional/at-supports-001-ref.html
-== css3-conditional/at-supports-026.html css3-conditional/at-supports-001-ref.html
-== css3-conditional/at-supports-027.html css3-conditional/at-supports-027-ref.html
-== css3-conditional/at-supports-028.html css3-conditional/at-supports-001-ref.html
-== css3-conditional/at-supports-029.html css3-conditional/at-supports-027-ref.html
-== css3-conditional/at-supports-030.html css3-conditional/at-supports-001-ref.html
-== css3-conditional/at-supports-031.html css3-conditional/at-supports-001-ref.html
-== css3-conditional/at-supports-032.html css3-conditional/at-supports-001-ref.html
-== css3-conditional/at-supports-033.html css3-conditional/at-supports-001-ref.html
+# THIS FILE IS AUTOGENERATED BY import-tests.py
+# DO NOT EDIT!
+== css3-conditional/at-media-whitespace-optional-001.html css3-conditional/background-lime.html
+== css3-conditional/at-media-whitespace-optional-002.html css3-conditional/background-lime.html
+== css3-conditional/at-supports-001.html css3-conditional/at-supports-001-ref.html
+== css3-conditional/at-supports-002.html css3-conditional/at-supports-001-ref.html
+== css3-conditional/at-supports-003.html css3-conditional/at-supports-001-ref.html
+== css3-conditional/at-supports-004.html css3-conditional/at-supports-001-ref.html
+== css3-conditional/at-supports-005.html css3-conditional/at-supports-001-ref.html
+== css3-conditional/at-supports-006.html css3-conditional/at-supports-001-ref.html
+== css3-conditional/at-supports-007.html css3-conditional/at-supports-001-ref.html
+== css3-conditional/at-supports-008.html css3-conditional/at-supports-001-ref.html
+== css3-conditional/at-supports-009.html css3-conditional/at-supports-001-ref.html
+== css3-conditional/at-supports-010.html css3-conditional/at-supports-001-ref.html
+== css3-conditional/at-supports-011.html css3-conditional/at-supports-001-ref.html
+== css3-conditional/at-supports-012.html css3-conditional/at-supports-001-ref.html
+== css3-conditional/at-supports-013.html css3-conditional/at-supports-001-ref.html
+== css3-conditional/at-supports-014.html css3-conditional/at-supports-001-ref.html
+== css3-conditional/at-supports-015.html css3-conditional/at-supports-001-ref.html
+== css3-conditional/at-supports-016.html css3-conditional/at-supports-001-ref.html
+== css3-conditional/at-supports-017.html css3-conditional/at-supports-001-ref.html
+== css3-conditional/at-supports-018.html css3-conditional/at-supports-001-ref.html
+== css3-conditional/at-supports-019.html css3-conditional/at-supports-001-ref.html
+== css3-conditional/at-supports-020.html css3-conditional/at-supports-001-ref.html
+== css3-conditional/at-supports-021.html css3-conditional/at-supports-001-ref.html
+== css3-conditional/at-supports-022.html css3-conditional/at-supports-001-ref.html
+== css3-conditional/at-supports-023.html css3-conditional/at-supports-001-ref.html
+== css3-conditional/at-supports-024.html css3-conditional/at-supports-001-ref.html
+== css3-conditional/at-supports-025.html css3-conditional/at-supports-001-ref.html
+== css3-conditional/at-supports-026.html css3-conditional/at-supports-001-ref.html
+== css3-conditional/at-supports-027.html css3-conditional/at-supports-027-ref.html
+== css3-conditional/at-supports-028.html css3-conditional/at-supports-001-ref.html
+== css3-conditional/at-supports-029.html css3-conditional/at-supports-027-ref.html
+== css3-conditional/at-supports-030.html css3-conditional/at-supports-001-ref.html
+== css3-conditional/at-supports-031.html css3-conditional/at-supports-001-ref.html
+== css3-conditional/at-supports-032.html css3-conditional/at-supports-001-ref.html
+== css3-conditional/at-supports-033.html css3-conditional/at-supports-001-ref.html
+== css3-conditional/at-supports-034.html css3-conditional/at-supports-001-ref.html
+== css3-conditional/at-supports-035.html css3-conditional/at-supports-001-ref.html
+== css3-conditional/at-supports-036.html css3-conditional/at-supports-001-ref.html
+== css3-conditional/at-supports-037.html css3-conditional/at-supports-001-ref.html
+== css3-conditional/at-supports-038.html css3-conditional/at-supports-001-ref.html
+== css3-conditional/at-supports-039.html css3-conditional/at-supports-001-ref.html
+== css-namespaces-3/prefix-001.xml css-namespaces-3/ref-lime-1.xml
+== css-namespaces-3/prefix-002.xml css-namespaces-3/ref-lime-1.xml
+== css-namespaces-3/prefix-003.xml css-namespaces-3/ref-lime-1-generic.xml
+== css-namespaces-3/prefix-004.xml css-namespaces-3/ref-lime-2-generic.xml
+== css-namespaces-3/prefix-005.xml css-namespaces-3/ref-lime-2-generic.xml
+== css-namespaces-3/prefix-006.xml css-namespaces-3/ref-lime-2.xml
+== css-namespaces-3/scope-001.xml css-namespaces-3/ref-lime-1.xml
+== css-namespaces-3/scope-002.xml css-namespaces-3/ref-lime-1.xml
+== css-namespaces-3/syntax-001.xml css-namespaces-3/ref-lime-1-block.xml
+== css-namespaces-3/syntax-002.xml css-namespaces-3/ref-lime-1-block.xml
+== css-namespaces-3/syntax-003.xml css-namespaces-3/ref-lime-5.xml
+== css-namespaces-3/syntax-004.xml css-namespaces-3/ref-lime-1.xml
+== css-namespaces-3/syntax-005.xml css-namespaces-3/ref-lime-5.xml
+== css-namespaces-3/syntax-006.xml css-namespaces-3/ref-lime-1.xml
+== css-namespaces-3/syntax-007.xml css-namespaces-3/ref-lime-1.xml
+== css-namespaces-3/syntax-008.xml css-namespaces-3/ref-lime-2.xml
+== css-namespaces-3/syntax-009.xml css-namespaces-3/ref-lime-1.xml
+== css-namespaces-3/syntax-010.xml css-namespaces-3/ref-lime-3.xml
+== css-namespaces-3/syntax-011.xml css-namespaces-3/ref-lime-6.xml
+== css-namespaces-3/syntax-012.xml css-namespaces-3/ref-lime-3.xml
+== css-namespaces-3/syntax-013.xml css-namespaces-3/ref-lime-5.xml
+== css-namespaces-3/syntax-014.xml css-namespaces-3/ref-lime-3.xml
+== css-namespaces-3/syntax-015.xml css-namespaces-3/ref-lime-1.xml