CSSPrimitiveValue identifier constructors should return PassRef.

<https://webkit.org/b/123712>

Make CSSPrimitiveValue::createIdentifier() and the corresponding
CSSValuePool helper return PassRef<CSSPrimitiveValue>.

Reviewed by Antti Koivisto.


Canonical link: https://commits.webkit.org/141902@main
git-svn-id: https://svn.webkit.org/repository/webkit/trunk@158549 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Source/WebCore/ChangeLog

@@ -1,3 +1,13 @@
+2013-11-03  Andreas Kling  <akling@apple.com>
+
+        CSSPrimitiveValue identifier constructors should return PassRef.
+        <https://webkit.org/b/123712>
+
+        Make CSSPrimitiveValue::createIdentifier() and the corresponding
+        CSSValuePool helper return PassRef<CSSPrimitiveValue>.
+
+        Reviewed by Antti Koivisto.
+
 2013-11-03  Andreas Kling  <akling@apple.com>
 
         Use RenderChildIterator in two more loops.

Source/WebCore/css/CSSPrimitiveValue.h

@@ -211,8 +211,8 @@ class CSSPrimitiveValue : public CSSValue {
     bool isValueID() const { return m_primitiveUnitType == CSS_VALUE_ID; }
     bool isFlex() const { return primitiveType() == CSS_FR; }
 
-    static PassRefPtr<CSSPrimitiveValue> createIdentifier(CSSValueID valueID) { return adoptRef(new CSSPrimitiveValue(valueID)); }
-    static PassRefPtr<CSSPrimitiveValue> createIdentifier(CSSPropertyID propertyID) { return adoptRef(new CSSPrimitiveValue(propertyID)); }
+    static PassRef<CSSPrimitiveValue> createIdentifier(CSSValueID valueID) { return adoptRef(*new CSSPrimitiveValue(valueID)); }
+    static PassRef<CSSPrimitiveValue> createIdentifier(CSSPropertyID propertyID) { return adoptRef(*new CSSPrimitiveValue(propertyID)); }
     static PassRefPtr<CSSPrimitiveValue> createParserOperator(int parserOperator) { return adoptRef(new CSSPrimitiveValue(parserOperator)); }
 
     static PassRefPtr<CSSPrimitiveValue> createColor(unsigned rgbValue) { return adoptRef(new CSSPrimitiveValue(rgbValue)); }

Source/WebCore/css/CSSValuePool.cpp

@@ -49,18 +49,18 @@ CSSValuePool::CSSValuePool()
 {
 }
 
-PassRefPtr<CSSPrimitiveValue> CSSValuePool::createIdentifierValue(CSSValueID ident)
+PassRef<CSSPrimitiveValue> CSSValuePool::createIdentifierValue(CSSValueID ident)
 {
     if (!ident)
         return CSSPrimitiveValue::createIdentifier(ident);
 
     RELEASE_ASSERT(ident > 0 && ident < numCSSValueKeywords);
     if (!m_identifierValueCache[ident])
         m_identifierValueCache[ident] = CSSPrimitiveValue::createIdentifier(ident);
-    return m_identifierValueCache[ident];
+    return *m_identifierValueCache[ident];
 }
 
-PassRefPtr<CSSPrimitiveValue> CSSValuePool::createIdentifierValue(CSSPropertyID ident)
+PassRef<CSSPrimitiveValue> CSSValuePool::createIdentifierValue(CSSPropertyID ident)
 {
     return CSSPrimitiveValue::createIdentifier(ident);
 }

Source/WebCore/css/CSSValuePool.h

@@ -47,8 +47,8 @@ class CSSValuePool {
     PassRef<CSSInheritedValue> createInheritedValue() { return m_inheritedValue.get(); }
     PassRef<CSSInitialValue> createImplicitInitialValue() { return m_implicitInitialValue.get(); }
     PassRef<CSSInitialValue> createExplicitInitialValue() { return m_explicitInitialValue.get(); }
-    PassRefPtr<CSSPrimitiveValue> createIdentifierValue(CSSValueID identifier);
-    PassRefPtr<CSSPrimitiveValue> createIdentifierValue(CSSPropertyID identifier);
+    PassRef<CSSPrimitiveValue> createIdentifierValue(CSSValueID identifier);
+    PassRef<CSSPrimitiveValue> createIdentifierValue(CSSPropertyID identifier);
     PassRefPtr<CSSPrimitiveValue> createColorValue(unsigned rgbValue);
     PassRefPtr<CSSPrimitiveValue> createValue(double value, CSSPrimitiveValue::UnitTypes);
     PassRefPtr<CSSPrimitiveValue> createValue(const String& value, CSSPrimitiveValue::UnitTypes type) { return CSSPrimitiveValue::create(value, type); }