Replace CSSParserString with StringView.

third_party/WebKit/Source/core/css/parser/CSSParserToken.h

 // 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.
 
 #ifndef CSSParserToken_h
 #define CSSParserToken_h
 
 #include "core/CoreExport.h"
 #include "core/css/CSSPrimitiveValue.h"
-#include "core/css/parser/CSSParserString.h"
 #include "wtf/Allocator.h"
+#include "wtf/text/StringView.h"
 
 namespace blink {
 
 enum CSSParserTokenType {
     IdentToken = 0,
     FunctionToken,
     AtKeywordToken,
     HashToken,
     UrlToken,
     BadUrlToken,
@@ skipping 45 matching lines @@
 class CORE_EXPORT CSSParserToken {
     USING_FAST_MALLOC(CSSParserToken);
 public:
     enum BlockType {
         NotBlock,
         BlockStart,
         BlockEnd,
     };
 
     CSSParserToken(CSSParserTokenType, BlockType = NotBlock);
-    CSSParserToken(CSSParserTokenType, CSSParserString, BlockType = NotBlock);
+    CSSParserToken(CSSParserTokenType, StringView, BlockType = NotBlock);
 
     CSSParserToken(CSSParserTokenType, UChar); // for DelimiterToken
     CSSParserToken(CSSParserTokenType, double, NumericValueType, NumericSign); // for NumberToken
     CSSParserToken(CSSParserTokenType, UChar32, UChar32); // for UnicodeRangeToken
 
-    CSSParserToken(HashTokenType, CSSParserString);
+    CSSParserToken(HashTokenType, StringView);
 
     bool operator==(const CSSParserToken& other) const;
     bool operator!=(const CSSParserToken& other) const { return !(*this == other); }
 
     // Converts NumberToken to DimensionToken.
-    void convertToDimensionWithUnit(CSSParserString);
+    void convertToDimensionWithUnit(StringView);
 
     // Converts NumberToken to PercentageToken.
     void convertToPercentage();
 
     CSSParserTokenType type() const { return static_cast<CSSParserTokenType>(m_type); }
-    CSSParserString value() const
+    StringView value() const
     {
-        CSSParserString ret;
-        ret.initRaw(m_valueDataCharRaw, m_valueLength, m_valueIs8Bit);
-        return ret;
+        return StringView(m_valueDataCharRaw, m_valueLength, m_valueIs8Bit);
     }
-    template<unsigned matchLength>
-    bool valueEqualsIgnoringASCIICase(const char (&match)[matchLength]) const { return value().equalIgnoringASCIICase<matchLength>(match); }
+    // TODO(esprehn): Remove this method, callers should just use equalIgnoringASCIICase directly.
+    bool valueEqualsIgnoringASCIICase(StringView match) const { return equalIgnoringASCIICase(value(), match); }
 
     UChar delimiter() const;
     NumericSign numericSign() const;
     NumericValueType numericValueType() const;
     double numericValue() const;
     HashTokenType getHashTokenType() const { ASSERT(m_type == HashToken); return m_hashTokenType; }
     BlockType getBlockType() const { return static_cast<BlockType>(m_blockType); }
     CSSPrimitiveValue::UnitType unitType() const { return static_cast<CSSPrimitiveValue::UnitType>(m_unit); }
     UChar32 unicodeRangeStart() const { ASSERT(m_type == UnicodeRangeToken); return m_unicodeRange.start; }
     UChar32 unicodeRangeEnd() const { ASSERT(m_type == UnicodeRangeToken); return m_unicodeRange.end; }
     CSSValueID id() const;
     CSSValueID functionId() const;
 
     bool hasStringBacking() const;
 
     CSSPropertyID parseAsUnresolvedCSSPropertyID() const;
 
     void serialize(StringBuilder&) const;
 
-    CSSParserToken copyWithUpdatedString(const CSSParserString&) const;
+    CSSParserToken copyWithUpdatedString(const StringView&) const;
 
 private:
-    void initValueFromCSSParserString(const CSSParserString& value)
+    void initValueFromStringView(StringView string)
     {
-        m_valueLength = value.m_length;
-        m_valueIs8Bit = value.m_is8Bit;
-        m_valueDataCharRaw = value.m_data.charactersRaw;
+        m_valueLength = string.length();
+        m_valueIs8Bit = string.is8Bit();
+        m_valueDataCharRaw = string.bytes();
     }
     unsigned m_type : 6; // CSSParserTokenType
     unsigned m_blockType : 2; // BlockType
     unsigned m_numericValueType : 1; // NumericValueType
     unsigned m_numericSign : 2; // NumericSign
     unsigned m_unit : 7; // CSSPrimitiveValue::UnitType
 
     bool valueDataCharRawEqual(const CSSParserToken& other) const;
 
-    // m_value... is an unpacked CSSParserString so that we can pack it
+    // m_value... is an unpacked StringView so that we can pack it
     // tightly with the rest of this object for a smaller object size.
     bool m_valueIs8Bit : 1;
     unsigned m_valueLength;
     const void* m_valueDataCharRaw; // Either LChar* or UChar*.
 
     union {
         UChar m_delimiter;
         HashTokenType m_hashTokenType;
         double m_numericValue;
         mutable int m_id;
 
         struct {
             UChar32 start;
             UChar32 end;
         } m_unicodeRange;
     };
 };
 
 } // namespace blink
 
 namespace WTF {
 template <>
 struct IsTriviallyMoveAssignable<blink::CSSParserToken> {
     STATIC_ONLY(IsTriviallyMoveAssignable);
     static const bool value = true;
 };
 }
 
 #endif // CSSSParserToken_h