From 389d537451ddfe2cb8a7e46eb95f5fe2a6bc94b6 Mon Sep 17 00:00:00 2001
From: Simon Sapin <simon.sapin@exyr.org>
Date: Mon, 7 Sep 2015 17:54:14 +0200
Subject: [PATCH] Look for var() in a non-custom property declaration after a
 parse error.

---
 components/style/properties.mako.rs                            | 3 +++
 .../css-variables-1_dev/html/variable-reference-15.htm.ini     | 3 ---
 .../css-variables-1_dev/html/variable-reference-18.htm.ini     | 3 ---
 .../css-variables-1_dev/html/variable-reference-19.htm.ini     | 3 ---
 4 files changed, 3 insertions(+), 9 deletions(-)
 delete mode 100644 tests/wpt/metadata-css/css-variables-1_dev/html/variable-reference-15.htm.ini
 delete mode 100644 tests/wpt/metadata-css/css-variables-1_dev/html/variable-reference-18.htm.ini
 delete mode 100644 tests/wpt/metadata-css/css-variables-1_dev/html/variable-reference-19.htm.ini

diff --git a/components/style/properties.mako.rs b/components/style/properties.mako.rs
index a9f9b92156b..27250d379d8 100644
--- a/components/style/properties.mako.rs
+++ b/components/style/properties.mako.rs
@@ -205,6 +205,9 @@ pub mod longhands {
                             input.look_for_var_functions();
                             let start = input.position();
                             let specified = parse_specified(context, input);
+                            if specified.is_err() {
+                                while let Ok(_) = input.next() {}  // Look for var() after the error.
+                            }
                             let var = input.seen_var_functions();
                             if specified.is_err() && var {
                                 input.reset(start);
diff --git a/tests/wpt/metadata-css/css-variables-1_dev/html/variable-reference-15.htm.ini b/tests/wpt/metadata-css/css-variables-1_dev/html/variable-reference-15.htm.ini
deleted file mode 100644
index 7dcf1687aab..00000000000
--- a/tests/wpt/metadata-css/css-variables-1_dev/html/variable-reference-15.htm.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[variable-reference-15.htm]
-  type: reftest
-  expected: FAIL
diff --git a/tests/wpt/metadata-css/css-variables-1_dev/html/variable-reference-18.htm.ini b/tests/wpt/metadata-css/css-variables-1_dev/html/variable-reference-18.htm.ini
deleted file mode 100644
index e09c394fc76..00000000000
--- a/tests/wpt/metadata-css/css-variables-1_dev/html/variable-reference-18.htm.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[variable-reference-18.htm]
-  type: reftest
-  expected: FAIL
diff --git a/tests/wpt/metadata-css/css-variables-1_dev/html/variable-reference-19.htm.ini b/tests/wpt/metadata-css/css-variables-1_dev/html/variable-reference-19.htm.ini
deleted file mode 100644
index 3847b908e1b..00000000000
--- a/tests/wpt/metadata-css/css-variables-1_dev/html/variable-reference-19.htm.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[variable-reference-19.htm]
-  type: reftest
-  expected: FAIL