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

Side by Side Diff: third_party/WebKit/Source/core/animation/AnimationStack.h

Issue 1701853002: Code clean up: Rename SampledEffect variables to sampledEffect instead of effect (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@_refCountPSKs
Patch Set: Created 4 years, 10 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
« no previous file with comments | « no previous file | third_party/WebKit/Source/core/animation/AnimationStack.cpp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 37 matching lines...) Expand 10 before | Expand all | Expand 10 after
48 class InertEffect; 48 class InertEffect;
49 49
50 // Represents the order in which a sequence of SampledEffects should apply. 50 // Represents the order in which a sequence of SampledEffects should apply.
51 // This sequence is broken down to per PropertyHandle granularity. 51 // This sequence is broken down to per PropertyHandle granularity.
52 class CORE_EXPORT AnimationStack { 52 class CORE_EXPORT AnimationStack {
53 DISALLOW_NEW(); 53 DISALLOW_NEW();
54 WTF_MAKE_NONCOPYABLE(AnimationStack); 54 WTF_MAKE_NONCOPYABLE(AnimationStack);
55 public: 55 public:
56 AnimationStack(); 56 AnimationStack();
57 57
58 void add(SampledEffect* effect) { m_effects.append(effect); } 58 void add(SampledEffect* sampledEffect) { m_sampledEffects.append(sampledEffe ct); }
59 bool isEmpty() const { return m_effects.isEmpty(); } 59 bool isEmpty() const { return m_sampledEffects.isEmpty(); }
60 bool hasActiveAnimationsOnCompositor(CSSPropertyID) const; 60 bool hasActiveAnimationsOnCompositor(CSSPropertyID) const;
61 61
62 using PropertyHandleFilter = bool (*)(const PropertyHandle&); 62 using PropertyHandleFilter = bool (*)(const PropertyHandle&);
63 static ActiveInterpolationsMap activeInterpolations(AnimationStack*, const H eapVector<Member<const InertEffect>>* newAnimations, const HeapHashSet<Member<co nst Animation>>* suppressedAnimations, KeyframeEffect::Priority, PropertyHandleF ilter = nullptr); 63 static ActiveInterpolationsMap activeInterpolations(AnimationStack*, const H eapVector<Member<const InertEffect>>* newAnimations, const HeapHashSet<Member<co nst Animation>>* suppressedAnimations, KeyframeEffect::Priority, PropertyHandleF ilter = nullptr);
64 64
65 bool getAnimatedBoundingBox(FloatBox&, CSSPropertyID) const; 65 bool getAnimatedBoundingBox(FloatBox&, CSSPropertyID) const;
66 DECLARE_TRACE(); 66 DECLARE_TRACE();
67 67
68 private: 68 private:
69 void removeClearedEffects(); 69 void removeClearedSampledEffects();
70 70
71 // Effects sorted by priority. Lower priority at the start of the list. 71 // Effects sorted by priority. Lower priority at the start of the list.
72 HeapVector<Member<SampledEffect>> m_effects; 72 HeapVector<Member<SampledEffect>> m_sampledEffects;
73 73
74 friend class AnimationAnimationStackTest; 74 friend class AnimationAnimationStackTest;
75 }; 75 };
76 76
77 } // namespace blink 77 } // namespace blink
78 78
79 #endif // AnimationStack_h 79 #endif // AnimationStack_h
OLDNEW
« no previous file with comments | « no previous file | third_party/WebKit/Source/core/animation/AnimationStack.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698