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

Unified Diff: Source/core/animation/LengthBoxStyleInterpolation.cpp

Issue 1120003002: [Oilpan] Migrate most classes under core/animations to Oilpan heap. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Rebase 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
Index: Source/core/animation/LengthBoxStyleInterpolation.cpp
diff --git a/Source/core/animation/LengthBoxStyleInterpolation.cpp b/Source/core/animation/LengthBoxStyleInterpolation.cpp
index 53440c0aae4c8741b248d0a92d6d43adae1c025b..1ab54f4160e7c94c0cfc1a79ef8528a44dc7cfb9 100644
--- a/Source/core/animation/LengthBoxStyleInterpolation.cpp
+++ b/Source/core/animation/LengthBoxStyleInterpolation.cpp
@@ -21,20 +21,20 @@ bool onlyInterpolateBetweenLengthAndCSSValueAuto(Rect& startRect, Rect& endRect)
} // namespace
-PassRefPtrWillBeRawPtr<LengthBoxStyleInterpolation> LengthBoxStyleInterpolation::maybeCreateFrom(CSSValue& start, CSSValue& end, CSSPropertyID id)
+LengthBoxStyleInterpolation* LengthBoxStyleInterpolation::maybeCreateFrom(CSSValue& start, CSSValue& end, CSSPropertyID id)
{
bool startRect = start.isPrimitiveValue() && toCSSPrimitiveValue(start).isRect();
bool endRect = end.isPrimitiveValue() && toCSSPrimitiveValue(end).isRect();
if (startRect && endRect)
- return adoptRefWillBeNoop(new LengthBoxStyleInterpolation(lengthBoxtoInterpolableValue(start, end, false), lengthBoxtoInterpolableValue(end, start, true), id, &start, &end));
+ return new LengthBoxStyleInterpolation(lengthBoxtoInterpolableValue(start, end, false), lengthBoxtoInterpolableValue(end, start, true), id, &start, &end);
return nullptr;
}
-PassOwnPtrWillBeRawPtr<InterpolableValue> LengthBoxStyleInterpolation::lengthBoxtoInterpolableValue(const CSSValue& lengthBox, const CSSValue& matchingValue, bool isEndInterpolation)
+InterpolableValue* LengthBoxStyleInterpolation::lengthBoxtoInterpolableValue(const CSSValue& lengthBox, const CSSValue& matchingValue, bool isEndInterpolation)
{
const int numberOfSides = 4;
- OwnPtrWillBeRawPtr<InterpolableList> result = InterpolableList::create(numberOfSides);
+ InterpolableList* result = InterpolableList::create(numberOfSides);
Rect* rect = toCSSPrimitiveValue(lengthBox).getRectValue();
Rect* matchingRect = toCSSPrimitiveValue(matchingValue).getRectValue();
CSSPrimitiveValue* side[numberOfSides] = { rect->left(), rect->right(), rect->top(), rect->bottom() };
@@ -48,7 +48,7 @@ PassOwnPtrWillBeRawPtr<InterpolableValue> LengthBoxStyleInterpolation::lengthBox
result->set(i, LengthStyleInterpolation::toInterpolableValue(*side[i]));
}
}
- return result.release();
+ return result;
}
bool LengthBoxStyleInterpolation::usesDefaultInterpolation(const CSSValue& start, const CSSValue& end)
@@ -104,9 +104,10 @@ void LengthBoxStyleInterpolation::apply(StyleResolverState& state) const
DEFINE_TRACE(LengthBoxStyleInterpolation)
{
- StyleInterpolation::trace(visitor);
visitor->trace(m_startCSSValue);
visitor->trace(m_endCSSValue);
+
+ StyleInterpolation::trace(visitor);
}
}
« no previous file with comments | « Source/core/animation/LengthBoxStyleInterpolation.h ('k') | Source/core/animation/LengthBoxStyleInterpolationTest.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698