<!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>[209466] trunk/Source/WebCore</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/209466">209466</a></dd>
<dt>Author</dt> <dd>hyatt@apple.com</dd>
<dt>Date</dt> <dd>2016-12-07 11:51:56 -0800 (Wed, 07 Dec 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>[CSS Parser] Eliminate the Scope class and fold it into CSSTokenizer
https://bugs.webkit.org/show_bug.cgi?id=165532
Reviewed by Dean Jackson.
The Scope class, nested inside CSSTokenizer, is both poorly named and serves
no purpose. It's especially weird that it was the entry point into tokenization
instead of CSSTokenizer.
Eliminate the class, fold its members and functions into CSSTokenizer, and have
callers just make a CSSTokenizer instead.
* css/parser/CSSParser.cpp:
(WebCore::CSSParser::parseSupportsCondition):
(WebCore::CSSParser::parseSelector):
* css/parser/CSSParserImpl.cpp:
(WebCore::CSSParserImpl::parseValue):
(WebCore::CSSParserImpl::parseCustomPropertyValue):
(WebCore::CSSParserImpl::parseInlineStyleDeclaration):
(WebCore::CSSParserImpl::parseDeclarationList):
(WebCore::CSSParserImpl::parseRule):
(WebCore::CSSParserImpl::parseStyleSheet):
(WebCore::CSSParserImpl::parseKeyframeKeyList):
(WebCore::CSSParserImpl::parseDeclarationListForInspector):
(WebCore::CSSParserImpl::parseStyleSheetForInspector):
* css/parser/CSSTokenizer.cpp:
(WebCore::CSSTokenizer::CSSTokenizer):
(WebCore::CSSTokenizer::tokenRange):
(WebCore::CSSTokenizer::tokenCount):
(WebCore::CSSTokenizer::registerString):
(WebCore::CSSTokenizer::Scope::Scope): Deleted.
(WebCore::CSSTokenizer::Scope::tokenRange): Deleted.
(WebCore::CSSTokenizer::Scope::tokenCount): Deleted.
* css/parser/CSSTokenizer.h:
(WebCore::CSSTokenizer::Scope::storeString): Deleted.
* css/parser/CSSTokenizerInputStream.cpp:
(WebCore::CSSTokenizerInputStream::CSSTokenizerInputStream):
* css/parser/CSSTokenizerInputStream.h:
* css/parser/MediaQueryParser.cpp:
(WebCore::MediaQueryParser::parseMediaQuerySet):
* css/parser/SizesAttributeParser.cpp:
(WebCore::SizesAttributeParser::SizesAttributeParser):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorecssparserCSSParsercpp">trunk/Source/WebCore/css/parser/CSSParser.cpp</a></li>
<li><a href="#trunkSourceWebCorecssparserCSSParserImplcpp">trunk/Source/WebCore/css/parser/CSSParserImpl.cpp</a></li>
<li><a href="#trunkSourceWebCorecssparserCSSTokenizercpp">trunk/Source/WebCore/css/parser/CSSTokenizer.cpp</a></li>
<li><a href="#trunkSourceWebCorecssparserCSSTokenizerh">trunk/Source/WebCore/css/parser/CSSTokenizer.h</a></li>
<li><a href="#trunkSourceWebCorecssparserCSSTokenizerInputStreamcpp">trunk/Source/WebCore/css/parser/CSSTokenizerInputStream.cpp</a></li>
<li><a href="#trunkSourceWebCorecssparserCSSTokenizerInputStreamh">trunk/Source/WebCore/css/parser/CSSTokenizerInputStream.h</a></li>
<li><a href="#trunkSourceWebCorecssparserMediaQueryParsercpp">trunk/Source/WebCore/css/parser/MediaQueryParser.cpp</a></li>
<li><a href="#trunkSourceWebCorecssparserSizesAttributeParsercpp">trunk/Source/WebCore/css/parser/SizesAttributeParser.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (209465 => 209466)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-12-07 19:31:08 UTC (rev 209465)
+++ trunk/Source/WebCore/ChangeLog 2016-12-07 19:51:56 UTC (rev 209466)
</span><span class="lines">@@ -1,3 +1,48 @@
</span><ins>+2016-12-07 Dave Hyatt <hyatt@apple.com>
+
+ [CSS Parser] Eliminate the Scope class and fold it into CSSTokenizer
+ https://bugs.webkit.org/show_bug.cgi?id=165532
+
+ Reviewed by Dean Jackson.
+
+ The Scope class, nested inside CSSTokenizer, is both poorly named and serves
+ no purpose. It's especially weird that it was the entry point into tokenization
+ instead of CSSTokenizer.
+
+ Eliminate the class, fold its members and functions into CSSTokenizer, and have
+ callers just make a CSSTokenizer instead.
+
+ * css/parser/CSSParser.cpp:
+ (WebCore::CSSParser::parseSupportsCondition):
+ (WebCore::CSSParser::parseSelector):
+ * css/parser/CSSParserImpl.cpp:
+ (WebCore::CSSParserImpl::parseValue):
+ (WebCore::CSSParserImpl::parseCustomPropertyValue):
+ (WebCore::CSSParserImpl::parseInlineStyleDeclaration):
+ (WebCore::CSSParserImpl::parseDeclarationList):
+ (WebCore::CSSParserImpl::parseRule):
+ (WebCore::CSSParserImpl::parseStyleSheet):
+ (WebCore::CSSParserImpl::parseKeyframeKeyList):
+ (WebCore::CSSParserImpl::parseDeclarationListForInspector):
+ (WebCore::CSSParserImpl::parseStyleSheetForInspector):
+ * css/parser/CSSTokenizer.cpp:
+ (WebCore::CSSTokenizer::CSSTokenizer):
+ (WebCore::CSSTokenizer::tokenRange):
+ (WebCore::CSSTokenizer::tokenCount):
+ (WebCore::CSSTokenizer::registerString):
+ (WebCore::CSSTokenizer::Scope::Scope): Deleted.
+ (WebCore::CSSTokenizer::Scope::tokenRange): Deleted.
+ (WebCore::CSSTokenizer::Scope::tokenCount): Deleted.
+ * css/parser/CSSTokenizer.h:
+ (WebCore::CSSTokenizer::Scope::storeString): Deleted.
+ * css/parser/CSSTokenizerInputStream.cpp:
+ (WebCore::CSSTokenizerInputStream::CSSTokenizerInputStream):
+ * css/parser/CSSTokenizerInputStream.h:
+ * css/parser/MediaQueryParser.cpp:
+ (WebCore::MediaQueryParser::parseMediaQuerySet):
+ * css/parser/SizesAttributeParser.cpp:
+ (WebCore::SizesAttributeParser::SizesAttributeParser):
+
</ins><span class="cx"> 2016-12-07 Joseph Pecoraro <pecoraro@apple.com>
</span><span class="cx">
</span><span class="cx"> Web Inspector: Remove unused and mostly untested Page domain commands and events
</span></span></pre></div>
<a id="trunkSourceWebCorecssparserCSSParsercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/parser/CSSParser.cpp (209465 => 209466)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/parser/CSSParser.cpp 2016-12-07 19:31:08 UTC (rev 209465)
+++ trunk/Source/WebCore/css/parser/CSSParser.cpp 2016-12-07 19:51:56 UTC (rev 209466)
</span><span class="lines">@@ -427,8 +427,8 @@
</span><span class="cx"> bool CSSParser::parseSupportsCondition(const String& condition)
</span><span class="cx"> {
</span><span class="cx"> if (m_context.useNewParser) {
</span><del>- CSSTokenizer::Scope scope(condition);
- CSSParserTokenRange range = scope.tokenRange();
</del><ins>+ CSSTokenizer tokenizer(condition);
+ CSSParserTokenRange range = tokenizer.tokenRange();
</ins><span class="cx"> CSSParserImpl parser(m_context);
</span><span class="cx"> return CSSSupportsParser::supportsCondition(range, parser) == CSSSupportsParser::Supported;
</span><span class="cx"> }
</span><span class="lines">@@ -1455,8 +1455,8 @@
</span><span class="cx"> void CSSParser::parseSelector(const String& string, CSSSelectorList& selectorList)
</span><span class="cx"> {
</span><span class="cx"> if (m_context.useNewParser) {
</span><del>- CSSTokenizer::Scope scope(string);
- selectorList = CSSSelectorParser::parseSelector(scope.tokenRange(), m_context, nullptr);
</del><ins>+ CSSTokenizer tokenizer(string);
+ selectorList = CSSSelectorParser::parseSelector(tokenizer.tokenRange(), m_context, nullptr);
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorecssparserCSSParserImplcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/parser/CSSParserImpl.cpp (209465 => 209466)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/parser/CSSParserImpl.cpp 2016-12-07 19:31:08 UTC (rev 209465)
+++ trunk/Source/WebCore/css/parser/CSSParserImpl.cpp 2016-12-07 19:51:56 UTC (rev 209466)
</span><span class="lines">@@ -70,8 +70,8 @@
</span><span class="cx"> if (declaration->cssParserMode() == CSSViewportRuleMode)
</span><span class="cx"> ruleType = StyleRule::Viewport;
</span><span class="cx"> #endif
</span><del>- CSSTokenizer::Scope scope(string);
- parser.consumeDeclarationValue(scope.tokenRange(), propertyID, important, ruleType);
</del><ins>+ CSSTokenizer tokenizer(string);
+ parser.consumeDeclarationValue(tokenizer.tokenRange(), propertyID, important, ruleType);
</ins><span class="cx"> if (parser.m_parsedProperties.isEmpty())
</span><span class="cx"> return CSSParser::ParseResult::Error;
</span><span class="cx"> return declaration->addParsedProperties(parser.m_parsedProperties) ? CSSParser::ParseResult::Changed : CSSParser::ParseResult::Unchanged;
</span><span class="lines">@@ -80,8 +80,8 @@
</span><span class="cx"> CSSParser::ParseResult CSSParserImpl::parseCustomPropertyValue(MutableStyleProperties* declaration, const AtomicString& propertyName, const String& string, bool important, const CSSParserContext& context)
</span><span class="cx"> {
</span><span class="cx"> CSSParserImpl parser(context);
</span><del>- CSSTokenizer::Scope scope(string);
- parser.consumeCustomPropertyValue(scope.tokenRange(), propertyName, important);
</del><ins>+ CSSTokenizer tokenizer(string);
+ parser.consumeCustomPropertyValue(tokenizer.tokenRange(), propertyName, important);
</ins><span class="cx"> if (parser.m_parsedProperties.isEmpty())
</span><span class="cx"> return CSSParser::ParseResult::Error;
</span><span class="cx"> return declaration->addParsedProperties(parser.m_parsedProperties) ? CSSParser::ParseResult::Changed : CSSParser::ParseResult::Unchanged;
</span><span class="lines">@@ -138,8 +138,8 @@
</span><span class="cx"> context.mode = strictToCSSParserMode(element->isHTMLElement() && !element->document().inQuirksMode());
</span><span class="cx">
</span><span class="cx"> CSSParserImpl parser(context);
</span><del>- CSSTokenizer::Scope scope(string);
- parser.consumeDeclarationList(scope.tokenRange(), StyleRule::Style);
</del><ins>+ CSSTokenizer tokenizer(string);
+ parser.consumeDeclarationList(tokenizer.tokenRange(), StyleRule::Style);
</ins><span class="cx"> return createStyleProperties(parser.m_parsedProperties, context.mode);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -151,8 +151,8 @@
</span><span class="cx"> if (declaration->cssParserMode() == CSSViewportRuleMode)
</span><span class="cx"> ruleType = StyleRule::Viewport;
</span><span class="cx"> #endif
</span><del>- CSSTokenizer::Scope scope(string);
- parser.consumeDeclarationList(scope.tokenRange(), ruleType);
</del><ins>+ CSSTokenizer tokenizer(string);
+ parser.consumeDeclarationList(tokenizer.tokenRange(), ruleType);
</ins><span class="cx"> if (parser.m_parsedProperties.isEmpty())
</span><span class="cx"> return false;
</span><span class="cx">
</span><span class="lines">@@ -170,8 +170,8 @@
</span><span class="cx"> RefPtr<StyleRuleBase> CSSParserImpl::parseRule(const String& string, const CSSParserContext& context, StyleSheetContents* styleSheet, AllowedRulesType allowedRules)
</span><span class="cx"> {
</span><span class="cx"> CSSParserImpl parser(context, styleSheet);
</span><del>- CSSTokenizer::Scope scope(string);
- CSSParserTokenRange range = scope.tokenRange();
</del><ins>+ CSSTokenizer tokenizer(string);
+ CSSParserTokenRange range = tokenizer.tokenRange();
</ins><span class="cx"> range.consumeWhitespace();
</span><span class="cx"> if (range.atEnd())
</span><span class="cx"> return nullptr; // Parse error, empty rule
</span><span class="lines">@@ -190,9 +190,9 @@
</span><span class="cx">
</span><span class="cx"> void CSSParserImpl::parseStyleSheet(const String& string, const CSSParserContext& context, StyleSheetContents* styleSheet)
</span><span class="cx"> {
</span><del>- CSSTokenizer::Scope scope(string);
</del><ins>+ CSSTokenizer tokenizer(string);
</ins><span class="cx"> CSSParserImpl parser(context, styleSheet);
</span><del>- bool firstRuleValid = parser.consumeRuleList(scope.tokenRange(), TopLevelRuleList, [&styleSheet](RefPtr<StyleRuleBase> rule) {
</del><ins>+ bool firstRuleValid = parser.consumeRuleList(tokenizer.tokenRange(), TopLevelRuleList, [&styleSheet](RefPtr<StyleRuleBase> rule) {
</ins><span class="cx"> if (rule->isCharsetRule())
</span><span class="cx"> return;
</span><span class="cx"> styleSheet->parserAppendRule(rule.releaseNonNull());
</span><span class="lines">@@ -244,7 +244,7 @@
</span><span class="cx">
</span><span class="cx"> std::unique_ptr<Vector<double>> CSSParserImpl::parseKeyframeKeyList(const String& keyList)
</span><span class="cx"> {
</span><del>- return consumeKeyframeKeyList(CSSTokenizer::Scope(keyList).tokenRange());
</del><ins>+ return consumeKeyframeKeyList(CSSTokenizer(keyList).tokenRange());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool CSSParserImpl::supportsDeclaration(CSSParserTokenRange& range)
</span><span class="lines">@@ -261,10 +261,10 @@
</span><span class="cx"> CSSParserImpl parser(context);
</span><span class="cx"> CSSParserObserverWrapper wrapper(observer);
</span><span class="cx"> parser.m_observerWrapper = &wrapper;
</span><del>- CSSTokenizer::Scope scope(declaration, wrapper);
</del><ins>+ CSSTokenizer tokenizer(declaration, wrapper);
</ins><span class="cx"> observer.startRuleHeader(StyleRule::Style, 0);
</span><span class="cx"> observer.endRuleHeader(1);
</span><del>- parser.consumeDeclarationList(scope.tokenRange(), StyleRule::Style);
</del><ins>+ parser.consumeDeclarationList(tokenizer.tokenRange(), StyleRule::Style);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void CSSParserImpl::parseStyleSheetForInspector(const String& string, const CSSParserContext& context, StyleSheetContents* styleSheet, CSSParserObserver& observer)
</span><span class="lines">@@ -272,8 +272,8 @@
</span><span class="cx"> CSSParserImpl parser(context, styleSheet);
</span><span class="cx"> CSSParserObserverWrapper wrapper(observer);
</span><span class="cx"> parser.m_observerWrapper = &wrapper;
</span><del>- CSSTokenizer::Scope scope(string, wrapper);
- bool firstRuleValid = parser.consumeRuleList(scope.tokenRange(), TopLevelRuleList, [&styleSheet](RefPtr<StyleRuleBase> rule) {
</del><ins>+ CSSTokenizer tokenizer(string, wrapper);
+ bool firstRuleValid = parser.consumeRuleList(tokenizer.tokenRange(), TopLevelRuleList, [&styleSheet](RefPtr<StyleRuleBase> rule) {
</ins><span class="cx"> if (rule->isCharsetRule())
</span><span class="cx"> return;
</span><span class="cx"> styleSheet->parserAppendRule(rule.releaseNonNull());
</span></span></pre></div>
<a id="trunkSourceWebCorecssparserCSSTokenizercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/parser/CSSTokenizer.cpp (209465 => 209466)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/parser/CSSTokenizer.cpp 2016-12-07 19:31:08 UTC (rev 209465)
+++ trunk/Source/WebCore/css/parser/CSSTokenizer.cpp 2016-12-07 19:51:56 UTC (rev 209466)
</span><span class="lines">@@ -40,8 +40,8 @@
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><del>-CSSTokenizer::Scope::Scope(const String& string)
- : m_string(string)
</del><ins>+CSSTokenizer::CSSTokenizer(const String& string)
+ : m_input(string)
</ins><span class="cx"> {
</span><span class="cx"> // According to the spec, we should perform preprocessing here.
</span><span class="cx"> // See: http://dev.w3.org/csswg/css-syntax/#input-preprocessing
</span><span class="lines">@@ -58,10 +58,8 @@
</span><span class="cx"> // Most strings we tokenize have about 3.5 to 5 characters per token.
</span><span class="cx"> m_tokens.reserveInitialCapacity(string.length() / 3);
</span><span class="cx">
</span><del>- CSSTokenizerInputStream input(string);
- CSSTokenizer tokenizer(input, *this);
</del><span class="cx"> while (true) {
</span><del>- CSSParserToken token = tokenizer.nextToken();
</del><ins>+ CSSParserToken token = nextToken();
</ins><span class="cx"> if (token.type() == CommentToken)
</span><span class="cx"> continue;
</span><span class="cx"> if (token.type() == EOFToken)
</span><span class="lines">@@ -70,27 +68,24 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>-CSSTokenizer::Scope::Scope(const String& string, CSSParserObserverWrapper& wrapper)
- : m_string(string)
</del><ins>+CSSTokenizer::CSSTokenizer(const String& string, CSSParserObserverWrapper& wrapper)
+ : m_input(string)
</ins><span class="cx"> {
</span><span class="cx"> if (string.isEmpty())
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- CSSTokenizerInputStream input(string);
- CSSTokenizer tokenizer(input, *this);
-
</del><span class="cx"> unsigned offset = 0;
</span><span class="cx"> while (true) {
</span><del>- CSSParserToken token = tokenizer.nextToken();
</del><ins>+ CSSParserToken token = nextToken();
</ins><span class="cx"> if (token.type() == EOFToken)
</span><span class="cx"> break;
</span><span class="cx"> if (token.type() == CommentToken)
</span><del>- wrapper.addComment(offset, input.offset(), m_tokens.size());
</del><ins>+ wrapper.addComment(offset, m_input.offset(), m_tokens.size());
</ins><span class="cx"> else {
</span><span class="cx"> m_tokens.append(token);
</span><span class="cx"> wrapper.addToken(offset);
</span><span class="cx"> }
</span><del>- offset = input.offset();
</del><ins>+ offset = m_input.offset();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> wrapper.addToken(offset);
</span><span class="lines">@@ -97,12 +92,12 @@
</span><span class="cx"> wrapper.finalizeConstruction(m_tokens.begin());
</span><span class="cx"> }
</span><span class="cx">
</span><del>-CSSParserTokenRange CSSTokenizer::Scope::tokenRange()
</del><ins>+CSSParserTokenRange CSSTokenizer::tokenRange()
</ins><span class="cx"> {
</span><span class="cx"> return m_tokens;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-unsigned CSSTokenizer::Scope::tokenCount()
</del><ins>+unsigned CSSTokenizer::tokenCount()
</ins><span class="cx"> {
</span><span class="cx"> return m_tokens.size();
</span><span class="cx"> }
</span><span class="lines">@@ -119,12 +114,6 @@
</span><span class="cx"> return first == '\\' && !isNewLine(second);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-CSSTokenizer::CSSTokenizer(CSSTokenizerInputStream& inputStream, Scope& scope)
- : m_input(inputStream)
- , m_scope(scope)
-{
-}
-
</del><span class="cx"> void CSSTokenizer::reconsume(UChar c)
</span><span class="cx"> {
</span><span class="cx"> m_input.pushBack(c);
</span><span class="lines">@@ -883,7 +872,7 @@
</span><span class="cx">
</span><span class="cx"> StringView CSSTokenizer::registerString(const String& string)
</span><span class="cx"> {
</span><del>- m_scope.storeString(string);
</del><ins>+ m_stringPool.append(string);
</ins><span class="cx"> return string;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorecssparserCSSTokenizerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/parser/CSSTokenizer.h (209465 => 209466)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/parser/CSSTokenizer.h 2016-12-07 19:31:08 UTC (rev 209465)
+++ trunk/Source/WebCore/css/parser/CSSTokenizer.h 2016-12-07 19:51:56 UTC (rev 209466)
</span><span class="lines">@@ -30,6 +30,7 @@
</span><span class="cx"> #pragma once
</span><span class="cx">
</span><span class="cx"> #include "CSSParserToken.h"
</span><ins>+#include "CSSTokenizerInputStream.h"
</ins><span class="cx"> #include <climits>
</span><span class="cx"> #include <wtf/text/StringView.h>
</span><span class="cx"> #include <wtf/text/WTFString.h>
</span><span class="lines">@@ -44,27 +45,13 @@
</span><span class="cx"> WTF_MAKE_NONCOPYABLE(CSSTokenizer);
</span><span class="cx"> WTF_MAKE_FAST_ALLOCATED;
</span><span class="cx"> public:
</span><del>- class Scope {
- public:
- Scope(const String&);
- Scope(const String&, CSSParserObserverWrapper&); // For the inspector
</del><ins>+ CSSTokenizer(const String&);
+ CSSTokenizer(const String&, CSSParserObserverWrapper&); // For the inspector
</ins><span class="cx">
</span><del>- CSSParserTokenRange tokenRange();
- unsigned tokenCount();
</del><ins>+ CSSParserTokenRange tokenRange();
+ unsigned tokenCount();
</ins><span class="cx">
</span><del>- private:
- void storeString(const String& string) { m_stringPool.append(string); }
- Vector<CSSParserToken, 32> m_tokens;
- // We only allocate strings when escapes are used.
- Vector<String> m_stringPool;
- String m_string;
-
- friend class CSSTokenizer;
- };
-
</del><span class="cx"> private:
</span><del>- CSSTokenizer(CSSTokenizerInputStream&, Scope&);
-
</del><span class="cx"> CSSParserToken nextToken();
</span><span class="cx">
</span><span class="cx"> UChar consume();
</span><span class="lines">@@ -129,8 +116,11 @@
</span><span class="cx"> static const CodePoint codePoints[];
</span><span class="cx">
</span><span class="cx"> Vector<CSSParserTokenType, 8> m_blockStack;
</span><del>- CSSTokenizerInputStream& m_input;
- Scope& m_scope;
</del><ins>+ CSSTokenizerInputStream m_input;
+
+ Vector<CSSParserToken, 32> m_tokens;
+ // We only allocate strings when escapes are used.
+ Vector<String> m_stringPool;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span></span></pre></div>
<a id="trunkSourceWebCorecssparserCSSTokenizerInputStreamcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/parser/CSSTokenizerInputStream.cpp (209465 => 209466)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/parser/CSSTokenizerInputStream.cpp 2016-12-07 19:31:08 UTC (rev 209465)
+++ trunk/Source/WebCore/css/parser/CSSTokenizerInputStream.cpp 2016-12-07 19:51:56 UTC (rev 209466)
</span><span class="lines">@@ -34,7 +34,7 @@
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><del>-CSSTokenizerInputStream::CSSTokenizerInputStream(String input)
</del><ins>+CSSTokenizerInputStream::CSSTokenizerInputStream(const String& input)
</ins><span class="cx"> : m_offset(0)
</span><span class="cx"> , m_stringLength(input.length())
</span><span class="cx"> , m_string(input.impl())
</span></span></pre></div>
<a id="trunkSourceWebCorecssparserCSSTokenizerInputStreamh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/parser/CSSTokenizerInputStream.h (209465 => 209466)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/parser/CSSTokenizerInputStream.h 2016-12-07 19:31:08 UTC (rev 209465)
+++ trunk/Source/WebCore/css/parser/CSSTokenizerInputStream.h 2016-12-07 19:51:56 UTC (rev 209466)
</span><span class="lines">@@ -39,7 +39,7 @@
</span><span class="cx"> WTF_MAKE_NONCOPYABLE(CSSTokenizerInputStream);
</span><span class="cx"> WTF_MAKE_FAST_ALLOCATED;
</span><span class="cx"> public:
</span><del>- explicit CSSTokenizerInputStream(String input);
</del><ins>+ explicit CSSTokenizerInputStream(const String& input);
</ins><span class="cx">
</span><span class="cx"> // Gets the char in the stream replacing NUL characters with a unicode
</span><span class="cx"> // replacement character. Will return (NUL) kEndOfFileMarker when at the
</span><span class="lines">@@ -101,7 +101,7 @@
</span><span class="cx"> private:
</span><span class="cx"> size_t m_offset;
</span><span class="cx"> const size_t m_stringLength;
</span><del>- const RefPtr<StringImpl> m_string;
</del><ins>+ RefPtr<StringImpl> m_string;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span></span></pre></div>
<a id="trunkSourceWebCorecssparserMediaQueryParsercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/parser/MediaQueryParser.cpp (209465 => 209466)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/parser/MediaQueryParser.cpp 2016-12-07 19:31:08 UTC (rev 209465)
+++ trunk/Source/WebCore/css/parser/MediaQueryParser.cpp 2016-12-07 19:51:56 UTC (rev 209466)
</span><span class="lines">@@ -38,7 +38,7 @@
</span><span class="cx">
</span><span class="cx"> RefPtr<MediaQuerySet> MediaQueryParser::parseMediaQuerySet(const String& queryString)
</span><span class="cx"> {
</span><del>- return parseMediaQuerySet(CSSTokenizer::Scope(queryString).tokenRange());
</del><ins>+ return parseMediaQuerySet(CSSTokenizer(queryString).tokenRange());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> RefPtr<MediaQuerySet> MediaQueryParser::parseMediaQuerySet(CSSParserTokenRange range)
</span></span></pre></div>
<a id="trunkSourceWebCorecssparserSizesAttributeParsercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/parser/SizesAttributeParser.cpp (209465 => 209466)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/parser/SizesAttributeParser.cpp 2016-12-07 19:31:08 UTC (rev 209465)
+++ trunk/Source/WebCore/css/parser/SizesAttributeParser.cpp 2016-12-07 19:51:56 UTC (rev 209466)
</span><span class="lines">@@ -70,7 +70,7 @@
</span><span class="cx"> , m_length(0)
</span><span class="cx"> , m_lengthWasSet(false)
</span><span class="cx"> {
</span><del>- m_isValid = parse(CSSTokenizer::Scope(attribute).tokenRange());
</del><ins>+ m_isValid = parse(CSSTokenizer(attribute).tokenRange());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> float SizesAttributeParser::length()
</span></span></pre>
</div>
</div>
</body>
</html>