<!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><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[172833] trunk</title>
</head>
<body>

<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt;  }
#msg dl a { font-weight: bold}
#msg dl a:link    { color:#fc3; }
#msg dl a:active  { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff  {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/172833">172833</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2014-08-21 13:29:43 -0700 (Thu, 21 Aug 2014)</dd>
</dl>

<h3>Log Message</h3>
<pre>REGRESSION: CSS not() selector does not work when it appears after or within @supports
https://bugs.webkit.org/show_bug.cgi?id=136063

Patch by Yuki Sekiguchi &lt;yuki.sekiguchi@access-company.com&gt; on 2014-08-21
Reviewed by Darin Adler.

Source/WebCore:

CSSParser changes its m_parsingMode to SupportsMode when it finds
&quot;@supports&quot; token. However, the mode will be never changed to
NormalMode. This changes parsing algorithm for &quot;not&quot; token forever,
and it cannot parse not pseudo class selector.

When we finish parsing @supports rule, we should change to normal
mode.

@media does the same thing. This patch changed CharacterEndMediaQuery
to CharacterEndConditionQuery, and we change parsing mode from
SupportsMode to NormalMode when the parser finished to parse
@supports rule.

Like &quot;@-webkit-mediaquery&quot;, we cannot use '{' to
&quot;@-webkit-supports-condition&quot;. Changed &quot;@-webkit-supports-condition&quot;
parsing rule and parseSupportsCondition() not to use '{'.

Tests: css3/supports-not-selector-cssom.html
       css3/supports-not-selector.html

* css/CSSGrammar.y.in:
* css/CSSParser.cpp:
(WebCore::CSSParser::parseSupportsCondition):
(WebCore::isCSSLetter):
(WebCore::CSSParser::realLex):

LayoutTests:

Test that @supports doesn't break &quot;not&quot; pseudo class selector.

* css3/supports-not-selector-cssom-expected.txt: Added.
* css3/supports-not-selector-cssom.html: Added.
* css3/supports-not-selector-expected.html: Added.
* css3/supports-not-selector.html: Added.</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorecssCSSGrammaryin">trunk/Source/WebCore/css/CSSGrammar.y.in</a></li>
<li><a href="#trunkSourceWebCorecssCSSParsercpp">trunk/Source/WebCore/css/CSSParser.cpp</a></li>
</ul>

