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

Side by Side 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2013 Google Inc. All rights reserved. 2 * Copyright (C) 2013 Google Inc. All rights reserved.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions are 5 * modification, are permitted provided that the following conditions are
6 * met: 6 * met:
7 * 7 *
8 * * Redistributions of source code must retain the above copyright 8 * * Redistributions of source code must retain the above copyright
9 * notice, this list of conditions and the following disclaimer. 9 * notice, this list of conditions and the following disclaimer.
10 * * Redistributions in binary form must reproduce the above 10 * * Redistributions in binary form must reproduce the above
(...skipping 24 matching lines...) Expand all
35 #include "core/animation/StyleInterpolation.h" 35 #include "core/animation/StyleInterpolation.h"
36 #include "core/animation/css/CSSAnimations.h" 36 #include "core/animation/css/CSSAnimations.h"
37 #include "wtf/BitArray.h" 37 #include "wtf/BitArray.h"
38 #include "wtf/NonCopyingSort.h" 38 #include "wtf/NonCopyingSort.h"
39 #include <algorithm> 39 #include <algorithm>
40 40
41 namespace blink { 41 namespace blink {
42 42
43 namespace { 43 namespace {
44 44
45 void copyToActiveInterpolationMap(const WillBeHeapVector<RefPtrWillBeMember<Inte rpolation>>& source, ActiveInterpolationMap& target) 45 void copyToActiveInterpolationMap(const Vector<RefPtr<Interpolation>>& source, A ctiveInterpolationMap& target)
46 { 46 {
47 for (const auto& interpolation : source) { 47 for (const auto& interpolation : source) {
48 target.set(interpolation->property(), interpolation.get()); 48 target.set(interpolation->property(), interpolation.get());
49 } 49 }
50 } 50 }
51 51
52 bool compareEffects(const Member<SampledEffect>& effect1, const Member<SampledEf fect>& effect2) 52 bool compareEffects(const Member<SampledEffect>& effect1, const Member<SampledEf fect>& effect2)
53 { 53 {
54 ASSERT(effect1 && effect2); 54 ASSERT(effect1 && effect2);
55 return effect1->sequenceNumber() < effect2->sequenceNumber(); 55 return effect1->sequenceNumber() < effect2->sequenceNumber();
56 } 56 }
57 57
58 void copyNewAnimationsToActiveInterpolationMap(const HeapVector<Member<InertEffe ct>>& newAnimations, ActiveInterpolationMap& result) 58 void copyNewAnimationsToActiveInterpolationMap(const HeapVector<Member<InertEffe ct>>& newAnimations, ActiveInterpolationMap& result)
59 { 59 {
60 for (const auto& newAnimation : newAnimations) { 60 for (const auto& newAnimation : newAnimations) {
61 OwnPtrWillBeRawPtr<WillBeHeapVector<RefPtrWillBeMember<Interpolation>>> sample = nullptr; 61 OwnPtr<Vector<RefPtr<Interpolation>>> sample = nullptr;
sof 2015/09/02 13:02:12 (it's fine to leave behind the explicit initializa
62 newAnimation->sample(sample); 62 newAnimation->sample(sample);
63 if (sample) 63 if (sample)
64 copyToActiveInterpolationMap(*sample, result); 64 copyToActiveInterpolationMap(*sample, result);
65 } 65 }
66 } 66 }
67 67
68 } // namespace 68 } // namespace
69 69
70 AnimationStack::AnimationStack() 70 AnimationStack::AnimationStack()
71 { 71 {
(...skipping 61 matching lines...) Expand 10 before | Expand all | Expand 10 after
133 FloatBox expandingBox(originalBox); 133 FloatBox expandingBox(originalBox);
134 if (!CompositorAnimations::instance()->getAnimatedBoundingBox(expand ingBox, *effect->model(), startRange, endRange)) 134 if (!CompositorAnimations::instance()->getAnimatedBoundingBox(expand ingBox, *effect->model(), startRange, endRange))
135 return false; 135 return false;
136 box.expandTo(expandingBox); 136 box.expandTo(expandingBox);
137 } 137 }
138 } 138 }
139 return true; 139 return true;
140 } 140 }
141 141
142 } // namespace blink 142 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698