Oilpan: Unship Oilpan from CSSValues

Source/core/css/CSSPrimitiveValue.h

 /*
  * (C) 1999-2003 Lars Knoll (knoll@kde.org)
  * Copyright (C) 2004, 2005, 2006, 2008 Apple Inc. All rights reserved.
  * Copyright (C) 2007 Alexey Proskuryakov <ap@webkit.org>
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
  * License as published by the Free Software Foundation; either
  * version 2 of the License, or (at your option) any later version.
  *
@@ skipping 185 matching lines @@
     bool isCalculatedPercentageWithNumber() const { return typeWithCalcResolved() == UnitType::CalcPercentageWithNumber; }
     bool isCalculatedPercentageWithLength() const { return typeWithCalcResolved() == UnitType::CalcPercentageWithLength; }
     static bool isDotsPerInch(UnitType type) { return type == UnitType::DotsPerInch; }
     static bool isDotsPerPixel(UnitType type) { return type == UnitType::DotsPerPixel; }
     static bool isDotsPerCentimeter(UnitType type) { return type == UnitType::DotsPerCentimeter; }
     static bool isResolution(UnitType type) { return type >= UnitType::DotsPerPixel && type <= UnitType::DotsPerCentimeter; }
     bool isFlex() const { return typeWithCalcResolved() == UnitType::Fraction; }
     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();
 
     void cleanup();
 
     UnitType typeWithCalcResolved() const;
 
     double computeDegrees() const;
     double computeSeconds() const;
@@ skipping 26 matching lines @@
 
     template<typename T> inline operator T() const; // Defined in CSSPrimitiveValueMappings.h
 
     static const char* unitTypeToString(UnitType);
     String customCSSText() const;
 
     bool isQuirkValue() const { return m_isQuirkValue; }
 
     bool equals(const CSSPrimitiveValue&) const;
 
-    DECLARE_TRACE_AFTER_DISPATCH();
-
     static UnitType canonicalUnitTypeForCategory(UnitCategory);
     static double conversionToCanonicalUnitsScaleFactor(UnitType);
 
     // Returns true and populates lengthUnitType, if unitType is a length unit. Otherwise, returns false.
     static bool unitTypeToLengthUnitType(UnitType, LengthUnitType&);
     static UnitType lengthUnitTypeToUnitType(LengthUnitType);
 
 private:
     CSSPrimitiveValue(CSSValueID);
     CSSPrimitiveValue(CSSPropertyID);
@@ skipping 16 matching lines @@
         init(val);
     }
 
     static void create(int); // compile-time guard
     static void create(unsigned); // compile-time guard
     template<typename T> operator T*(); // compile-time guard
 
     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;
 
     inline UnitType type() const { return static_cast<UnitType>(m_primitiveUnitType); }
 
     union {
         CSSPropertyID propertyID;
         CSSValueID valueID;
         double num;
         StringImpl* string;
         RGBA32 rgbcolor;
         // FIXME: oilpan: Should be members, but no support for members in unions. Just trace the raw ptr for now.
         CSSBasicShape* shape;
         CSSCalcValue* calc;
         Pair* pair;
         Rect* rect;
         Quad* quad;
     } m_value;
 };
 
 typedef CSSPrimitiveValue::CSSLengthArray CSSLengthArray;
 typedef CSSPrimitiveValue::CSSLengthTypeArray CSSLengthTypeArray;
 
 DEFINE_CSS_VALUE_TYPE_CASTS(CSSPrimitiveValue, isPrimitiveValue());
 
 } // namespace blink
 
 #endif // CSSPrimitiveValue_h