| Index: Source/core/css/parser/CSSParserFastPaths.cpp
|
| diff --git a/Source/core/css/parser/CSSParserFastPaths.cpp b/Source/core/css/parser/CSSParserFastPaths.cpp
|
| index 467569ac37dd18d763c688a378f873c0c61b799a..66fc96f049b5a0b3a488c5b14d9761da490272f8 100644
|
| --- a/Source/core/css/parser/CSSParserFastPaths.cpp
|
| +++ b/Source/core/css/parser/CSSParserFastPaths.cpp
|
| @@ -85,7 +85,7 @@ static inline bool parseSimpleLength(const CharacterType* characters, unsigned l
|
| return ok;
|
| }
|
|
|
| -static PassRefPtrWillBeRawPtr<CSSValue> parseSimpleLengthValue(CSSPropertyID propertyId, const String& string, CSSParserMode cssParserMode)
|
| +static PassRefPtr<CSSValue> parseSimpleLengthValue(CSSPropertyID propertyId, const String& string, CSSParserMode cssParserMode)
|
| {
|
| ASSERT(!string.isEmpty());
|
| bool acceptsNegativeNumbers = false;
|
| @@ -433,7 +433,7 @@ static bool fastParseColorInternal(RGBA32& rgb, const CharacterType* characters,
|
| return false;
|
| }
|
|
|
| -PassRefPtrWillBeRawPtr<CSSValue> CSSParserFastPaths::parseColor(const String& string, CSSParserMode parserMode)
|
| +PassRefPtr<CSSValue> CSSParserFastPaths::parseColor(const String& string, CSSParserMode parserMode)
|
| {
|
| ASSERT(!string.isEmpty());
|
| CSSParserString cssString;
|
| @@ -805,7 +805,7 @@ bool CSSParserFastPaths::isKeywordPropertyID(CSSPropertyID propertyId)
|
| }
|
| }
|
|
|
| -static PassRefPtrWillBeRawPtr<CSSValue> parseKeywordValue(CSSPropertyID propertyId, const String& string)
|
| +static PassRefPtr<CSSValue> parseKeywordValue(CSSPropertyID propertyId, const String& string)
|
| {
|
| ASSERT(!string.isEmpty());
|
|
|
| @@ -877,7 +877,7 @@ static bool parseTransformNumberArguments(CharType*& pos, CharType* end, unsigne
|
| }
|
|
|
| template <typename CharType>
|
| -static PassRefPtrWillBeRawPtr<CSSFunctionValue> parseSimpleTransformValue(CharType*& pos, CharType* end)
|
| +static PassRefPtr<CSSFunctionValue> parseSimpleTransformValue(CharType*& pos, CharType* end)
|
| {
|
| static const int shortestValidTransformStringLength = 12;
|
|
|
| @@ -917,7 +917,7 @@ static PassRefPtrWillBeRawPtr<CSSFunctionValue> parseSimpleTransformValue(CharTy
|
| return nullptr;
|
| }
|
| pos += argumentStart;
|
| - RefPtrWillBeRawPtr<CSSFunctionValue> transformValue = CSSFunctionValue::create(transformType);
|
| + RefPtr<CSSFunctionValue> transformValue = CSSFunctionValue::create(transformType);
|
| if (!parseTransformTranslateArguments(pos, end, expectedArgumentCount, transformValue.get()))
|
| return nullptr;
|
| return transformValue.release();
|
| @@ -935,7 +935,7 @@ static PassRefPtrWillBeRawPtr<CSSFunctionValue> parseSimpleTransformValue(CharTy
|
|
|
| if (isMatrix3d) {
|
| pos += 9;
|
| - RefPtrWillBeRawPtr<CSSFunctionValue> transformValue = CSSFunctionValue::create(CSSValueMatrix3d);
|
| + RefPtr<CSSFunctionValue> transformValue = CSSFunctionValue::create(CSSValueMatrix3d);
|
| if (!parseTransformNumberArguments(pos, end, 16, transformValue.get()))
|
| return nullptr;
|
| return transformValue.release();
|
| @@ -952,7 +952,7 @@ static PassRefPtrWillBeRawPtr<CSSFunctionValue> parseSimpleTransformValue(CharTy
|
|
|
| if (isScale3d) {
|
| pos += 8;
|
| - RefPtrWillBeRawPtr<CSSFunctionValue> transformValue = CSSFunctionValue::create(CSSValueScale3d);
|
| + RefPtr<CSSFunctionValue> transformValue = CSSFunctionValue::create(CSSValueScale3d);
|
| if (!parseTransformNumberArguments(pos, end, 3, transformValue.get()))
|
| return nullptr;
|
| return transformValue.release();
|
| @@ -962,13 +962,13 @@ static PassRefPtrWillBeRawPtr<CSSFunctionValue> parseSimpleTransformValue(CharTy
|
| }
|
|
|
| template <typename CharType>
|
| -static PassRefPtrWillBeRawPtr<CSSValueList> parseSimpleTransformList(CharType*& pos, CharType* end)
|
| +static PassRefPtr<CSSValueList> parseSimpleTransformList(CharType*& pos, CharType* end)
|
| {
|
| - RefPtrWillBeRawPtr<CSSValueList> transformList = nullptr;
|
| + RefPtr<CSSValueList> transformList = nullptr;
|
| while (pos < end) {
|
| while (pos < end && isCSSSpace(*pos))
|
| ++pos;
|
| - RefPtrWillBeRawPtr<CSSFunctionValue> transformValue = parseSimpleTransformValue(pos, end);
|
| + RefPtr<CSSFunctionValue> transformValue = parseSimpleTransformValue(pos, end);
|
| if (!transformValue)
|
| return nullptr;
|
| if (!transformList)
|
| @@ -982,7 +982,7 @@ static PassRefPtrWillBeRawPtr<CSSValueList> parseSimpleTransformList(CharType*&
|
| return transformList.release();
|
| }
|
|
|
| -static PassRefPtrWillBeRawPtr<CSSValue> parseSimpleTransform(CSSPropertyID propertyID, const String& string)
|
| +static PassRefPtr<CSSValue> parseSimpleTransform(CSSPropertyID propertyID, const String& string)
|
| {
|
| ASSERT(!string.isEmpty());
|
|
|
| @@ -998,15 +998,15 @@ static PassRefPtrWillBeRawPtr<CSSValue> parseSimpleTransform(CSSPropertyID prope
|
| return parseSimpleTransformList(pos, end);
|
| }
|
|
|
| -PassRefPtrWillBeRawPtr<CSSValue> CSSParserFastPaths::maybeParseValue(CSSPropertyID propertyID, const String& string, CSSParserMode parserMode)
|
| +PassRefPtr<CSSValue> CSSParserFastPaths::maybeParseValue(CSSPropertyID propertyID, const String& string, CSSParserMode parserMode)
|
| {
|
| - if (RefPtrWillBeRawPtr<CSSValue> length = parseSimpleLengthValue(propertyID, string, parserMode))
|
| + if (RefPtr<CSSValue> length = parseSimpleLengthValue(propertyID, string, parserMode))
|
| return length.release();
|
| if (isColorPropertyID(propertyID))
|
| return parseColor(string, parserMode);
|
| - if (RefPtrWillBeRawPtr<CSSValue> keyword = parseKeywordValue(propertyID, string))
|
| + if (RefPtr<CSSValue> keyword = parseKeywordValue(propertyID, string))
|
| return keyword.release();
|
| - if (RefPtrWillBeRawPtr<CSSValue> transform = parseSimpleTransform(propertyID, string))
|
| + if (RefPtr<CSSValue> transform = parseSimpleTransform(propertyID, string))
|
| return transform.release();
|
| return nullptr;
|
| }
|
|
|