| Index: Source/core/css/Rect.h
|
| diff --git a/Source/core/css/Rect.h b/Source/core/css/Rect.h
|
| index d8190b1293709b31c36dd945e73712e1f670b8fe..ca2cf0683b1101cf39f6b49e5a92da22bae8cf74 100644
|
| --- a/Source/core/css/Rect.h
|
| +++ b/Source/core/css/Rect.h
|
| @@ -28,18 +28,17 @@
|
|
|
| namespace blink {
|
|
|
| -class CORE_EXPORT RectBase : public RefCountedWillBeGarbageCollected<RectBase> {
|
| - DECLARE_EMPTY_DESTRUCTOR_WILL_BE_REMOVED(RectBase);
|
| +class CORE_EXPORT RectBase : public RefCounted<RectBase> {
|
| public:
|
| CSSPrimitiveValue* top() const { return m_top.get(); }
|
| CSSPrimitiveValue* right() const { return m_right.get(); }
|
| CSSPrimitiveValue* bottom() const { return m_bottom.get(); }
|
| CSSPrimitiveValue* left() const { return m_left.get(); }
|
|
|
| - void setTop(PassRefPtrWillBeRawPtr<CSSPrimitiveValue> top) { m_top = top; }
|
| - void setRight(PassRefPtrWillBeRawPtr<CSSPrimitiveValue> right) { m_right = right; }
|
| - void setBottom(PassRefPtrWillBeRawPtr<CSSPrimitiveValue> bottom) { m_bottom = bottom; }
|
| - void setLeft(PassRefPtrWillBeRawPtr<CSSPrimitiveValue> left) { m_left = left; }
|
| + void setTop(PassRefPtr<CSSPrimitiveValue> top) { m_top = top; }
|
| + void setRight(PassRefPtr<CSSPrimitiveValue> right) { m_right = right; }
|
| + void setBottom(PassRefPtr<CSSPrimitiveValue> bottom) { m_bottom = bottom; }
|
| + void setLeft(PassRefPtr<CSSPrimitiveValue> left) { m_left = left; }
|
|
|
| bool equals(const RectBase& other) const
|
| {
|
| @@ -49,21 +48,19 @@ public:
|
| && compareCSSValuePtr(m_bottom, other.m_bottom);
|
| }
|
|
|
| - DECLARE_TRACE();
|
| -
|
| protected:
|
| RectBase() { }
|
|
|
| private:
|
| - RefPtrWillBeMember<CSSPrimitiveValue> m_top;
|
| - RefPtrWillBeMember<CSSPrimitiveValue> m_right;
|
| - RefPtrWillBeMember<CSSPrimitiveValue> m_bottom;
|
| - RefPtrWillBeMember<CSSPrimitiveValue> m_left;
|
| + RefPtr<CSSPrimitiveValue> m_top;
|
| + RefPtr<CSSPrimitiveValue> m_right;
|
| + RefPtr<CSSPrimitiveValue> m_bottom;
|
| + RefPtr<CSSPrimitiveValue> m_left;
|
| };
|
|
|
| class Rect : public RectBase {
|
| public:
|
| - static PassRefPtrWillBeRawPtr<Rect> create() { return adoptRefWillBeNoop(new Rect); }
|
| + static PassRefPtr<Rect> create() { return adoptRef(new Rect); }
|
|
|
| String cssText() const
|
| {
|
| @@ -84,7 +81,7 @@ private:
|
|
|
| class Quad : public RectBase {
|
| public:
|
| - static PassRefPtrWillBeRawPtr<Quad> create() { return adoptRefWillBeNoop(new Quad); }
|
| + static PassRefPtr<Quad> create() { return adoptRef(new Quad); }
|
|
|
| String cssText() const
|
| {
|
|
|