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

Unified Diff: Source/core/animation/ColorStyleInterpolation.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/ColorStyleInterpolation.cpp
diff --git a/Source/core/animation/ColorStyleInterpolation.cpp b/Source/core/animation/ColorStyleInterpolation.cpp
index e96ff48475bd06c863c4e9063707e58703cb4e29..1b8497185b12a54aaa4e6b1fd21d7015b24a4a56 100644
--- a/Source/core/animation/ColorStyleInterpolation.cpp
+++ b/Source/core/animation/ColorStyleInterpolation.cpp
@@ -22,7 +22,7 @@ bool ColorStyleInterpolation::canCreateFrom(const CSSValue& value)
return value.isPrimitiveValue() && (toCSSPrimitiveValue(value).isValueID() || toCSSPrimitiveValue(value).isRGBColor());
}
-PassOwnPtrWillBeRawPtr<InterpolableValue> ColorStyleInterpolation::colorToInterpolableValue(const CSSValue& value)
+InterpolableValue* ColorStyleInterpolation::colorToInterpolableValue(const CSSValue& value)
{
ASSERT(value.isPrimitiveValue());
const CSSPrimitiveValue& primitive = toCSSPrimitiveValue(value);
@@ -41,7 +41,7 @@ PassOwnPtrWillBeRawPtr<InterpolableValue> ColorStyleInterpolation::colorToInterp
int alpha = alphaChannel(color);
- OwnPtrWillBeRawPtr<InterpolableList> list = InterpolableList::create(4);
+ InterpolableList* list = InterpolableList::create(4);
list->set(0, InterpolableNumber::create(redChannel(color) * alpha));
list->set(1, InterpolableNumber::create(greenChannel(color) * alpha));
list->set(2, InterpolableNumber::create(blueChannel(color) * alpha));
@@ -79,10 +79,10 @@ DEFINE_TRACE(ColorStyleInterpolation)
StyleInterpolation::trace(visitor);
}
-PassRefPtrWillBeRawPtr<ColorStyleInterpolation> ColorStyleInterpolation::maybeCreateFromColor(const CSSValue& start, const CSSValue& end, CSSPropertyID id)
+ColorStyleInterpolation* ColorStyleInterpolation::maybeCreateFromColor(const CSSValue& start, const CSSValue& end, CSSPropertyID id)
{
if (canCreateFrom(start) && !toCSSPrimitiveValue(start).colorIsDerivedFromElement() && canCreateFrom(end) && !toCSSPrimitiveValue(end).colorIsDerivedFromElement())
- return adoptRefWillBeNoop(new ColorStyleInterpolation(colorToInterpolableValue(start), colorToInterpolableValue(end), id));
+ return new ColorStyleInterpolation(colorToInterpolableValue(start), colorToInterpolableValue(end), id);
return nullptr;
}
« no previous file with comments | « Source/core/animation/ColorStyleInterpolation.h ('k') | Source/core/animation/ColorStyleInterpolationTest.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698