<!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>[178583] 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/178583">178583</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2015-01-16 10:50:45 -0800 (Fri, 16 Jan 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Unreviewed, rolling out <a href="http://trac.webkit.org/projects/webkit/changeset/178532">r178532</a>.
https://bugs.webkit.org/show_bug.cgi?id=140548
Broke fast/css/parsing-css-lang.html on some bots (Requested
by ap on #webkit).
Reverted changeset:
"Canonicalization of :lang() should preserve the :lang()'s
arguments representations"
https://bugs.webkit.org/show_bug.cgi?id=139928
http://trac.webkit.org/changeset/178532</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsfastcsscsslangselectorwithstringargumentstextexpectedtxt">trunk/LayoutTests/fast/css/css-lang-selector-with-string-arguments-text-expected.txt</a></li>
<li><a href="#trunkLayoutTestsfastcsscsslangselectorwithstringargumentstexthtml">trunk/LayoutTests/fast/css/css-lang-selector-with-string-arguments-text.html</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="#trunkSourceWebCorecssCSSParserValuescpp">trunk/Source/WebCore/css/CSSParserValues.cpp</a></li>
<li><a href="#trunkSourceWebCorecssCSSParserValuesh">trunk/Source/WebCore/css/CSSParserValues.h</a></li>
<li><a href="#trunkSourceWebCorecssCSSSelectorcpp">trunk/Source/WebCore/css/CSSSelector.cpp</a></li>
<li><a href="#trunkSourceWebCorecssCSSSelectorh">trunk/Source/WebCore/css/CSSSelector.h</a></li>
<li><a href="#trunkSourceWebCorecssSelectorCheckercpp">trunk/Source/WebCore/css/SelectorChecker.cpp</a></li>
<li><a href="#trunkSourceWebCorecssSelectorCheckerTestFunctionsh">trunk/Source/WebCore/css/SelectorCheckerTestFunctions.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (178582 => 178583)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog        2015-01-16 18:36:34 UTC (rev 178582)
+++ trunk/LayoutTests/ChangeLog        2015-01-16 18:50:45 UTC (rev 178583)
</span><span class="lines">@@ -1,5 +1,20 @@
</span><span class="cx"> 2015-01-16 Commit Queue <commit-queue@webkit.org>
</span><span class="cx">
</span><ins>+ Unreviewed, rolling out r178532.
+ https://bugs.webkit.org/show_bug.cgi?id=140548
+
+ Broke fast/css/parsing-css-lang.html on some bots (Requested
+ by ap on #webkit).
+
+ Reverted changeset:
+
+ "Canonicalization of :lang() should preserve the :lang()'s
+ arguments representations"
+ https://bugs.webkit.org/show_bug.cgi?id=139928
+ http://trac.webkit.org/changeset/178532
+
+2015-01-16 Commit Queue <commit-queue@webkit.org>
+
</ins><span class="cx"> Unreviewed, rolling out r178577.
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=140546
</span><span class="cx">
</span></span></pre></div>
<a id="trunkLayoutTestsfastcsscsslangselectorwithstringargumentstextexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/css/css-lang-selector-with-string-arguments-text-expected.txt (178582 => 178583)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/css/css-lang-selector-with-string-arguments-text-expected.txt        2015-01-16 18:36:34 UTC (rev 178582)
+++ trunk/LayoutTests/fast/css/css-lang-selector-with-string-arguments-text-expected.txt        2015-01-16 18:50:45 UTC (rev 178583)
</span><span class="lines">@@ -3,19 +3,12 @@
</span><span class="cx"> On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
</span><span class="cx">
</span><span class="cx">
</span><del>-PASS parseThenSerializeRule(':lang("a") { }') is ':lang("a") { }'
-PASS parseThenSerializeRule(':lang("bb", cc) { }') is ':lang("bb", cc) { }'
-PASS parseThenSerializeRule(':lang("ddd", eee) { }') is ':lang("ddd", eee) { }'
-PASS parseThenSerializeRule(':lang("ddd", eee, ffff) { }') is ':lang("ddd", eee, ffff) { }'
-PASS parseThenSerializeRule(':lang("ddd", eee, "ffff") { }') is ':lang("ddd", eee, "ffff") { }'
-PASS parseThenSerializeRule(':lang("*-1997") { }') is ':lang("*-1997") { }'
-PASS parseThenSerializeRule(':lang("*-1997", "*-1998") { }') is ':lang("*-1997", "*-1998") { }'
-PASS parseThenSerializeRule(':lang("*-1997", "*-1998", "*-1999") { }') is ':lang("*-1997", "*-1998", "*-1999") { }'
-PASS parseThenSerializeRule(':lang("") { }') is ':lang("") { }'
-
-PASS parseThenSerializeRule(':lang(foo, "bar", baz) { }') is ':lang(foo, "bar", baz) { }'
-PASS parseThenSerializeRule(':lang(foo, "bar" , baz) { }') is ':lang(foo, "bar", baz) { }'
-PASS parseThenSerializeRule(':lang( foo , "bar" , baz ) { }') is ':lang(foo, "bar", baz) { }'
</del><ins>+PASS parseThenSerializeRule(':lang("a") { }') is ':lang(a) { }'
+PASS parseThenSerializeRule(':lang("bb", cc) { }') is ':lang(bb, cc) { }'
+PASS parseThenSerializeRule(':lang("ddd", eee) { }') is ':lang(ddd, eee) { }'
+PASS parseThenSerializeRule(':lang("*-1997") { }') is ':lang(*-1997) { }'
+PASS parseThenSerializeRule(':lang("*-1997", "*-1998") { }') is ':lang(*-1997, *-1998) { }'
+PASS parseThenSerializeRule(':lang("") { }') is ':lang() { }'
</ins><span class="cx"> PASS successfullyParsed is true
</span><span class="cx">
</span><span class="cx"> TEST COMPLETE
</span></span></pre></div>
<a id="trunkLayoutTestsfastcsscsslangselectorwithstringargumentstexthtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/css/css-lang-selector-with-string-arguments-text.html (178582 => 178583)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/css/css-lang-selector-with-string-arguments-text.html        2015-01-16 18:36:34 UTC (rev 178582)
+++ trunk/LayoutTests/fast/css/css-lang-selector-with-string-arguments-text.html        2015-01-16 18:50:45 UTC (rev 178583)
</span><span class="lines">@@ -25,24 +25,17 @@
</span><span class="cx">
</span><span class="cx"> function testSelectorRoundTrip(selector)
</span><span class="cx"> {
</span><del>- shouldBe("parseThenSerializeRule('" + selector + " { }')", "'" + selector + " { }'");
</del><ins>+ var expected = selector.split('"').join('');
+ shouldBe("parseThenSerializeRule('" + selector + " { }')", "'" + expected + " { }'");
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> testSelectorRoundTrip(':lang("a")');
</span><span class="cx"> testSelectorRoundTrip(':lang("bb", cc)');
</span><span class="cx"> testSelectorRoundTrip(':lang("ddd", eee)');
</span><del>-testSelectorRoundTrip(':lang("ddd", eee, ffff)');
-testSelectorRoundTrip(':lang("ddd", eee, "ffff")');
</del><span class="cx"> testSelectorRoundTrip(':lang("*-1997")');
</span><span class="cx"> testSelectorRoundTrip(':lang("*-1997", "*-1998")');
</span><del>-testSelectorRoundTrip(':lang("*-1997", "*-1998", "*-1999")');
</del><span class="cx"> testSelectorRoundTrip(':lang("")');
</span><span class="cx">
</span><del>-debug('');
-
-shouldBe("parseThenSerializeRule(':lang(foo, \"bar\", baz) { }')", "':lang(foo, \"bar\", baz) { }'");
-shouldBe("parseThenSerializeRule(':lang(foo, \"bar\" , baz) { }')", "':lang(foo, \"bar\", baz) { }'");
-shouldBe("parseThenSerializeRule(':lang( foo , \"bar\" , baz ) { }')", "':lang(foo, \"bar\", baz) { }'");
</del><span class="cx"> </script>
</span><span class="cx"> <script src="../../resources/js-test-post.js"></script>
</span><span class="cx"> </body>
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (178582 => 178583)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog        2015-01-16 18:36:34 UTC (rev 178582)
+++ trunk/Source/WebCore/ChangeLog        2015-01-16 18:50:45 UTC (rev 178583)
</span><span class="lines">@@ -1,5 +1,20 @@
</span><span class="cx"> 2015-01-16 Commit Queue <commit-queue@webkit.org>
</span><span class="cx">
</span><ins>+ Unreviewed, rolling out r178532.
+ https://bugs.webkit.org/show_bug.cgi?id=140548
+
+ Broke fast/css/parsing-css-lang.html on some bots (Requested
+ by ap on #webkit).
+
+ Reverted changeset:
+
+ "Canonicalization of :lang() should preserve the :lang()'s
+ arguments representations"
+ https://bugs.webkit.org/show_bug.cgi?id=139928
+ http://trac.webkit.org/changeset/178532
+
+2015-01-16 Commit Queue <commit-queue@webkit.org>
+
</ins><span class="cx"> Unreviewed, rolling out r178577.
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=140546
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorecssCSSGrammaryin"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/CSSGrammar.y.in (178582 => 178583)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/CSSGrammar.y.in        2015-01-16 18:36:34 UTC (rev 178582)
+++ trunk/Source/WebCore/css/CSSGrammar.y.in        2015-01-16 18:50:45 UTC (rev 178583)
</span><span class="lines">@@ -1104,7 +1104,7 @@
</span><span class="cx"> ;
</span><span class="cx">
</span><span class="cx"> #if ENABLE_CSS_SELECTORS_LEVEL4
</span><del>-lang_range: LANGRANGE | IDENT | STRING { $1.setTokenType(TokenType::AtomicStringToken); $$ = $1; } ;
</del><ins>+lang_range: LANGRANGE | IDENT | STRING
</ins><span class="cx">
</span><span class="cx"> comma_separated_lang_ranges:
</span><span class="cx"> lang_range %prec UNIMPORTANT_TOK {
</span><span class="lines">@@ -1397,7 +1397,7 @@
</span><span class="cx"> if ($4) {
</span><span class="cx"> auto selector = std::make_unique<CSSParserSelector>();
</span><span class="cx"> selector->setMatch(CSSSelector::PseudoClass);
</span><del>- selector->setLangArgumentList(*std::unique_ptr<Vector<CSSParserString>>($4));
</del><ins>+ selector->setArgumentList(*std::unique_ptr<Vector<CSSParserString>>($4));
</ins><span class="cx"> selector->setPseudoClassValue($2);
</span><span class="cx"> if (selector->pseudoClassType() == CSSSelector::PseudoClassLang)
</span><span class="cx"> $$ = selector.release();
</span></span></pre></div>
<a id="trunkSourceWebCorecssCSSParserValuescpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/CSSParserValues.cpp (178582 => 178583)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/CSSParserValues.cpp        2015-01-16 18:36:34 UTC (rev 178582)
+++ trunk/Source/WebCore/css/CSSParserValues.cpp        2015-01-16 18:50:45 UTC (rev 178583)
</span><span class="lines">@@ -262,18 +262,14 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #if ENABLE(CSS_SELECTORS_LEVEL4)
</span><del>-void CSSParserSelector::setLangArgumentList(const Vector<CSSParserString>& stringVector)
</del><ins>+void CSSParserSelector::setArgumentList(Vector<CSSParserString>& stringVector)
</ins><span class="cx"> {
</span><span class="cx"> ASSERT_WITH_MESSAGE(!stringVector.isEmpty(), "No CSS Selector takes an empty argument list.");
</span><del>- auto argumentList = std::make_unique<Vector<LanguageArgument>>();
</del><ins>+ auto argumentList = std::make_unique<Vector<AtomicString>>();
</ins><span class="cx"> argumentList->reserveInitialCapacity(stringVector.size());
</span><del>- for (const CSSParserString& string : stringVector) {
- LanguageArgument languageArgument;
- languageArgument.languageRange = string;
- languageArgument.tokenType = string.tokenType();
- argumentList->append(languageArgument);
- }
- m_selector->setLangArgumentList(WTF::move(argumentList));
</del><ins>+ for (const AtomicString& argument : stringVector)
+ argumentList->append(argument);
+ m_selector->setArgumentList(WTF::move(argumentList));
</ins><span class="cx"> }
</span><span class="cx"> #endif
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorecssCSSParserValuesh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/CSSParserValues.h (178582 => 178583)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/CSSParserValues.h        2015-01-16 18:36:34 UTC (rev 178582)
+++ trunk/Source/WebCore/css/CSSParserValues.h        2015-01-16 18:50:45 UTC (rev 178583)
</span><span class="lines">@@ -75,11 +75,6 @@
</span><span class="cx"> unsigned length() const { return m_length; }
</span><span class="cx"> void setLength(unsigned length) { m_length = length; }
</span><span class="cx">
</span><del>-#if ENABLE(CSS_SELECTORS_LEVEL4)
- TokenType tokenType() const { return m_tokenType; }
- void setTokenType(TokenType tokenType) { m_tokenType = tokenType; }
-#endif
-
</del><span class="cx"> void lower();
</span><span class="cx">
</span><span class="cx"> UChar operator[](unsigned i) const
</span><span class="lines">@@ -106,9 +101,6 @@
</span><span class="cx"> } m_data;
</span><span class="cx"> unsigned m_length;
</span><span class="cx"> bool m_is8Bit;
</span><del>-#if ENABLE(CSS_SELECTORS_LEVEL4)
- TokenType m_tokenType;
-#endif
</del><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> struct CSSParserFunction;
</span><span class="lines">@@ -210,7 +202,7 @@
</span><span class="cx">
</span><span class="cx"> void adoptSelectorVector(Vector<std::unique_ptr<CSSParserSelector>>& selectorVector);
</span><span class="cx"> #if ENABLE(CSS_SELECTORS_LEVEL4)
</span><del>- void setLangArgumentList(const Vector<CSSParserString>& stringVector);
</del><ins>+ void setArgumentList(Vector<CSSParserString>& stringVector);
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> void setPseudoClassValue(const CSSParserString& pseudoClassString);
</span></span></pre></div>
<a id="trunkSourceWebCorecssCSSSelectorcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/CSSSelector.cpp (178582 => 178583)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/CSSSelector.cpp        2015-01-16 18:36:34 UTC (rev 178582)
+++ trunk/Source/WebCore/css/CSSSelector.cpp        2015-01-16 18:50:45 UTC (rev 178583)
</span><span class="lines">@@ -346,17 +346,11 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #if ENABLE(CSS_SELECTORS_LEVEL4)
</span><del>-static void appendLangArgumentList(StringBuilder& str, const Vector<LanguageArgument>& argumentList)
</del><ins>+static void appendArgumentList(StringBuilder& str, const Vector<AtomicString>& argumentList)
</ins><span class="cx"> {
</span><span class="cx"> unsigned argumentListSize = argumentList.size();
</span><span class="cx"> for (unsigned i = 0; i < argumentListSize; ++i) {
</span><del>- const LanguageArgument& argument = argumentList[i];
- bool isAtomicStringToken = argument.tokenType == TokenType::AtomicStringToken;
- if (isAtomicStringToken)
- str.append('"');
- str.append(argument.languageRange);
- if (isAtomicStringToken)
- str.append('"');
</del><ins>+ str.append(argumentList[i]);
</ins><span class="cx"> if (i != argumentListSize - 1)
</span><span class="cx"> str.appendLiteral(", ");
</span><span class="cx"> }
</span><span class="lines">@@ -497,8 +491,8 @@
</span><span class="cx"> case CSSSelector::PseudoClassLang:
</span><span class="cx"> str.appendLiteral(":lang(");
</span><span class="cx"> #if ENABLE(CSS_SELECTORS_LEVEL4)
</span><del>- ASSERT_WITH_MESSAGE(cs->langArgumentList() && !cs->langArgumentList()->isEmpty(), "An empty :lang() is invalid and should never be generated by the parser.");
- appendLangArgumentList(str, *cs->langArgumentList());
</del><ins>+ ASSERT_WITH_MESSAGE(cs->argumentList() && !cs->argumentList()->isEmpty(), "An empty :lang() is invalid and should never be generated by the parser.");
+ appendArgumentList(str, *cs->argumentList());
</ins><span class="cx"> str.append(')');
</span><span class="cx"> #else
</span><span class="cx"> appendPseudoClassFunctionTail(str, cs);
</span><span class="lines">@@ -714,10 +708,10 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #if ENABLE(CSS_SELECTORS_LEVEL4)
</span><del>-void CSSSelector::setLangArgumentList(std::unique_ptr<Vector<LanguageArgument>> argumentList)
</del><ins>+void CSSSelector::setArgumentList(std::unique_ptr<Vector<AtomicString>> argumentList)
</ins><span class="cx"> {
</span><span class="cx"> createRareData();
</span><del>- m_data.m_rareData->m_langArgumentList = WTF::move(argumentList);
</del><ins>+ m_data.m_rareData->m_argumentList = WTF::move(argumentList);
</ins><span class="cx"> }
</span><span class="cx"> #endif
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorecssCSSSelectorh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/CSSSelector.h (178582 => 178583)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/CSSSelector.h        2015-01-16 18:36:34 UTC (rev 178582)
+++ trunk/Source/WebCore/css/CSSSelector.h        2015-01-16 18:50:45 UTC (rev 178583)
</span><span class="lines">@@ -29,17 +29,6 @@
</span><span class="cx"> namespace WebCore {
</span><span class="cx"> class CSSSelectorList;
</span><span class="cx">
</span><del>-#if ENABLE(CSS_SELECTORS_LEVEL4)
- enum class TokenType {
- IdentifierToken = 0,
- AtomicStringToken
- };
-
- struct LanguageArgument {
- AtomicString languageRange;
- TokenType tokenType;
- };
-#endif
</del><span class="cx"> enum class SelectorSpecificityIncrement {
</span><span class="cx"> ClassA = 0x10000,
</span><span class="cx"> ClassB = 0x100,
</span><span class="lines">@@ -233,7 +222,7 @@
</span><span class="cx"> const AtomicString& attributeCanonicalLocalName() const;
</span><span class="cx"> const AtomicString& argument() const { return m_hasRareData ? m_data.m_rareData->m_argument : nullAtom; }
</span><span class="cx"> #if ENABLE(CSS_SELECTORS_LEVEL4)
</span><del>- const Vector<LanguageArgument>* langArgumentList() const { return m_hasRareData ? m_data.m_rareData->m_langArgumentList.get() : nullptr; }
</del><ins>+ const Vector<AtomicString>* argumentList() const { return m_hasRareData ? m_data.m_rareData->m_argumentList.get() : nullptr; }
</ins><span class="cx"> #endif
</span><span class="cx"> const CSSSelectorList* selectorList() const { return m_hasRareData ? m_data.m_rareData->m_selectorList.get() : nullptr; }
</span><span class="cx">
</span><span class="lines">@@ -241,7 +230,7 @@
</span><span class="cx"> void setAttribute(const QualifiedName&, bool isCaseInsensitive);
</span><span class="cx"> void setArgument(const AtomicString&);
</span><span class="cx"> #if ENABLE(CSS_SELECTORS_LEVEL4)
</span><del>- void setLangArgumentList(std::unique_ptr<Vector<LanguageArgument>>);
</del><ins>+ void setArgumentList(std::unique_ptr<Vector<AtomicString>>);
</ins><span class="cx"> #endif
</span><span class="cx"> void setSelectorList(std::unique_ptr<CSSSelectorList>);
</span><span class="cx">
</span><span class="lines">@@ -341,7 +330,7 @@
</span><span class="cx"> AtomicString m_attributeCanonicalLocalName;
</span><span class="cx"> AtomicString m_argument; // Used for :contains and :nth-*
</span><span class="cx"> #if ENABLE(CSS_SELECTORS_LEVEL4)
</span><del>- std::unique_ptr<Vector<LanguageArgument>> m_langArgumentList;
</del><ins>+ std::unique_ptr<Vector<AtomicString>> m_argumentList;
</ins><span class="cx"> #endif
</span><span class="cx"> std::unique_ptr<CSSSelectorList> m_selectorList; // Used for :-webkit-any and :not
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorecssSelectorCheckercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/SelectorChecker.cpp (178582 => 178583)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/SelectorChecker.cpp        2015-01-16 18:36:34 UTC (rev 178582)
+++ trunk/Source/WebCore/css/SelectorChecker.cpp        2015-01-16 18:50:45 UTC (rev 178583)
</span><span class="lines">@@ -935,8 +935,8 @@
</span><span class="cx"> case CSSSelector::PseudoClassLang:
</span><span class="cx"> {
</span><span class="cx"> #if ENABLE(CSS_SELECTORS_LEVEL4)
</span><del>- ASSERT(selector->langArgumentList() && !selector->langArgumentList()->isEmpty());
- return matchesLangPseudoClass(element, *selector->langArgumentList());
</del><ins>+ ASSERT(selector->argumentList() && !selector->argumentList()->isEmpty());
+ return matchesLangPseudoClass(element, *selector->argumentList());
</ins><span class="cx"> #else
</span><span class="cx"> const AtomicString& argument = selector->argument();
</span><span class="cx"> if (argument.isNull())
</span></span></pre></div>
<a id="trunkSourceWebCorecssSelectorCheckerTestFunctionsh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/SelectorCheckerTestFunctions.h (178582 => 178583)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/SelectorCheckerTestFunctions.h        2015-01-16 18:36:34 UTC (rev 178582)
+++ trunk/Source/WebCore/css/SelectorCheckerTestFunctions.h        2015-01-16 18:50:45 UTC (rev 178583)
</span><span class="lines">@@ -146,7 +146,7 @@
</span><span class="cx"> return false;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-inline bool matchesLangPseudoClass(const Element* element, const Vector<LanguageArgument>& argumentList)
</del><ins>+inline bool matchesLangPseudoClass(const Element* element, const Vector<AtomicString>& ranges)
</ins><span class="cx"> {
</span><span class="cx"> ASSERT(element);
</span><span class="cx">
</span><span class="lines">@@ -161,15 +161,14 @@
</span><span class="cx"> if (language.isEmpty())
</span><span class="cx"> return false;
</span><span class="cx">
</span><del>- // Implement basic and extended filterings of given language tags
</del><ins>+ // Implement basic and extended filterings of given language tags
</ins><span class="cx"> // as specified in www.ietf.org/rfc/rfc4647.txt.
</span><span class="cx"> Vector<String> rangeSubtags;
</span><span class="cx"> Vector<String> languageSubtags;
</span><span class="cx">
</span><span class="cx"> language.string().split('-', true, languageSubtags);
</span><span class="cx">
</span><del>- for (const LanguageArgument& argument : argumentList) {
- const AtomicString& range = argument.languageRange;
</del><ins>+ for (const AtomicString& range : ranges) {
</ins><span class="cx"> if (range.isEmpty())
</span><span class="cx"> continue;
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>