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

Unified Diff: sky/engine/core/css/resolver/SharedStyleFinder.cpp

Issue 1229273004: Remove Animations and Transitions. (Closed) Base URL: https://github.com/domokit/mojo.git@master
Patch Set: Created 5 years, 5 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
« no previous file with comments | « sky/engine/core/css/resolver/CSSToStyleMap.cpp ('k') | sky/engine/core/css/resolver/StyleAdjuster.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: sky/engine/core/css/resolver/SharedStyleFinder.cpp
diff --git a/sky/engine/core/css/resolver/SharedStyleFinder.cpp b/sky/engine/core/css/resolver/SharedStyleFinder.cpp
index 9d57e85e5aa4aaa9d546aa1765eeba88d883a858..ffb4a5cfecbd404b2ac3e079cf246c334d6cb7d8 100644
--- a/sky/engine/core/css/resolver/SharedStyleFinder.cpp
+++ b/sky/engine/core/css/resolver/SharedStyleFinder.cpp
@@ -153,9 +153,8 @@ inline Element* SharedStyleFinder::findElementForStyleSharing() const
for (StyleSharingList::iterator it = styleSharingList.begin(); it != styleSharingList.end(); ++it) {
Element& candidate = **it;
// We shouldn't have elements in the style sharing list that don't
- // support style sharing but we can end up with one currently if it gets
- // added to the list and then it starts an animation.
- if (candidate.hasActiveAnimations() || !canShareStyleWithElement(candidate))
+ // support style sharing.
+ if (!canShareStyleWithElement(candidate))
continue;
if (it != styleSharingList.begin()) {
// Move the element to the front of the LRU
« no previous file with comments | « sky/engine/core/css/resolver/CSSToStyleMap.cpp ('k') | sky/engine/core/css/resolver/StyleAdjuster.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698