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

Unified Diff: Source/core/animation/ImageSliceStyleInterpolation.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/ImageSliceStyleInterpolation.cpp
diff --git a/Source/core/animation/ImageSliceStyleInterpolation.cpp b/Source/core/animation/ImageSliceStyleInterpolation.cpp
index 827cce5287b1d741eb0adf4ba23905850b7626dc..80928c50e7bda0873489e4f331477ca4edf36e39 100644
--- a/Source/core/animation/ImageSliceStyleInterpolation.cpp
+++ b/Source/core/animation/ImageSliceStyleInterpolation.cpp
@@ -32,14 +32,14 @@ public:
decompose(value);
}
- OwnPtrWillBeMember<InterpolableValue> interpolableValue;
+ Member<InterpolableValue> interpolableValue;
ImageSliceStyleInterpolation::Metadata metadata;
private:
void decompose(const CSSBorderImageSliceValue& value)
{
const size_t kQuadSides = 4;
- OwnPtrWillBeRawPtr<InterpolableList> interpolableList = InterpolableList::create(kQuadSides);
+ InterpolableList* interpolableList = InterpolableList::create(kQuadSides);
const Quad& quad = *value.slices();
interpolableList->set(0, InterpolableNumber::create(quad.top()->getDoubleValue()));
interpolableList->set(1, InterpolableNumber::create(quad.right()->getDoubleValue()));
@@ -50,7 +50,7 @@ private:
&& quad.left()->isPercentage() == isPercentage
&& quad.right()->isPercentage() == isPercentage);
- interpolableValue = interpolableList.release();
+ interpolableValue = interpolableList;
metadata = ImageSliceStyleInterpolation::Metadata {isPercentage, value.m_fill};
}
};
@@ -69,7 +69,7 @@ PassRefPtrWillBeRawPtr<CSSBorderImageSliceValue> compose(const InterpolableValue
} // namespace
-PassRefPtrWillBeRawPtr<ImageSliceStyleInterpolation> ImageSliceStyleInterpolation::maybeCreate(const CSSValue& start, const CSSValue& end, CSSPropertyID property)
+ImageSliceStyleInterpolation* ImageSliceStyleInterpolation::maybeCreate(const CSSValue& start, const CSSValue& end, CSSPropertyID property)
{
if (!start.isBorderImageSliceValue() || !end.isBorderImageSliceValue())
return nullptr;
@@ -79,12 +79,7 @@ PassRefPtrWillBeRawPtr<ImageSliceStyleInterpolation> ImageSliceStyleInterpolatio
if (!(startDecompose.metadata == endDecompose.metadata))
return nullptr;
- return adoptRefWillBeNoop(new ImageSliceStyleInterpolation(
- startDecompose.interpolableValue.release(),
- endDecompose.interpolableValue.release(),
- property,
- startDecompose.metadata
- ));
+ return new ImageSliceStyleInterpolation(startDecompose.interpolableValue.release(), endDecompose.interpolableValue.release(), property, startDecompose.metadata);
}
void ImageSliceStyleInterpolation::apply(StyleResolverState& state) const
« no previous file with comments | « Source/core/animation/ImageSliceStyleInterpolation.h ('k') | Source/core/animation/ImageStyleInterpolation.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698