Oilpan: Unship CSSValues and AnimatableValues

Source/core/css/CSSGradientValue.h

 /*
  * Copyright (C) 2008 Apple Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
@@ skipping 37 matching lines @@
 
 // This struct is stack allocated and allocated as part of vectors.
 // When allocated on the stack its members are found by conservative
 // stack scanning. When allocated as part of Vectors in heap-allocated
 // objects its members are visited via the containing object's
 // (CSSGradientValue) traceAfterDispatch method.
 struct CSSGradientColorStop {
     ALLOW_ONLY_INLINE_ALLOCATION();
 public:
     CSSGradientColorStop() : m_colorIsDerivedFromElement(false) { }
-    RefPtrWillBeMember<CSSPrimitiveValue> m_position; // percentage or length
-    RefPtrWillBeMember<CSSPrimitiveValue> m_color;
+    RefPtr<CSSPrimitiveValue> m_position; // percentage or length
+    RefPtr<CSSPrimitiveValue> m_color;
     bool m_colorIsDerivedFromElement;
     bool operator==(const CSSGradientColorStop& other) const
     {
         return compareCSSValuePtr(m_color, other.m_color)
             && compareCSSValuePtr(m_position, other.m_position);
     }
     bool isHint() const
     {
         ASSERT(m_color || m_position);
         return !m_color;
     }
-
-    DECLARE_TRACE();
 };
 
 } // namespace blink
 
 
 // We have to declare the VectorTraits specialization before CSSGradientValue
 // declares its inline capacity vector below.
 WTF_ALLOW_MOVE_AND_INIT_WITH_MEM_FUNCTIONS(blink::CSSGradientColorStop);
 
 namespace blink {
 
 class CSSGradientValue : public CSSImageGeneratorValue {
 public:
     PassRefPtr<Image> image(LayoutObject*, const IntSize&);
 
-    void setFirstX(PassRefPtrWillBeRawPtr<CSSPrimitiveValue> val) { m_firstX = val; }
-    void setFirstY(PassRefPtrWillBeRawPtr<CSSPrimitiveValue> val) { m_firstY = val; }
-    void setSecondX(PassRefPtrWillBeRawPtr<CSSPrimitiveValue> val) { m_secondX = val; }
-    void setSecondY(PassRefPtrWillBeRawPtr<CSSPrimitiveValue> val) { m_secondY = val; }
+    void setFirstX(PassRefPtr<CSSPrimitiveValue> val) { m_firstX = val; }
+    void setFirstY(PassRefPtr<CSSPrimitiveValue> val) { m_firstY = val; }
+    void setSecondX(PassRefPtr<CSSPrimitiveValue> val) { m_secondX = val; }
+    void setSecondY(PassRefPtr<CSSPrimitiveValue> val) { m_secondY = val; }
 
     void addStop(const CSSGradientColorStop& stop) { m_stops.append(stop); }
 
     unsigned stopCount() const { return m_stops.size(); }
 
     void appendCSSTextForDeprecatedColorStops(StringBuilder&) const;
 
     bool isRepeating() const { return m_repeating; }
 
     CSSGradientType gradientType() const { return m_gradientType; }
 
     bool isFixedSize() const { return false; }
     IntSize fixedSize(const LayoutObject*) const { return IntSize(); }
 
     bool isPending() const { return false; }
     bool knownToBeOpaque(const LayoutObject*) const;
 
     void loadSubimages(Document*) { }
 
-    DECLARE_TRACE_AFTER_DISPATCH();
-
 protected:
     CSSGradientValue(ClassType classType, CSSGradientRepeat repeat, CSSGradientType gradientType)
         : CSSImageGeneratorValue(classType)
         , m_stopsSorted(false)
         , m_gradientType(gradientType)
         , m_repeating(repeat == Repeating)
     {
     }
 
     CSSGradientValue(const CSSGradientValue& other, ClassType classType, CSSGradientType gradientType)
@@ skipping 11 matching lines @@
 
     void addStops(Gradient*, const CSSToLengthConversionData&, const LayoutObject&);
     void addDeprecatedStops(Gradient*, const LayoutObject&);
 
     // Resolve points/radii to front end values.
     FloatPoint computeEndPoint(CSSPrimitiveValue*, CSSPrimitiveValue*, const CSSToLengthConversionData&, const IntSize&);
 
     bool isCacheable() const;
 
     // Points. Some of these may be null.
-    RefPtrWillBeMember<CSSPrimitiveValue> m_firstX;
-    RefPtrWillBeMember<CSSPrimitiveValue> m_firstY;
+    RefPtr<CSSPrimitiveValue> m_firstX;
+    RefPtr<CSSPrimitiveValue> m_firstY;
 
-    RefPtrWillBeMember<CSSPrimitiveValue> m_secondX;
-    RefPtrWillBeMember<CSSPrimitiveValue> m_secondY;
+    RefPtr<CSSPrimitiveValue> m_secondX;
+    RefPtr<CSSPrimitiveValue> m_secondY;
 
     // Stops
-    WillBeHeapVector<CSSGradientColorStop, 2> m_stops;
+    Vector<CSSGradientColorStop, 2> m_stops;
     bool m_stopsSorted;
     CSSGradientType m_gradientType;
     bool m_repeating;
 };
 
 DEFINE_CSS_VALUE_TYPE_CASTS(CSSGradientValue, isGradientValue());
 
 class CSSLinearGradientValue final : public CSSGradientValue {
 public:
 
-    static PassRefPtrWillBeRawPtr<CSSLinearGradientValue> create(CSSGradientRepeat repeat, CSSGradientType gradientType = CSSLinearGradient)
+    static PassRefPtr<CSSLinearGradientValue> create(CSSGradientRepeat repeat, CSSGradientType gradientType = CSSLinearGradient)
     {
-        return adoptRefWillBeNoop(new CSSLinearGradientValue(repeat, gradientType));
+        return adoptRef(new CSSLinearGradientValue(repeat, gradientType));
     }
 
-    void setAngle(PassRefPtrWillBeRawPtr<CSSPrimitiveValue> val) { m_angle = val; }
+    void setAngle(PassRefPtr<CSSPrimitiveValue> val) { m_angle = val; }
 
     String customCSSText() const;
 
     // Create the gradient for a given size.
     PassRefPtr<Gradient> createGradient(const CSSToLengthConversionData&, const IntSize&, const LayoutObject&);
 
-    PassRefPtrWillBeRawPtr<CSSLinearGradientValue> clone() const
+    PassRefPtr<CSSLinearGradientValue> clone() const
     {
-        return adoptRefWillBeNoop(new CSSLinearGradientValue(*this));
+        return adoptRef(new CSSLinearGradientValue(*this));
     }
 
     bool equals(const CSSLinearGradientValue&) const;
 
-    DECLARE_TRACE_AFTER_DISPATCH();
-
 private:
     CSSLinearGradientValue(CSSGradientRepeat repeat, CSSGradientType gradientType = CSSLinearGradient)
         : CSSGradientValue(LinearGradientClass, repeat, gradientType)
     {
     }
 
     explicit CSSLinearGradientValue(const CSSLinearGradientValue& other)
         : CSSGradientValue(other, LinearGradientClass, other.gradientType())
         , m_angle(other.m_angle)
     {
     }
 
-    RefPtrWillBeMember<CSSPrimitiveValue> m_angle; // may be null.
+    RefPtr<CSSPrimitiveValue> m_angle; // may be null.
 };
 
 DEFINE_CSS_VALUE_TYPE_CASTS(CSSLinearGradientValue, isLinearGradientValue());
 
 class CSSRadialGradientValue final : public CSSGradientValue {
 public:
-    static PassRefPtrWillBeRawPtr<CSSRadialGradientValue> create(CSSGradientRepeat repeat, CSSGradientType gradientType = CSSRadialGradient)
+    static PassRefPtr<CSSRadialGradientValue> create(CSSGradientRepeat repeat, CSSGradientType gradientType = CSSRadialGradient)
     {
-        return adoptRefWillBeNoop(new CSSRadialGradientValue(repeat, gradientType));
+        return adoptRef(new CSSRadialGradientValue(repeat, gradientType));
     }
 
-    PassRefPtrWillBeRawPtr<CSSRadialGradientValue> clone() const
+    PassRefPtr<CSSRadialGradientValue> clone() const
     {
-        return adoptRefWillBeNoop(new CSSRadialGradientValue(*this));
+        return adoptRef(new CSSRadialGradientValue(*this));
     }
 
     String customCSSText() const;
 
-    void setFirstRadius(PassRefPtrWillBeRawPtr<CSSPrimitiveValue> val) { m_firstRadius = val; }
-    void setSecondRadius(PassRefPtrWillBeRawPtr<CSSPrimitiveValue> val) { m_secondRadius = val; }
+    void setFirstRadius(PassRefPtr<CSSPrimitiveValue> val) { m_firstRadius = val; }
+    void setSecondRadius(PassRefPtr<CSSPrimitiveValue> val) { m_secondRadius = val; }
 
-    void setShape(PassRefPtrWillBeRawPtr<CSSPrimitiveValue> val) { m_shape = val; }
-    void setSizingBehavior(PassRefPtrWillBeRawPtr<CSSPrimitiveValue> val) { m_sizingBehavior = val; }
+    void setShape(PassRefPtr<CSSPrimitiveValue> val) { m_shape = val; }
+    void setSizingBehavior(PassRefPtr<CSSPrimitiveValue> val) { m_sizingBehavior = val; }
 
-    void setEndHorizontalSize(PassRefPtrWillBeRawPtr<CSSPrimitiveValue> val) { m_endHorizontalSize = val; }
-    void setEndVerticalSize(PassRefPtrWillBeRawPtr<CSSPrimitiveValue> val) { m_endVerticalSize = val; }
+    void setEndHorizontalSize(PassRefPtr<CSSPrimitiveValue> val) { m_endHorizontalSize = val; }
+    void setEndVerticalSize(PassRefPtr<CSSPrimitiveValue> val) { m_endVerticalSize = val; }
 
     // Create the gradient for a given size.
     PassRefPtr<Gradient> createGradient(const CSSToLengthConversionData&, const IntSize&, const LayoutObject&);
 
     bool equals(const CSSRadialGradientValue&) const;
 
-    DECLARE_TRACE_AFTER_DISPATCH();
-
 private:
     CSSRadialGradientValue(CSSGradientRepeat repeat, CSSGradientType gradientType = CSSRadialGradient)
         : CSSGradientValue(RadialGradientClass, repeat, gradientType)
     {
     }
 
     explicit CSSRadialGradientValue(const CSSRadialGradientValue& other)
         : CSSGradientValue(other, RadialGradientClass, other.gradientType())
         , m_firstRadius(other.m_firstRadius)
         , m_secondRadius(other.m_secondRadius)
         , m_shape(other.m_shape)
         , m_sizingBehavior(other.m_sizingBehavior)
         , m_endHorizontalSize(other.m_endHorizontalSize)
         , m_endVerticalSize(other.m_endVerticalSize)
     {
     }
 
 
     // Resolve points/radii to front end values.
     float resolveRadius(CSSPrimitiveValue*, const CSSToLengthConversionData&, float* widthOrHeight = 0);
 
     // These may be null for non-deprecated gradients.
-    RefPtrWillBeMember<CSSPrimitiveValue> m_firstRadius;
-    RefPtrWillBeMember<CSSPrimitiveValue> m_secondRadius;
+    RefPtr<CSSPrimitiveValue> m_firstRadius;
+    RefPtr<CSSPrimitiveValue> m_secondRadius;
 
     // The below are only used for non-deprecated gradients. Any of them may be null.
-    RefPtrWillBeMember<CSSPrimitiveValue> m_shape;
-    RefPtrWillBeMember<CSSPrimitiveValue> m_sizingBehavior;
+    RefPtr<CSSPrimitiveValue> m_shape;
+    RefPtr<CSSPrimitiveValue> m_sizingBehavior;
 
-    RefPtrWillBeMember<CSSPrimitiveValue> m_endHorizontalSize;
-    RefPtrWillBeMember<CSSPrimitiveValue> m_endVerticalSize;
+    RefPtr<CSSPrimitiveValue> m_endHorizontalSize;
+    RefPtr<CSSPrimitiveValue> m_endVerticalSize;
 };
 
 DEFINE_CSS_VALUE_TYPE_CASTS(CSSRadialGradientValue, isRadialGradientValue());
 
 } // namespace blink
 
 #endif // CSSGradientValue_h