CSSValue Immediates: Change CSSValue to an object instead of a pointer

Source/core/css/parser/CSSParser.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 "config.h"
 #include "core/css/parser/CSSParser.h"
 
 #include "core/css/CSSKeyframeRule.h"
 #include "core/css/StyleColor.h"
 #include "core/css/StylePropertySet.h"
@@ skipping 38 matching lines @@
 void CSSParser::parseSheetForInspector(const CSSParserContext& context, StyleSheetContents* styleSheet, const String& text, CSSParserObserver& observer)
 {
     return CSSParserImpl::parseStyleSheetForInspector(text, context, styleSheet, observer);
 }
 
 bool CSSParser::parseValue(MutableStylePropertySet* declaration, CSSPropertyID unresolvedProperty, const String& string, bool important, CSSParserMode parserMode, StyleSheetContents* styleSheet)
 {
     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();
         context.setMode(parserMode);
     }
     return parseValue(declaration, unresolvedProperty, string, important, context);
 }
 
 bool CSSParser::parseValue(MutableStylePropertySet* declaration, CSSPropertyID unresolvedProperty, const String& string, bool important, const CSSParserContext& context)
 {
     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);
     ASSERT_UNUSED(changed, changed == stylePropertySet->hasProperty(propertyID));
     return stylePropertySet->getPropertyCSSValue(propertyID);
 }
 
 PassRefPtrWillBeRawPtr<ImmutableStylePropertySet> CSSParser::parseInlineStyleDeclaration(const String& styleString, Element* element)
 {
     return CSSParserImpl::parseInlineStyleDeclaration(styleString, element);
@@ skipping 23 matching lines @@
         return false;
 
     // The regular color parsers don't resolve all named colors, so explicitly
     // handle these first.
     Color namedColor;
     if (namedColor.setNamedColor(string)) {
         color = namedColor.rgb();
         return true;
     }
 
-    RefPtrWillBeRawPtr<CSSValue> value = CSSParserFastPaths::parseColor(string, !strict);
+    NullableCSSValue value = CSSParserFastPaths::parseColor(string, !strict);
     // TODO(timloh): Why is this always strict mode?
     if (!value)
         value = parseSingleValue(CSSPropertyColor, string, strictCSSParserContext());
 
     if (!value || !value->isPrimitiveValue())
         return false;
 
-    CSSPrimitiveValue* primitiveValue = toCSSPrimitiveValue(value.get());
+    CSSPrimitiveValue* primitiveValue = toCSSPrimitiveValue(value);
     if (!primitiveValue->isRGBColor())
         return false;
 
     color = primitiveValue->getRGBA32Value();
     return true;
 }
 
 StyleColor CSSParser::colorFromRGBColorString(const String& string)
 {
     // FIXME: Rework css parser so it is more SVG aware.
@@ skipping 10 matching lines @@
     cssColor.init(colorString);
     CSSValueID id = cssValueKeywordID(cssColor);
     if (!CSSPropertyParser::isSystemColor(id))
         return false;
 
     Color parsedColor = LayoutTheme::theme().systemColor(id);
     color = parsedColor.rgb();
     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 { ");
     builder.append(getPropertyNameString(propertyID));
     builder.appendLiteral(" : ");
     builder.append(propertyValue);
     builder.appendLiteral("; }");
     RefPtrWillBeRawPtr<StyleRuleBase> rule = parseRule(context, nullptr, builder.toString());
     if (!rule || !rule->isFontFaceRule())
         return nullptr;
     return toStyleRuleFontFace(rule.get())->properties().getPropertyCSSValue(propertyID);
 }
 
 } // namespace blink