Replace CSSParserString with StringView.

third_party/WebKit/Source/core/css/parser/CSSParserToken.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/CSSParserToken.h"
 
 #include "core/css/CSSMarkup.h"
 #include "core/css/CSSPrimitiveValueUnitTrie.h"
 #include "core/css/parser/CSSPropertyParser.h"
 #include "wtf/HashMap.h"
@@ skipping 10 matching lines @@
 
 // Just a helper used for Delimiter tokens.
 CSSParserToken::CSSParserToken(CSSParserTokenType type, UChar c)
     : m_type(type)
     , m_blockType(NotBlock)
     , m_delimiter(c)
 {
     ASSERT(m_type == DelimiterToken);
 }
 
-CSSParserToken::CSSParserToken(CSSParserTokenType type, CSSParserString value, BlockType blockType)
+CSSParserToken::CSSParserToken(CSSParserTokenType type, StringView value, BlockType blockType)
     : m_type(type)
     , m_blockType(blockType)
 {
-    initValueFromCSSParserString(value);
+    initValueFromStringView(value);
     m_id = -1;
 }
 
 CSSParserToken::CSSParserToken(CSSParserTokenType type, double numericValue, NumericValueType numericValueType, NumericSign sign)
     : m_type(type)
     , m_blockType(NotBlock)
     , m_numericValueType(numericValueType)
     , m_numericSign(sign)
     , m_unit(static_cast<unsigned>(CSSPrimitiveValue::UnitType::Number))
     , m_numericValue(numericValue)
 {
     ASSERT(type == NumberToken);
 }
 
 CSSParserToken::CSSParserToken(CSSParserTokenType type, UChar32 start, UChar32 end)
     : m_type(UnicodeRangeToken)
     , m_blockType(NotBlock)
 {
     ASSERT_UNUSED(type, type == UnicodeRangeToken);
     m_unicodeRange.start = start;
     m_unicodeRange.end = end;
 }
 
-CSSParserToken::CSSParserToken(HashTokenType type, CSSParserString value)
+CSSParserToken::CSSParserToken(HashTokenType type, StringView value)
     : m_type(HashToken)
     , m_blockType(NotBlock)
     , m_hashTokenType(type)
 {
-    initValueFromCSSParserString(value);
+    initValueFromStringView(value);
 }
 
-void CSSParserToken::convertToDimensionWithUnit(CSSParserString unit)
+void CSSParserToken::convertToDimensionWithUnit(StringView unit)
 {
     ASSERT(m_type == NumberToken);
     m_type = DimensionToken;
-    initValueFromCSSParserString(unit);
+    initValueFromStringView(unit);
 
     if (unit.is8Bit())
         m_unit = static_cast<unsigned>(lookupCSSPrimitiveValueUnit(unit.characters8(), unit.length()));
     else
         m_unit = static_cast<unsigned>(lookupCSSPrimitiveValueUnit(unit.characters16(), unit.length()));
 }
 
 void CSSParserToken::convertToPercentage()
 {
     ASSERT(m_type == NumberToken);
@@ skipping 56 matching lines @@
     CSSParserTokenType tokenType = type();
     return tokenType == IdentToken
         || tokenType == FunctionToken
         || tokenType == AtKeywordToken
         || tokenType == HashToken
         || tokenType == UrlToken
         || tokenType == DimensionToken
         || tokenType == StringToken;
 }
 
-CSSParserToken CSSParserToken::copyWithUpdatedString(const CSSParserString& parserString) const
+CSSParserToken CSSParserToken::copyWithUpdatedString(const StringView& string) const
 {
     CSSParserToken copy(*this);
-    copy.initValueFromCSSParserString(parserString);
+    copy.initValueFromStringView(string);
     return copy;
 }
 
 bool CSSParserToken::valueDataCharRawEqual(const CSSParserToken& other) const
 {
     if (m_valueLength != other.m_valueLength)
         return false;
 
     if (m_valueDataCharRaw == other.m_valueDataCharRaw && m_valueIs8Bit == other.m_valueIs8Bit)
         return true;
@@ skipping 38 matching lines @@
         return true;
     }
 }
 
 void CSSParserToken::serialize(StringBuilder& builder) const
 {
     // This is currently only used for @supports CSSOM. To keep our implementation
     // simple we handle some of the edge cases incorrectly (see comments below).
     switch (type()) {
     case IdentToken:
-        serializeIdentifier(value(), builder);
+        serializeIdentifier(value().toString(), builder);
         break;
     case FunctionToken:
-        serializeIdentifier(value(), builder);
+        serializeIdentifier(value().toString(), builder);
         return builder.append('(');
     case AtKeywordToken:
         builder.append('@');
-        serializeIdentifier(value(), builder);
+        serializeIdentifier(value().toString(), builder);
         break;
     case HashToken:
         // This will always serialize as a hash-token with 'id' type instead of
         // preserving the type of the input.
         builder.append('#');
-        serializeIdentifier(value(), builder);
+        serializeIdentifier(value().toString(), builder);
         break;
     case UrlToken:
         builder.append("url(");
-        serializeIdentifier(value(), builder);
+        serializeIdentifier(value().toString(), builder);
         return builder.append(")");
     case DelimiterToken:
         if (delimiter() == '\\')
             return builder.append("\\\n");
         return builder.append(delimiter());
     case NumberToken:
         // These won't properly preserve the NumericValueType flag
         return builder.appendNumber(numericValue());
     case PercentageToken:
         builder.appendNumber(numericValue());
         return builder.append('%');
     case DimensionToken:
         // This will incorrectly serialize e.g. 4e3e2 as 4000e2
         builder.appendNumber(numericValue());
-        serializeIdentifier(value(), builder);
+        serializeIdentifier(value().toString(), builder);
         break;
     case UnicodeRangeToken:
         return builder.append(String::format("U+%X-%X", unicodeRangeStart(), unicodeRangeEnd()));
     case StringToken:
-        return serializeString(value(), builder);
+        return serializeString(value().toString(), builder);
 
     case IncludeMatchToken:
         return builder.append("~=");
     case DashMatchToken:
         return builder.append("|=");
     case PrefixMatchToken:
         return builder.append("^=");
     case SuffixMatchToken:
         return builder.append("$=");
     case SubstringMatchToken:
@@ skipping 30 matching lines @@
         return builder.append('}');
 
     case EOFToken:
     case CommentToken:
         ASSERT_NOT_REACHED();
         return;
     }
 }
 
 } // namespace blink