<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestscss3supportsnotselectorcssomexpectedtxt">trunk/LayoutTests/css3/supports-not-selector-cssom-expected.txt</a></li>
<li><a href="#trunkLayoutTestscss3supportsnotselectorcssomhtml">trunk/LayoutTests/css3/supports-not-selector-cssom.html</a></li>
<li><a href="#trunkLayoutTestscss3supportsnotselectorexpectedhtml">trunk/LayoutTests/css3/supports-not-selector-expected.html</a></li>
<li><a href="#trunkLayoutTestscss3supportsnotselectorhtml">trunk/LayoutTests/css3/supports-not-selector.html</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (172832 => 172833)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog        2014-08-21 20:08:57 UTC (rev 172832)
+++ trunk/LayoutTests/ChangeLog        2014-08-21 20:29:43 UTC (rev 172833)
</span><span class="lines">@@ -1,3 +1,17 @@
</span><ins>+2014-08-21  Yuki Sekiguchi  &lt;yuki.sekiguchi@access-company.com&gt;
+
+        REGRESSION: CSS not() selector does not work when it appears after or within @supports
+        https://bugs.webkit.org/show_bug.cgi?id=136063
+
+        Reviewed by Darin Adler.
+
+        Test that @supports doesn't break &quot;not&quot; pseudo class selector.
+
+        * css3/supports-not-selector-cssom-expected.txt: Added.
+        * css3/supports-not-selector-cssom.html: Added.
+        * css3/supports-not-selector-expected.html: Added.
+        * css3/supports-not-selector.html: Added.
+
</ins><span class="cx"> 2014-08-21  Beth Dakin  &lt;bdakin@apple.com&gt;
</span><span class="cx"> 
</span><span class="cx">         overflow:scroll elements should support rubber-banding
</span></span></pre></div>
<a id="trunkLayoutTestscss3supportsnotselectorcssomexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/css3/supports-not-selector-cssom-expected.txt (0 => 172833)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/css3/supports-not-selector-cssom-expected.txt                                (rev 0)
+++ trunk/LayoutTests/css3/supports-not-selector-cssom-expected.txt        2014-08-21 20:29:43 UTC (rev 172833)
</span><span class="lines">@@ -0,0 +1,38 @@
</span><ins>+Test that @supports doesn't break 'not' pseudo class selector.
+
+On success, you will see a series of &quot;PASS&quot; messages, followed by &quot;TEST COMPLETE&quot;.
+
+
+PASS CSSRule.SUPPORTS_RULE is defined.
+rules = document.styleSheets[1].cssRules
+PASS rules.length is 2
+PASS rules[0].type is CSSRule.SUPPORTS_RULE
+PASS rules[0].cssRules.length is 1
+PASS rules[0].cssRules[0].type is CSSRule.STYLE_RULE
+PASS rules[0].cssRules[0].style.color is &quot;green&quot;
+PASS rules[1].type is CSSRule.STYLE_RULE
+PASS rules[1].style.color is &quot;green&quot;
+rules = document.styleSheets[2].cssRules
+PASS rules.length is 2
+PASS rules[1].type is CSSRule.STYLE_RULE
+PASS rules[1].style.color is &quot;green&quot;
+rules = document.styleSheets[3].cssRules
+PASS rules.length is 1
+PASS rules[0].type is CSSRule.STYLE_RULE
+PASS rules[0].style.color is &quot;green&quot;
+Checks all elements are green.
+PASS getComputedStyle(result, null).color is &quot;rgb(0, 128, 0)&quot;
+PASS getComputedStyle(result, null).color is &quot;rgb(0, 128, 0)&quot;
+PASS getComputedStyle(result, null).color is &quot;rgb(0, 128, 0)&quot;
+PASS getComputedStyle(result, null).color is &quot;rgb(0, 128, 0)&quot;
+PASS getComputedStyle(result, null).color is &quot;rgb(0, 128, 0)&quot;
+PASS getComputedStyle(result, null).color is &quot;rgb(0, 128, 0)&quot;
+PASS successfullyParsed is true
+
+TEST COMPLETE
+This should be green if not() pseudo class selector works inside @supports rule.
+This should be green if not() pseudo class selector works after/outside @supports rule.
+This should be green if not() pseudo class selector DOES NOT work inside @supports rule without condition.
+This should be green if not() pseudo class selector works after/outside @supports rule without condition.
+This should be green if not() pseudo class selector DOES NOT work after/outside @supports rule without rule.
+This should be green if not() pseudo class selector works after/outside @supports rule without condition and rule.
</ins></span></pre></div>
<a id="trunkLayoutTestscss3supportsnotselectorcssomhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/css3/supports-not-selector-cssom.html (0 => 172833)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/css3/supports-not-selector-cssom.html                                (rev 0)
+++ trunk/LayoutTests/css3/supports-not-selector-cssom.html        2014-08-21 20:29:43 UTC (rev 172833)
</span><span class="lines">@@ -0,0 +1,78 @@
</span><ins>+&lt;!DOCTYPE html&gt;
+&lt;style&gt;
+div { color: red; }
+&lt;/style&gt;
+&lt;style&gt;
+@supports (display:block) {
+    div:not(.outside).valid { color: green; }
+}
+div:not(.inside).valid {
+    color:green;
+}
+&lt;/style&gt;
+&lt;style&gt;
+div.nocondition.inside { color: green; }
+@supports {
+    div:not(.outside).nocondition { color: red; }
+}
+div:not(.inside).nocondition {
+    color:green;
+}
+&lt;/style&gt;
+&lt;style&gt;
+div.norule.outside { color: green; }
+@supports (display:block)
+div:not(.inside).norule {
+    color:red;
+}
+&lt;/style&gt;
+&lt;style&gt;
+@supports;
+div:not(.inside).semicolon {
+    color:green;
+}
+&lt;/style&gt;
+&lt;div class=&quot;result inside valid&quot;&gt;This should be green if not() pseudo class selector works inside @supports rule.&lt;/div&gt;
+&lt;div class=&quot;result outside valid&quot;&gt;This should be green if not() pseudo class selector works after/outside @supports rule.&lt;/div&gt;
+
+&lt;div class=&quot;result inside nocondition&quot;&gt;This should be green if not() pseudo class selector DOES NOT work inside @supports rule without condition.&lt;/div&gt;
+&lt;div class=&quot;result outside nocondition&quot;&gt;This should be green if not() pseudo class selector works after/outside @supports rule without condition.&lt;/div&gt;
+
+&lt;div class=&quot;result outside norule&quot;&gt;This should be green if not() pseudo class selector DOES NOT work after/outside @supports rule without rule.&lt;/div&gt;
+
+&lt;div class=&quot;result outside semicolon&quot;&gt;This should be green if not() pseudo class selector works after/outside @supports rule without condition and rule.&lt;/div&gt;
+
+&lt;script src=&quot;../resources/js-test-pre.js&quot;&gt;&lt;/script&gt;
+&lt;script&gt;
+    description(&quot;Test that @supports doesn't break 'not' pseudo class selector.&quot;);
+
+
+    shouldBeDefined(&quot;CSSRule.SUPPORTS_RULE&quot;);
+
+    evalAndLog(&quot;rules = document.styleSheets[1].cssRules&quot;);
+    shouldEvaluateTo(&quot;rules.length&quot;, 2);
+    shouldBe(&quot;rules[0].type&quot;, &quot;CSSRule.SUPPORTS_RULE&quot;);
+    shouldEvaluateTo(&quot;rules[0].cssRules.length&quot;, 1);
+    shouldBe(&quot;rules[0].cssRules[0].type&quot;, &quot;CSSRule.STYLE_RULE&quot;);
+    shouldBeEqualToString(&quot;rules[0].cssRules[0].style.color&quot;, &quot;green&quot;);
+    shouldBe(&quot;rules[1].type&quot;, &quot;CSSRule.STYLE_RULE&quot;);
+    shouldBeEqualToString(&quot;rules[1].style.color&quot;, &quot;green&quot;);
+
+    evalAndLog(&quot;rules = document.styleSheets[2].cssRules&quot;);
+    shouldEvaluateTo(&quot;rules.length&quot;, 2);
+    shouldBe(&quot;rules[1].type&quot;, &quot;CSSRule.STYLE_RULE&quot;);
+    shouldBeEqualToString(&quot;rules[1].style.color&quot;, &quot;green&quot;);
+
+    evalAndLog(&quot;rules = document.styleSheets[3].cssRules&quot;);
+    shouldEvaluateTo(&quot;rules.length&quot;, 1);
+    shouldBe(&quot;rules[0].type&quot;, &quot;CSSRule.STYLE_RULE&quot;);
+    shouldBeEqualToString(&quot;rules[0].style.color&quot;, &quot;green&quot;);
+
+    debug(&quot;Checks all elements are green.&quot;);
+    var results = document.getElementsByClassName(&quot;result&quot;);
+    for (var i = 0; i &lt; results.length; i++) {
+        var result = results[i];
+        shouldBeEqualToString(&quot;getComputedStyle(result, null).color&quot;, &quot;rgb(0, 128, 0)&quot;);
+    }
+&lt;/script&gt;
+&lt;script src=&quot;../resources/js-test-post.js&quot;&gt;&lt;/script&gt;
</ins></span></pre></div>
<a id="trunkLayoutTestscss3supportsnotselectorexpectedhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/css3/supports-not-selector-expected.html (0 => 172833)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/css3/supports-not-selector-expected.html                                (rev 0)
+++ trunk/LayoutTests/css3/supports-not-selector-expected.html        2014-08-21 20:29:43 UTC (rev 172833)
</span><span class="lines">@@ -0,0 +1,13 @@
</span><ins>+&lt;!DOCTYPE html&gt;
+&lt;style&gt;
+div { color: green; }
+&lt;/style&gt;
+&lt;div&gt;This should be green if not() pseudo class selector works inside @supports rule.&lt;/div&gt;
+&lt;div&gt;This should be green if not() pseudo class selector works after/outside @supports rule.&lt;/div&gt;
+
+&lt;div&gt;This should be green if not() pseudo class selector DOES NOT work inside @supports rule without condition.&lt;/div&gt;
+&lt;div&gt;This should be green if not() pseudo class selector works after/outside @supports rule without condition.&lt;/div&gt;
+
+&lt;div&gt;This should be green if not() pseudo class selector DOES NOT work after/outside @supports rule without rule.&lt;/div&gt;
+
+&lt;div&gt;This should be green if not() pseudo class selector works after/outside @supports rule without condition and rule.&lt;/div&gt;
</ins></span></pre></div>
<a id="trunkLayoutTestscss3supportsnotselectorhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/css3/supports-not-selector.html (0 => 172833)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/css3/supports-not-selector.html                                (rev 0)
+++ trunk/LayoutTests/css3/supports-not-selector.html        2014-08-21 20:29:43 UTC (rev 172833)
</span><span class="lines">@@ -0,0 +1,43 @@
</span><ins>+&lt;!DOCTYPE html&gt;
+&lt;style&gt;
+div { color: red; }
+&lt;/style&gt;
+&lt;style&gt;
+@supports (display:block) {
+    div:not(.outside).valid { color: green; }
+}
+div:not(.inside).valid {
+    color:green;
+}
+&lt;/style&gt;
+&lt;style&gt;
+div.nocondition.inside { color: green; }
+@supports {
+    div:not(.outside).nocondition { color: red; }
+}
+div:not(.inside).nocondition {
+    color:green;
+}
+&lt;/style&gt;
+&lt;style&gt;
+div.norule.outside { color: green; }
+@supports (display:block)
+div:not(.inside).norule {
+    color:red;
+}
+&lt;/style&gt;
+&lt;style&gt;
+@supports;
+div:not(.inside).semicolon {
+    color:green;
+}
+&lt;/style&gt;
+&lt;div class=&quot;inside valid&quot;&gt;This should be green if not() pseudo class selector works inside @supports rule.&lt;/div&gt;
+&lt;div class=&quot;outside valid&quot;&gt;This should be green if not() pseudo class selector works after/outside @supports rule.&lt;/div&gt;
+
+&lt;div class=&quot;inside nocondition&quot;&gt;This should be green if not() pseudo class selector DOES NOT work inside @supports rule without condition.&lt;/div&gt;
+&lt;div class=&quot;outside nocondition&quot;&gt;This should be green if not() pseudo class selector works after/outside @supports rule without condition.&lt;/div&gt;
+
+&lt;div class=&quot;outside norule&quot;&gt;This should be green if not() pseudo class selector DOES NOT work after/outside @supports rule without rule.&lt;/div&gt;
+
+&lt;div class=&quot;outside semicolon&quot;&gt;This should be green if not() pseudo class selector works after/outside @supports rule without condition and rule.&lt;/div&gt;
</ins></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (172832 => 172833)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog        2014-08-21 20:08:57 UTC (rev 172832)
+++ trunk/Source/WebCore/ChangeLog        2014-08-21 20:29:43 UTC (rev 172833)
</span><span class="lines">@@ -1,3 +1,36 @@
</span><ins>+2014-08-21  Yuki Sekiguchi  &lt;yuki.sekiguchi@access-company.com&gt;
+
+        REGRESSION: CSS not() selector does not work when it appears after or within @supports
+        https://bugs.webkit.org/show_bug.cgi?id=136063
+
+        Reviewed by Darin Adler.
+
+        CSSParser changes its m_parsingMode to SupportsMode when it finds
+        &quot;@supports&quot; token. However, the mode will be never changed to
+        NormalMode. This changes parsing algorithm for &quot;not&quot; token forever,
+        and it cannot parse not pseudo class selector.
+
+        When we finish parsing @supports rule, we should change to normal
+        mode.
+
+        @media does the same thing. This patch changed CharacterEndMediaQuery
+        to CharacterEndConditionQuery, and we change parsing mode from
+        SupportsMode to NormalMode when the parser finished to parse
+        @supports rule.
+
+        Like &quot;@-webkit-mediaquery&quot;, we cannot use '{' to
+        &quot;@-webkit-supports-condition&quot;. Changed &quot;@-webkit-supports-condition&quot;
+        parsing rule and parseSupportsCondition() not to use '{'.
+
+        Tests: css3/supports-not-selector-cssom.html
+               css3/supports-not-selector.html
+
+        * css/CSSGrammar.y.in:
+        * css/CSSParser.cpp:
+        (WebCore::CSSParser::parseSupportsCondition):
+        (WebCore::isCSSLetter):
+        (WebCore::CSSParser::realLex):
+
</ins><span class="cx"> 2014-08-21  Beth Dakin  &lt;bdakin@apple.com&gt;
</span><span class="cx"> 
</span><span class="cx">         overflow:scroll elements should support rubber-banding
</span></span></pre></div>
<a id="trunkSourceWebCorecssCSSGrammaryin"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/CSSGrammar.y.in (172832 => 172833)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/CSSGrammar.y.in        2014-08-21 20:08:57 UTC (rev 172832)
+++ trunk/Source/WebCore/css/CSSGrammar.y.in        2014-08-21 20:29:43 UTC (rev 172833)
</span><span class="lines">@@ -391,7 +391,7 @@
</span><span class="cx"> 
</span><span class="cx"> #if ENABLE_CSS3_CONDITIONAL_RULES
</span><span class="cx"> 
</span><del>-webkit_supports_condition: WEBKIT_SUPPORTS_CONDITION_SYM '{' maybe_space supports_condition '}' { parser-&gt;m_supportsCondition = $4; } ;
</del><ins>+webkit_supports_condition: WEBKIT_SUPPORTS_CONDITION_SYM WHITESPACE maybe_space supports_condition '}' { parser-&gt;m_supportsCondition = $4; } ;
</ins><span class="cx"> 
</span><span class="cx"> #endif
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkSourceWebCorecssCSSParsercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/CSSParser.cpp (172832 => 172833)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/CSSParser.cpp        2014-08-21 20:08:57 UTC (rev 172832)
+++ trunk/Source/WebCore/css/CSSParser.cpp        2014-08-21 20:29:43 UTC (rev 172833)
</span><span class="lines">@@ -471,7 +471,9 @@
</span><span class="cx"> bool CSSParser::parseSupportsCondition(const String&amp; string)
</span><span class="cx"> {
</span><span class="cx">     m_supportsCondition = false;
</span><del>-    setupParser(&quot;@-webkit-supports-condition{ &quot;, string, &quot;} &quot;);
</del><ins>+    // can't use { because tokenizer state switches from supports to initial state when it sees { token.
+    // instead insert one &quot; &quot; (which is WHITESPACE in CSSGrammar.y)
+    setupParser(&quot;@-webkit-supports-condition &quot;, string, &quot;} &quot;);
</ins><span class="cx">     cssyyparse(this);
</span><span class="cx">     return m_supportsCondition;
</span><span class="cx"> }
</span><span class="lines">@@ -9981,7 +9983,7 @@
</span><span class="cx">     CharacterOther,
</span><span class="cx">     CharacterNull,
</span><span class="cx">     CharacterWhiteSpace,
</span><del>-    CharacterEndMediaQuery,
</del><ins>+    CharacterEndConditionQuery,
</ins><span class="cx">     CharacterEndNthChild,
</span><span class="cx">     CharacterQuote,
</span><span class="cx">     CharacterExclamationMark,
</span><span class="lines">@@ -10060,7 +10062,7 @@
</span><span class="cx"> /*  56 - 8                  */ CharacterNumber,
</span><span class="cx"> /*  57 - 9                  */ CharacterNumber,
</span><span class="cx"> /*  58 - :                  */ CharacterOther,
</span><del>-/*  59 - ;                  */ CharacterEndMediaQuery,
</del><ins>+/*  59 - ;                  */ CharacterEndConditionQuery,
</ins><span class="cx"> /*  60 - &lt;                  */ CharacterLess,
</span><span class="cx"> /*  61 - =                  */ CharacterOther,
</span><span class="cx"> /*  62 - &gt;                  */ CharacterOther,
</span><span class="lines">@@ -10124,7 +10126,7 @@
</span><span class="cx"> /* 120 - x                  */ CharacterIdentifierStart,
</span><span class="cx"> /* 121 - y                  */ CharacterIdentifierStart,
</span><span class="cx"> /* 122 - z                  */ CharacterIdentifierStart,
</span><del>-/* 123 - {                  */ CharacterEndMediaQuery,
</del><ins>+/* 123 - {                  */ CharacterEndConditionQuery,
</ins><span class="cx"> /* 124 - |                  */ CharacterVerticalBar,
</span><span class="cx"> /* 125 - }                  */ CharacterOther,
</span><span class="cx"> /* 126 - ~                  */ CharacterTilde,
</span><span class="lines">@@ -11340,10 +11342,15 @@
</span><span class="cx">         } while (*currentCharacter&lt;SrcCharacterType&gt;() &lt;= ' ' &amp;&amp; (typesOfASCIICharacters[*currentCharacter&lt;SrcCharacterType&gt;()] == CharacterWhiteSpace));
</span><span class="cx">         break;
</span><span class="cx"> 
</span><del>-    case CharacterEndMediaQuery:
-        if (m_parsingMode == MediaQueryMode)
</del><ins>+    case CharacterEndConditionQuery: {
+        bool isParsingCondition = m_parsingMode == MediaQueryMode;
+#if ENABLE(CSS3_CONDITIONAL_RULES)
+        isParsingCondition = isParsingCondition || m_parsingMode == SupportsMode;
+#endif
+        if (isParsingCondition)
</ins><span class="cx">             m_parsingMode = NormalMode;
</span><span class="cx">         break;
</span><ins>+    }
</ins><span class="cx"> 
</span><span class="cx">     case CharacterEndNthChild:
</span><span class="cx">         if (m_parsingMode == NthChildMode)
</span></span></pre>
</div>
</div>

</body>
</html>