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

Side by Side Diff: Source/core/animation/SampledEffect.cpp

Issue 959233002: Revert "Oilpan: fix build after r190977 (5831a54)." (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 5 years, 9 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
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "config.h" 5 #include "config.h"
6 #include "core/animation/SampledEffect.h" 6 #include "core/animation/SampledEffect.h"
7 7
8 #include "core/animation/StyleInterpolation.h" 8 #include "core/animation/StyleInterpolation.h"
9 9
10 namespace blink { 10 namespace blink {
(...skipping 40 matching lines...) Expand 10 before | Expand all | Expand 10 after
51 for (auto& interpolation : *m_interpolations) { 51 for (auto& interpolation : *m_interpolations) {
52 if (!replacedProperties.get(toStyleInterpolation(interpolation.get())->i d())) 52 if (!replacedProperties.get(toStyleInterpolation(interpolation.get())->i d()))
53 m_interpolations->at(dest++) = interpolation; 53 m_interpolations->at(dest++) = interpolation;
54 } 54 }
55 m_interpolations->shrink(dest); 55 m_interpolations->shrink(dest);
56 } 56 }
57 57
58 DEFINE_TRACE(SampledEffect) 58 DEFINE_TRACE(SampledEffect)
59 { 59 {
60 visitor->trace(m_animation); 60 visitor->trace(m_animation);
61 visitor->trace(m_player);
62 #if ENABLE(OILPAN) 61 #if ENABLE(OILPAN)
63 visitor->trace(m_interpolations); 62 visitor->trace(m_interpolations);
64 #endif 63 #endif
65 } 64 }
66 65
67 } // namespace blink 66 } // namespace blink
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698