Index: Source/core/css/parser/CSSParser.cpp |
diff --git a/Source/core/css/parser/CSSParser.cpp b/Source/core/css/parser/CSSParser.cpp |
index 88cefa6f0b33bf2cd13a04e9755072e36f695c5a..4a4c095d07b031aa4258522bb1dda9c2aac0a4f5 100644 |
--- a/Source/core/css/parser/CSSParser.cpp |
+++ b/Source/core/css/parser/CSSParser.cpp |
@@ -52,9 +52,9 @@ bool CSSParser::parseValue(MutableStylePropertySet* declaration, CSSPropertyID u |
if (string.isEmpty()) |
return false; |
CSSPropertyID resolvedProperty = resolveCSSPropertyID(unresolvedProperty); |
- RefPtrWillBeRawPtr<CSSValue> value = CSSParserFastPaths::maybeParseValue(resolvedProperty, string, parserMode); |
+ NullableCSSValue value = CSSParserFastPaths::maybeParseValue(resolvedProperty, string, parserMode); |
if (value) |
- return declaration->setProperty(CSSProperty(resolvedProperty, value.release(), important)); |
+ return declaration->setProperty(CSSProperty(resolvedProperty, *value, important)); |
CSSParserContext context(parserMode, 0); |
if (styleSheet) { |
context = styleSheet->parserContext(); |
@@ -68,11 +68,11 @@ bool CSSParser::parseValue(MutableStylePropertySet* declaration, CSSPropertyID u |
return CSSParserImpl::parseValue(declaration, unresolvedProperty, string, important, context); |
} |
-PassRefPtrWillBeRawPtr<CSSValue> CSSParser::parseSingleValue(CSSPropertyID propertyID, const String& string, const CSSParserContext& context) |
+NullableCSSValue CSSParser::parseSingleValue(CSSPropertyID propertyID, const String& string, const CSSParserContext& context) |
{ |
if (string.isEmpty()) |
return nullptr; |
- if (RefPtrWillBeRawPtr<CSSValue> value = CSSParserFastPaths::maybeParseValue(propertyID, string, context.mode())) |
+ if (NullableCSSValue value = CSSParserFastPaths::maybeParseValue(propertyID, string, context.mode())) |
return value; |
RefPtrWillBeRawPtr<MutableStylePropertySet> stylePropertySet = MutableStylePropertySet::create(); |
bool changed = parseValue(stylePropertySet.get(), propertyID, string, false, context); |
@@ -119,11 +119,11 @@ bool CSSParser::parseColor(RGBA32& color, const String& string, bool strict) |
if (!parseValue(stylePropertySet.get(), CSSPropertyColor, string, false, strictCSSParserContext())) |
return false; |
- RefPtrWillBeRawPtr<CSSValue> value = stylePropertySet->getPropertyCSSValue(CSSPropertyColor); |
+ NullableCSSValue value = stylePropertySet->getPropertyCSSValue(CSSPropertyColor); |
if (!value || !value->isPrimitiveValue()) |
return false; |
- CSSPrimitiveValue* primitiveValue = toCSSPrimitiveValue(value.get()); |
+ CSSPrimitiveValue* primitiveValue = toCSSPrimitiveValue(value); |
if (!primitiveValue->isRGBColor()) |
return false; |
@@ -154,7 +154,7 @@ bool CSSParser::parseSystemColor(RGBA32& color, const String& colorString) |
return true; |
} |
-PassRefPtrWillBeRawPtr<CSSValue> CSSParser::parseFontFaceDescriptor(CSSPropertyID propertyID, const String& propertyValue, const CSSParserContext& context) |
+NullableCSSValue CSSParser::parseFontFaceDescriptor(CSSPropertyID propertyID, const String& propertyValue, const CSSParserContext& context) |
{ |
StringBuilder builder; |
builder.appendLiteral("@font-face { "); |