Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(505)

Unified Diff: Source/core/css/Pair.h

Issue 1303173007: Oilpan: Unship Oilpan from CSSValues Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 5 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « Source/core/css/FontFace.cpp ('k') | Source/core/css/Pair.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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;
};
« no previous file with comments | « Source/core/css/FontFace.cpp ('k') | Source/core/css/Pair.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698