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

Side by Side Diff: third_party/WebKit/Source/core/animation/EffectStack.cpp

Issue 2719083005: Use PropertyHandle instead of CSSPropertyID to identify CSS Transitions (Closed)
Patch Set: Rebasedagainaaaa Created 3 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
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 70 matching lines...) Expand 10 before | Expand all | Expand 10 after
81 if (!sample.isEmpty()) 81 if (!sample.isEmpty())
82 copyToActiveInterpolationsMap(sample, propertyHandleFilter, result); 82 copyToActiveInterpolationsMap(sample, propertyHandleFilter, result);
83 } 83 }
84 } 84 }
85 85
86 } // namespace 86 } // namespace
87 87
88 EffectStack::EffectStack() {} 88 EffectStack::EffectStack() {}
89 89
90 bool EffectStack::hasActiveAnimationsOnCompositor( 90 bool EffectStack::hasActiveAnimationsOnCompositor(
91 CSSPropertyID property) const { 91 const PropertyHandle& property) const {
92 for (const auto& sampledEffect : m_sampledEffects) { 92 for (const auto& sampledEffect : m_sampledEffects) {
93 // TODO(dstockwell): move the playing check into AnimationEffectReadOnly and 93 // TODO(dstockwell): move the playing check into AnimationEffectReadOnly and
94 // expose both hasAnimations and hasActiveAnimations 94 // expose both hasAnimations and hasActiveAnimations
95 if (sampledEffect->effect() && 95 if (sampledEffect->effect() &&
96 sampledEffect->effect()->animation()->playing() && 96 sampledEffect->effect()->animation()->playing() &&
97 sampledEffect->effect()->hasActiveAnimationsOnCompositor(property)) 97 sampledEffect->effect()->hasActiveAnimationsOnCompositor(property))
98 return true; 98 return true;
99 } 99 }
100 return false; 100 return false;
101 } 101 }
(...skipping 80 matching lines...) Expand 10 before | Expand all | Expand 10 after
182 if (!CompositorAnimations::getAnimatedBoundingBox( 182 if (!CompositorAnimations::getAnimatedBoundingBox(
183 expandingBox, *effect->model(), startRange, endRange)) 183 expandingBox, *effect->model(), startRange, endRange))
184 return false; 184 return false;
185 box.expandTo(expandingBox); 185 box.expandTo(expandingBox);
186 } 186 }
187 } 187 }
188 return true; 188 return true;
189 } 189 }
190 190
191 } // namespace blink 191 } // namespace blink
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/core/animation/EffectStack.h ('k') | third_party/WebKit/Source/core/animation/ElementAnimations.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698