From 6a269268042fb644866850ecfa5ee75bd814d609 Mon Sep 17 00:00:00 2001 From: Cameron McCormack Date: Fri, 6 Dec 2013 19:13:26 +1100 Subject: [PATCH] Bug 925626 - Parse general_enclosed in @supports conditions properly. r=dbaron --- .../conditional3/css-supports-042.xht | 18 ++++++++++++++++++ .../submitted/conditional3/reftest.list | 1 + layout/style/nsCSSParser.cpp | 4 ++-- 3 files changed, 21 insertions(+), 2 deletions(-) create mode 100644 layout/reftests/w3c-css/submitted/conditional3/css-supports-042.xht diff --git a/layout/reftests/w3c-css/submitted/conditional3/css-supports-042.xht b/layout/reftests/w3c-css/submitted/conditional3/css-supports-042.xht new file mode 100644 index 000000000000..2b0f104d600b --- /dev/null +++ b/layout/reftests/w3c-css/submitted/conditional3/css-supports-042.xht @@ -0,0 +1,18 @@ + + + + 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 + + + + + + + + + + diff --git a/layout/reftests/w3c-css/submitted/conditional3/reftest.list b/layout/reftests/w3c-css/submitted/conditional3/reftest.list index 1de1cdde637f..fdf3babb95e1 100644 --- a/layout/reftests/w3c-css/submitted/conditional3/reftest.list +++ b/layout/reftests/w3c-css/submitted/conditional3/reftest.list @@ -41,3 +41,4 @@ default-preferences pref(layout.css.supports-rule.enabled,true) == 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 diff --git a/layout/style/nsCSSParser.cpp b/layout/style/nsCSSParser.cpp index ce501ca7c3b6..40381b32bed1 100644 --- a/layout/style/nsCSSParser.cpp +++ b/layout/style/nsCSSParser.cpp @@ -2789,9 +2789,9 @@ CSSParserImpl::ParseSupportsConditionInParens(bool& aConditionMet) } if (!(ExpectSymbol(')', true))) { - REPORT_UNEXPECTED_TOKEN(PESupportsConditionExpectedCloseParen); SkipUntil(')'); - return false; + aConditionMet = false; + return true; } return true;