Index: Source/core/css/CSSGradientValue.h |
diff --git a/Source/core/css/CSSGradientValue.h b/Source/core/css/CSSGradientValue.h |
index 4bd4162f5d6f395143c25787b084a32de3eef653..c6826b15ee9e21892838fc354111c24c60fd1e0f 100644 |
--- a/Source/core/css/CSSGradientValue.h |
+++ b/Source/core/css/CSSGradientValue.h |
@@ -55,8 +55,8 @@ 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 |
{ |
@@ -68,8 +68,6 @@ public: |
ASSERT(m_color || m_position); |
return !m_color; |
} |
- |
- DECLARE_TRACE(); |
}; |
} // namespace blink |
@@ -85,10 +83,10 @@ 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); } |
@@ -108,8 +106,6 @@ public: |
void loadSubimages(Document*) { } |
- DECLARE_TRACE_AFTER_DISPATCH(); |
- |
protected: |
CSSGradientValue(ClassType classType, CSSGradientRepeat repeat, CSSGradientType gradientType) |
: CSSImageGeneratorValue(classType) |
@@ -141,14 +137,14 @@ protected: |
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; |
@@ -159,27 +155,25 @@ 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) |
@@ -192,41 +186,39 @@ private: |
{ |
} |
- 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) |
@@ -249,15 +241,15 @@ private: |
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()); |