mozilla-inbound: changeset 159127:7a7cd1f765a03f35f01fe5db16df35b9046bda98

author	Cameron McCormack <cam@mcc.id.au>
	Fri, 06 Dec 2013 19:13:26 +1100
changeset 159127	7a7cd1f765a03f35f01fe5db16df35b9046bda98
parent 159126	9a92e42151dcf172808130cb3183970625dd18d6
child 159128	f7d7744e05b11661b7aa04e2c61697ca360231c3
push id	37193
push user	cmccormack@mozilla.com
push date	Fri, 06 Dec 2013 08:14:13 +0000
treeherder	mozilla-inbound@7a7cd1f765a0 [default view] [failures only]
perfherder	[talos] [build metrics] [platform microbench] (compared to previous push)
reviewers	dbaron
bugs	925626
milestone	28.0a1
first release with	nightly linux32 42b2a2adda8f / 28.0a1 / 20131207030203 / files nightly linux64 42b2a2adda8f / 28.0a1 / 20131207030203 / files nightly mac 42b2a2adda8f / 28.0a1 / 20131207030203 / files nightly win32 42b2a2adda8f / 28.0a1 / 20131207030203 / files nightly win64 42b2a2adda8f / 28.0a1 / 20131207030203 / files
last release without	nightly linux32 1401e4b394ad / 28.0a1 / 20131206030202 / files nightly linux64 1401e4b394ad / 28.0a1 / 20131206030202 / files nightly mac 1401e4b394ad / 28.0a1 / 20131206030202 / files nightly win32 1401e4b394ad / 28.0a1 / 20131206030202 / files nightly win64 1401e4b394ad / 28.0a1 / 20131206030202 / files

new file mode 100644
--- /dev/null
+++ b/layout/reftests/w3c-css/submitted/conditional3/css-supports-042.xht
@@ -0,0 +1,18 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+ <head>
+  <title>CSS Test: An @supports rule condition with an unexpected token before the closing paren of a supports_condition_in_parens should parse as a general_enclosed</title>
+  <link rel="author" title="Cameron McCormack" href="mailto:cam@mcc.id.au" />
+  <link rel="help" href="http://www.w3.org/TR/css3-conditional/#at-supports" />
+  <meta name="flags" content="" />
+  <meta name="assert" content="An @supports rule condition that has an unexpected token before the closing paren of a supports_condition_in_parens should parse as a general_enclosed and evaluate to false rather than fail to parse."/>
+  <link rel="match" href="support/pass.xht" />
+  <style type="text/css"><![CDATA[
+    @supports ((color: green) bad) or (color: green) {
+      html { background-color: green }
+    }
+  ]]></style>
+ </head>
+ <body>
+ </body>
+</html>

--- a/layout/reftests/w3c-css/submitted/conditional3/reftest.list
+++ b/layout/reftests/w3c-css/submitted/conditional3/reftest.list
@@ -36,8 +36,9 @@ default-preferences pref(layout.css.supp
 == css-supports-034.xht support/pass.xht
 == css-supports-035.xht support/pass.xht
 == css-supports-036.xht support/pass.xht
 == css-supports-037.xht support/pass.xht
 == css-supports-038.xht support/pass.xht
 == css-supports-039.xht support/pass.xht
 == css-supports-040.xht support/pass.xht
 == css-supports-041.xht support/pass.xht
+== css-supports-042.xht support/pass.xht

--- a/layout/style/nsCSSParser.cpp
+++ b/layout/style/nsCSSParser.cpp
@@ -2784,19 +2784,19 @@ CSSParserImpl::ParseSupportsConditionInP
       REPORT_UNEXPECTED_EOF(PESupportsConditionInParensEOF);
       return false;
     }
     aConditionMet = false;
     return true;
   }
 
   if (!(ExpectSymbol(')', true))) {
-    REPORT_UNEXPECTED_TOKEN(PESupportsConditionExpectedCloseParen);
     SkipUntil(')');
-    return false;
+    aConditionMet = false;
+    return true;
   }
 
   return true;
 }
 
 // supports_condition_in_parens_inside_parens
 //   : core_declaration
 //   | supports_condition_negation

layout/reftests/w3c-css/submitted/conditional3/css-supports-042.xht		file \| annotate \| diff \| comparison \| revisions
layout/reftests/w3c-css/submitted/conditional3/reftest.list		file \| annotate \| diff \| comparison \| revisions
layout/style/nsCSSParser.cpp		file \| annotate \| diff \| comparison \| revisions