| Index: Source/core/css/Pair.h
|
| diff --git a/Source/core/css/Pair.h b/Source/core/css/Pair.h
|
| index 4df5efec58f714f5d1a0436552a52558d82b5d55..7a5e02e7250967e1a19352802396df2e865951d0 100644
|
| --- a/Source/core/css/Pair.h
|
| +++ b/Source/core/css/Pair.h
|
| @@ -33,14 +33,14 @@ namespace blink {
|
| // and border-spacing (all of which are space-separated sets of two values). At the moment we are only using it for
|
| // border-radius and background-size, but (FIXME) border-spacing and background-position could be converted over to use
|
| // it (eliminating some extra -webkit- internal properties).
|
| -class CORE_EXPORT Pair final : public RefCountedWillBeGarbageCollected<Pair> {
|
| +class CORE_EXPORT Pair final : public RefCounted<Pair> {
|
| public:
|
| enum IdenticalValuesPolicy { DropIdenticalValues, KeepIdenticalValues };
|
|
|
| - static PassRefPtrWillBeRawPtr<Pair> create(PassRefPtrWillBeRawPtr<CSSPrimitiveValue> first, PassRefPtrWillBeRawPtr<CSSPrimitiveValue> second,
|
| + static PassRefPtr<Pair> create(PassRefPtr<CSSPrimitiveValue> first, PassRefPtr<CSSPrimitiveValue> second,
|
| IdenticalValuesPolicy identicalValuesPolicy)
|
| {
|
| - return adoptRefWillBeNoop(new Pair(first, second, identicalValuesPolicy));
|
| + return adoptRef(new Pair(first, second, identicalValuesPolicy));
|
| }
|
|
|
| CSSPrimitiveValue* first() const { return m_first.get(); }
|
| @@ -58,10 +58,8 @@ public:
|
| && m_identicalValuesPolicy == other.m_identicalValuesPolicy;
|
| }
|
|
|
| - DECLARE_TRACE();
|
| -
|
| private:
|
| - Pair(PassRefPtrWillBeRawPtr<CSSPrimitiveValue> first, PassRefPtrWillBeRawPtr<CSSPrimitiveValue> second, IdenticalValuesPolicy identicalValuesPolicy)
|
| + Pair(PassRefPtr<CSSPrimitiveValue> first, PassRefPtr<CSSPrimitiveValue> second, IdenticalValuesPolicy identicalValuesPolicy)
|
| : m_first(first)
|
| , m_second(second)
|
| , m_identicalValuesPolicy(identicalValuesPolicy) { }
|
| @@ -73,8 +71,8 @@ private:
|
| return first + ' ' + second;
|
| }
|
|
|
| - RefPtrWillBeMember<CSSPrimitiveValue> m_first;
|
| - RefPtrWillBeMember<CSSPrimitiveValue> m_second;
|
| + RefPtr<CSSPrimitiveValue> m_first;
|
| + RefPtr<CSSPrimitiveValue> m_second;
|
| IdenticalValuesPolicy m_identicalValuesPolicy;
|
| };
|
|
|
|
|