Index: third_party/WebKit/Source/core/css/parser/CSSParserToken.cpp |
diff --git a/third_party/WebKit/Source/core/css/parser/CSSParserToken.cpp b/third_party/WebKit/Source/core/css/parser/CSSParserToken.cpp |
index 7f1cde985969b1d5a87b2047ae27872dfc08f878..308dc302f4b17af5da5328068c42f990a5fbe28f 100644 |
--- a/third_party/WebKit/Source/core/css/parser/CSSParserToken.cpp |
+++ b/third_party/WebKit/Source/core/css/parser/CSSParserToken.cpp |
@@ -28,11 +28,11 @@ CSSParserToken::CSSParserToken(CSSParserTokenType type, UChar 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; |
} |
@@ -56,19 +56,19 @@ CSSParserToken::CSSParserToken(CSSParserTokenType type, UChar32 start, UChar32 e |
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())); |
@@ -145,10 +145,10 @@ bool CSSParserToken::hasStringBacking() const |
|| 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; |
} |
@@ -207,24 +207,24 @@ void CSSParserToken::serialize(StringBuilder& builder) const |
// 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() == '\\') |
@@ -239,12 +239,12 @@ void CSSParserToken::serialize(StringBuilder& builder) const |
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("~="); |