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

Unified Diff: third_party/WebKit/Source/core/animation/CSSImageInterpolationType.cpp

Issue 1686483002: Oilpan: Remove most WillBe types from the code base (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 9 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
Index: third_party/WebKit/Source/core/animation/CSSImageInterpolationType.cpp
diff --git a/third_party/WebKit/Source/core/animation/CSSImageInterpolationType.cpp b/third_party/WebKit/Source/core/animation/CSSImageInterpolationType.cpp
index f13f3d5c22f2b69bce38fd04d00abed5898d2acd..cb6799159357b1d0e6dfba1b43c05d93e4db1e16 100644
--- a/third_party/WebKit/Source/core/animation/CSSImageInterpolationType.cpp
+++ b/third_party/WebKit/Source/core/animation/CSSImageInterpolationType.cpp
@@ -16,7 +16,7 @@ class CSSImageNonInterpolableValue : public NonInterpolableValue {
public:
~CSSImageNonInterpolableValue() final { }
- static PassRefPtr<CSSImageNonInterpolableValue> create(PassRefPtrWillBeRawPtr<CSSValue> start, PassRefPtrWillBeRawPtr<CSSValue> end)
+ static PassRefPtr<CSSImageNonInterpolableValue> create(RawPtr<CSSValue> start, RawPtr<CSSValue> end)
{
return adoptRef(new CSSImageNonInterpolableValue(start, end));
}
@@ -29,7 +29,7 @@ public:
static PassRefPtr<CSSImageNonInterpolableValue> merge(PassRefPtr<NonInterpolableValue> start, PassRefPtr<NonInterpolableValue> end);
- PassRefPtrWillBeRawPtr<CSSValue> crossfade(double progress) const
+ RawPtr<CSSValue> crossfade(double progress) const
{
if (m_isSingle || progress <= 0)
return m_start;
@@ -41,7 +41,7 @@ public:
DECLARE_NON_INTERPOLABLE_VALUE_TYPE();
private:
- CSSImageNonInterpolableValue(PassRefPtrWillBeRawPtr<CSSValue> start, PassRefPtrWillBeRawPtr<CSSValue> end)
+ CSSImageNonInterpolableValue(RawPtr<CSSValue> start, RawPtr<CSSValue> end)
: m_start(start)
, m_end(end)
, m_isSingle(m_start == m_end)
@@ -50,8 +50,8 @@ private:
ASSERT(m_end);
}
- RefPtrWillBePersistent<CSSValue> m_start;
- RefPtrWillBePersistent<CSSValue> m_end;
+ Persistent<CSSValue> m_start;
+ Persistent<CSSValue> m_end;
const bool m_isSingle;
};
@@ -93,14 +93,14 @@ PairwiseInterpolationValue CSSImageInterpolationType::staticMergeSingleConversio
CSSImageNonInterpolableValue::merge(start.nonInterpolableValue, end.nonInterpolableValue));
}
-PassRefPtrWillBeRawPtr<CSSValue> CSSImageInterpolationType::createCSSValue(const InterpolableValue& interpolableValue, const NonInterpolableValue* nonInterpolableValue)
+RawPtr<CSSValue> CSSImageInterpolationType::createCSSValue(const InterpolableValue& interpolableValue, const NonInterpolableValue* nonInterpolableValue)
{
return toCSSImageNonInterpolableValue(nonInterpolableValue)->crossfade(toInterpolableNumber(interpolableValue).value());
}
-PassRefPtrWillBeRawPtr<StyleImage> CSSImageInterpolationType::resolveStyleImage(CSSPropertyID property, const InterpolableValue& interpolableValue, const NonInterpolableValue* nonInterpolableValue, StyleResolverState& state)
+RawPtr<StyleImage> CSSImageInterpolationType::resolveStyleImage(CSSPropertyID property, const InterpolableValue& interpolableValue, const NonInterpolableValue* nonInterpolableValue, StyleResolverState& state)
{
- RefPtrWillBeRawPtr<CSSValue> image = createCSSValue(interpolableValue, nonInterpolableValue);
+ RawPtr<CSSValue> image = createCSSValue(interpolableValue, nonInterpolableValue);
return state.styleImage(property, *image);
}
@@ -151,13 +151,13 @@ class ParentImageChecker : public InterpolationType::ConversionChecker {
public:
~ParentImageChecker() final {}
- static PassOwnPtr<ParentImageChecker> create(CSSPropertyID property, PassRefPtrWillBeRawPtr<StyleImage> inheritedImage)
+ static PassOwnPtr<ParentImageChecker> create(CSSPropertyID property, RawPtr<StyleImage> inheritedImage)
{
return adoptPtr(new ParentImageChecker(property, inheritedImage));
}
private:
- ParentImageChecker(CSSPropertyID property, PassRefPtrWillBeRawPtr<StyleImage> inheritedImage)
+ ParentImageChecker(CSSPropertyID property, RawPtr<StyleImage> inheritedImage)
: m_property(property)
, m_inheritedImage(inheritedImage)
{ }
@@ -173,7 +173,7 @@ private:
}
CSSPropertyID m_property;
- RefPtrWillBePersistent<StyleImage> m_inheritedImage;
+ Persistent<StyleImage> m_inheritedImage;
};
InterpolationValue CSSImageInterpolationType::maybeConvertInherit(const StyleResolverState& state, ConversionCheckers& conversionCheckers) const

Powered by Google App Engine
This is Rietveld 408576698