Oilpan: Unship Oilpan from CSSValues

Source/core/css/CSSPrimitiveValue.h

Index: Source/core/css/CSSPrimitiveValue.h
diff --git a/Source/core/css/CSSPrimitiveValue.h b/Source/core/css/CSSPrimitiveValue.h
index 47d1afbb4626e1cc641dd24cc9183d615deaf045..b758699bca5c3fe38c00c3816e12960dbfa8eeed 100644
--- a/Source/core/css/CSSPrimitiveValue.h
+++ b/Source/core/css/CSSPrimitiveValue.h
@@ -203,48 +203,52 @@ public:
     bool isValueID() const { return type() == UnitType::ValueID; }
     bool colorIsDerivedFromElement() const;
 
-    static PassRefPtrWillBeRawPtr<CSSPrimitiveValue> createIdentifier(CSSValueID valueID)
+    static PassRefPtr<CSSPrimitiveValue> createIdentifier(CSSValueID valueID)
     {
-        return adoptRefWillBeNoop(new CSSPrimitiveValue(valueID));
+        return adoptRef(new CSSPrimitiveValue(valueID));
     }
-    static PassRefPtrWillBeRawPtr<CSSPrimitiveValue> createIdentifier(CSSPropertyID propertyID)
+    static PassRefPtr<CSSPrimitiveValue> createIdentifier(CSSPropertyID propertyID)
     {
-        return adoptRefWillBeNoop(new CSSPrimitiveValue(propertyID));
+        return adoptRef(new CSSPrimitiveValue(propertyID));
     }
-    static PassRefPtrWillBeRawPtr<CSSPrimitiveValue> createColor(RGBA32 rgbValue)
+    static PassRefPtr<CSSPrimitiveValue> createColor(RGBA32 rgbValue)
     {
-        return adoptRefWillBeNoop(new CSSPrimitiveValue(rgbValue));
+        return adoptRef(new CSSPrimitiveValue(rgbValue));
     }
-    static PassRefPtrWillBeRawPtr<CSSPrimitiveValue> create(double value, UnitType type)
+    static PassRefPtr<CSSPrimitiveValue> create(double value, UnitType type)
     {
-        return adoptRefWillBeNoop(new CSSPrimitiveValue(value, type));
+        return adoptRef(new CSSPrimitiveValue(value, type));
     }
-    static PassRefPtrWillBeRawPtr<CSSPrimitiveValue> create(const String& value, UnitType type)
+    static PassRefPtr<CSSPrimitiveValue> create(const String& value, UnitType type)
     {
-        return adoptRefWillBeNoop(new CSSPrimitiveValue(value, type));
+        return adoptRef(new CSSPrimitiveValue(value, type));
     }
-    static PassRefPtrWillBeRawPtr<CSSPrimitiveValue> create(const Length& value, float zoom)
+    static PassRefPtr<CSSPrimitiveValue> create(const Length& value, float zoom)
     {
-        return adoptRefWillBeNoop(new CSSPrimitiveValue(value, zoom));
+        return adoptRef(new CSSPrimitiveValue(value, zoom));
     }
-    static PassRefPtrWillBeRawPtr<CSSPrimitiveValue> create(const LengthSize& value, const ComputedStyle& style)
+    static PassRefPtr<CSSPrimitiveValue> create(const LengthSize& value, const ComputedStyle& style)
     {
-        return adoptRefWillBeNoop(new CSSPrimitiveValue(value, style));
+        return adoptRef(new CSSPrimitiveValue(value, style));
     }
-    template<typename T> static PassRefPtrWillBeRawPtr<CSSPrimitiveValue> create(T value)
+    template<typename T> static PassRefPtr<CSSPrimitiveValue> create(T value)
     {
-        return adoptRefWillBeNoop(new CSSPrimitiveValue(value));
+        return adoptRef(new CSSPrimitiveValue(value));
+    }
+    template<typename T> static PassRefPtr<CSSPrimitiveValue> create(PassRefPtr<T> value)
+    {
+        return adoptRef(new CSSPrimitiveValue(value.get()));
     }
 
     // This value is used to handle quirky margins in reflow roots (body, td, and th) like WinIE.
     // The basic idea is that a stylesheet can use the value __qem (for quirky em) instead of em.
     // When the quirky value is used, if you're in quirks mode, the margin will collapse away
     // inside a table cell.
-    static PassRefPtrWillBeRawPtr<CSSPrimitiveValue> createAllowingMarginQuirk(double value, UnitType type)
+    static PassRefPtr<CSSPrimitiveValue> createAllowingMarginQuirk(double value, UnitType type)
     {
         CSSPrimitiveValue* quirkValue = new CSSPrimitiveValue(value, type);
         quirkValue->m_isQuirkValue = true;
-        return adoptRefWillBeNoop(quirkValue);
+        return adoptRef(quirkValue);
     }
 
     ~CSSPrimitiveValue();
@@ -291,8 +295,6 @@ public:
 
     bool equals(const CSSPrimitiveValue&) const;
 
-    DECLARE_TRACE_AFTER_DISPATCH();
-
     static UnitType canonicalUnitTypeForCategory(UnitCategory);
     static double conversionToCanonicalUnitsScaleFactor(UnitType);
 
@@ -329,11 +331,11 @@ private:
     void init(UnitType);
     void init(const Length&);
     void init(const LengthSize&, const ComputedStyle&);
-    void init(PassRefPtrWillBeRawPtr<Rect>);
-    void init(PassRefPtrWillBeRawPtr<Pair>);
-    void init(PassRefPtrWillBeRawPtr<Quad>);
-    void init(PassRefPtrWillBeRawPtr<CSSBasicShape>);
-    void init(PassRefPtrWillBeRawPtr<CSSCalcValue>);
+    void init(PassRefPtr<Rect>);
+    void init(PassRefPtr<Pair>);
+    void init(PassRefPtr<Quad>);
+    void init(PassRefPtr<CSSBasicShape>);
+    void init(PassRefPtr<CSSCalcValue>);
 
     double computeLengthDouble(const CSSToLengthConversionData&) const;