Index: Source/core/css/parser/CSSParser.cpp |
diff --git a/Source/core/css/parser/CSSParser.cpp b/Source/core/css/parser/CSSParser.cpp |
index a919f49b443bb7cc149217024e3d5af1571cf386..c22759619b76d40c35082838a7090e39be19bacc 100644 |
--- a/Source/core/css/parser/CSSParser.cpp |
+++ b/Source/core/css/parser/CSSParser.cpp |
@@ -34,9 +34,8 @@ bool CSSParser::parseDeclaration(MutableStylePropertySet* propertySet, const Str |
void CSSParser::parseSelector(const String& selector, CSSSelectorList& selectorList) |
{ |
if (RuntimeEnabledFeatures::newCSSParserEnabled()) { |
- Vector<CSSParserToken> tokens; |
- CSSTokenizer::tokenize(selector, tokens); |
- CSSSelectorParser::parseSelector(tokens, m_bisonParser.m_context, starAtom, nullptr, selectorList); |
+ CSSTokenizer::Scope scope(selector); |
+ CSSSelectorParser::parseSelector(scope.tokenRange(), m_bisonParser.m_context, starAtom, nullptr, selectorList); |
return; |
} |
m_bisonParser.parseSelector(selector, selectorList); |
@@ -124,10 +123,9 @@ PassRefPtrWillBeRawPtr<StyleRuleKeyframe> CSSParser::parseKeyframeRule(const CSS |
bool CSSParser::parseSupportsCondition(const String& condition) |
{ |
if (RuntimeEnabledFeatures::newCSSParserEnabled()) { |
- Vector<CSSParserToken> tokens; |
- CSSTokenizer::tokenize(condition, tokens); |
- CSSParserImpl parser(strictCSSParserContext(), ""); |
- return CSSSupportsParser::supportsCondition(tokens, parser) == CSSSupportsParser::Supported; |
+ CSSTokenizer::Scope scope(condition); |
+ CSSParserImpl parser(strictCSSParserContext()); |
+ return CSSSupportsParser::supportsCondition(scope.tokenRange(), parser) == CSSSupportsParser::Supported; |
} |
return BisonCSSParser(CSSParserContext(HTMLStandardMode, 0)).parseSupportsCondition(condition); |
} |