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

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

Issue 1276183004: Oilpan: Unship oilpan from temporary animation objects (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 5 years, 3 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/AnimationStack.cpp
diff --git a/Source/core/animation/AnimationStack.cpp b/Source/core/animation/AnimationStack.cpp
index db53a3704387f481e2b4ef801aff40b357597334..d6b55eccc798768cb4eb0664a90a322f9c3fbca4 100644
--- a/Source/core/animation/AnimationStack.cpp
+++ b/Source/core/animation/AnimationStack.cpp
@@ -42,7 +42,7 @@ namespace blink {
namespace {
-void copyToActiveInterpolationMap(const WillBeHeapVector<RefPtrWillBeMember<Interpolation>>& source, ActiveInterpolationMap& target)
+void copyToActiveInterpolationMap(const Vector<RefPtr<Interpolation>>& source, ActiveInterpolationMap& target)
{
for (const auto& interpolation : source) {
target.set(interpolation->property(), interpolation.get());
@@ -58,7 +58,7 @@ bool compareEffects(const Member<SampledEffect>& effect1, const Member<SampledEf
void copyNewAnimationsToActiveInterpolationMap(const HeapVector<Member<InertEffect>>& newAnimations, ActiveInterpolationMap& result)
{
for (const auto& newAnimation : newAnimations) {
- OwnPtrWillBeRawPtr<WillBeHeapVector<RefPtrWillBeMember<Interpolation>>> sample = nullptr;
+ OwnPtr<Vector<RefPtr<Interpolation>>> sample;
newAnimation->sample(sample);
if (sample)
copyToActiveInterpolationMap(*sample, result);

Powered by Google App Engine
This is Rietveld 408576698