Replace CSSParserString with StringView.

third_party/WebKit/Source/core/css/parser/CSSTokenizer.cpp

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "core/css/parser/CSSTokenizer.h"
 
 namespace blink {
 #include "core/CSSTokenizerCodepoints.cpp"
 }
 
@@ skipping 122 matching lines @@
     }
     return false;
 }
 
 CSSParserToken CSSTokenizer::blockStart(CSSParserTokenType type)
 {
     m_blockStack.append(type);
     return CSSParserToken(type, CSSParserToken::BlockStart);
 }
 
-CSSParserToken CSSTokenizer::blockStart(CSSParserTokenType blockType, CSSParserTokenType type, CSSParserString name)
+CSSParserToken CSSTokenizer::blockStart(CSSParserTokenType blockType, CSSParserTokenType type, StringView name)
 {
     m_blockStack.append(blockType);
     return CSSParserToken(type, name, CSSParserToken::BlockStart);
 }
 
 CSSParserToken CSSTokenizer::blockEnd(CSSParserTokenType type, CSSParserTokenType startType)
 {
     if (popIfBlockMatches(m_blockStack, startType))
         return CSSParserToken(type, CSSParserToken::BlockEnd);
     return CSSParserToken(type);
@@ skipping 305 matching lines @@
     if (nextCharsAreIdentifier())
         token.convertToDimensionWithUnit(consumeName());
     else if (consumeIfNext('%'))
         token.convertToPercentage();
     return token;
 }
 
 // http://dev.w3.org/csswg/css-syntax/#consume-ident-like-token
 CSSParserToken CSSTokenizer::consumeIdentLikeToken()
 {
-    CSSParserString name = consumeName();
+    StringView name = consumeName();
     if (consumeIfNext('(')) {
-        if (name.equalIgnoringASCIICase("url")) {
+        if (equalIgnoringASCIICase(name, "url")) {
             // The spec is slightly different so as to avoid dropping whitespace
             // tokens, but they wouldn't be used and this is easier.
             consumeUntilNonWhitespace();
             UChar next = m_input.nextInputChar();
             if (next != '"' && next != '\'')
                 return consumeUrlToken();
         }
         return blockStart(LeftParenthesisToken, FunctionToken, name);
     }
     return CSSParserToken(IdentToken, name);
 }
 
 // http://dev.w3.org/csswg/css-syntax/#consume-a-string-token
 CSSParserToken CSSTokenizer::consumeStringTokenUntil(UChar endingCodePoint)
 {
     // Strings without escapes get handled without allocations
     for (unsigned size = 0; ; size++) {
         UChar cc = m_input.peekWithoutReplacement(size);
         if (cc == endingCodePoint) {
             unsigned startOffset = m_input.offset();
             m_input.advance(size + 1);
-            return CSSParserToken(StringToken, m_input.rangeAsCSSParserString(startOffset, size));
+            return CSSParserToken(StringToken, m_input.rangeAt(startOffset, size));
         }
         if (isNewLine(cc)) {
             m_input.advance(size);
             return CSSParserToken(BadStringToken);
         }
         if (cc == '\0' || cc == '\\')
             break;
     }
 
     StringBuilder output;
@@ skipping 59 matching lines @@
 CSSParserToken CSSTokenizer::consumeUrlToken()
 {
     consumeUntilNonWhitespace();
 
     // URL tokens without escapes get handled without allocations
     for (unsigned size = 0; ; size++) {
         UChar cc = m_input.peekWithoutReplacement(size);
         if (cc == ')') {
             unsigned startOffset = m_input.offset();
             m_input.advance(size + 1);
-            return CSSParserToken(UrlToken, m_input.rangeAsCSSParserString(startOffset, size));
+            return CSSParserToken(UrlToken, m_input.rangeAt(startOffset, size));
         }
         if (cc <= ' ' || cc == '\\' || cc == '"' || cc == '\'' || cc == '(' || cc == '\x7f')
             break;
     }
 
     StringBuilder result;
     while (true) {
         UChar cc = consume();
         if (cc == ')' || cc == kEndOfFileMarker)
             return CSSParserToken(UrlToken, registerString(result.toString()));
@@ skipping 71 matching lines @@
 bool CSSTokenizer::consumeIfNext(UChar character)
 {
     if (m_input.nextInputChar() == character) {
         consume();
         return true;
     }
     return false;
 }
 
 // http://www.w3.org/TR/css3-syntax/#consume-a-name
-CSSParserString CSSTokenizer::consumeName()
+StringView CSSTokenizer::consumeName()
 {
     // Names without escapes get handled without allocations
     for (unsigned size = 0; ; ++size) {
         UChar cc = m_input.peekWithoutReplacement(size);
         if (cc == '\0' || cc == '\\')
             break;
         if (!isNameCodePoint(cc)) {
             unsigned startOffset = m_input.offset();
             m_input.advance(size);
-            return m_input.rangeAsCSSParserString(startOffset, size);
+            return m_input.rangeAt(startOffset, size);
         }
     }
 
     StringBuilder result;
     while (true) {
         UChar cc = consume();
         if (isNameCodePoint(cc)) {
             result.append(cc);
             continue;
         }
@@ skipping 74 matching lines @@
 }
 
 bool CSSTokenizer::nextCharsAreIdentifier()
 {
     UChar first = consume();
     bool areIdentifier = nextCharsAreIdentifier(first);
     reconsume(first);
     return areIdentifier;
 }
 
-CSSParserString CSSTokenizer::registerString(const String& string)
+StringView CSSTokenizer::registerString(const String& string)
 {
     m_scope.storeString(string);
-    CSSParserString result;
-    result.init(string);
-    return result;
+    return string;
 }
 
 } // namespace blink