| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 1999 Lars Knoll (knoll@kde.org) | 2 * Copyright (C) 1999 Lars Knoll (knoll@kde.org) |
| 3 * (C) 2004-2005 Allan Sandfeld Jensen (kde@carewolf.com) | 3 * (C) 2004-2005 Allan Sandfeld Jensen (kde@carewolf.com) |
| 4 * Copyright (C) 2006, 2007 Nicholas Shanks (webkit@nickshanks.com) | 4 * Copyright (C) 2006, 2007 Nicholas Shanks (webkit@nickshanks.com) |
| 5 * Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 Apple Inc. | 5 * Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 Apple Inc. |
| 6 * All rights reserved. | 6 * All rights reserved. |
| 7 * Copyright (C) 2007 Alexey Proskuryakov <ap@webkit.org> | 7 * Copyright (C) 2007 Alexey Proskuryakov <ap@webkit.org> |
| 8 * Copyright (C) 2007, 2008 Eric Seidel <eric@webkit.org> | 8 * Copyright (C) 2007, 2008 Eric Seidel <eric@webkit.org> |
| 9 * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved. | 9 * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved. |
| 10 * (http://www.torchmobile.com/) | 10 * (http://www.torchmobile.com/) |
| (...skipping 1217 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1228 ASSERT(animatingElement == element || !animatingElement || | 1228 ASSERT(animatingElement == element || !animatingElement || |
| 1229 animatingElement->parentOrShadowHostElement() == element); | 1229 animatingElement->parentOrShadowHostElement() == element); |
| 1230 | 1230 |
| 1231 if (!(animatingElement && animatingElement->hasAnimations()) && | 1231 if (!(animatingElement && animatingElement->hasAnimations()) && |
| 1232 !state.style()->transitions() && !state.style()->animations()) | 1232 !state.style()->transitions() && !state.style()->animations()) |
| 1233 return false; | 1233 return false; |
| 1234 | 1234 |
| 1235 CSSAnimations::calculateUpdate(animatingElement, *element, *state.style(), | 1235 CSSAnimations::calculateUpdate(animatingElement, *element, *state.style(), |
| 1236 state.parentStyle(), state.animationUpdate(), | 1236 state.parentStyle(), state.animationUpdate(), |
| 1237 this); | 1237 this); |
| 1238 if (state.animationUpdate().isEmpty()) | |
| 1239 return false; | |
| 1240 | 1238 |
| 1241 CSSAnimations::snapshotCompositorKeyframes( | 1239 CSSAnimations::snapshotCompositorKeyframes( |
| 1242 *element, state.animationUpdate(), *state.style(), state.parentStyle()); | 1240 *element, state.animationUpdate(), *state.style(), state.parentStyle()); |
| 1243 | 1241 |
| 1242 if (state.animationUpdate().isEmpty()) |
| 1243 return false; |
| 1244 |
| 1244 if (state.style()->insideLink() != NotInsideLink) { | 1245 if (state.style()->insideLink() != NotInsideLink) { |
| 1245 ASSERT(state.applyPropertyToRegularStyle()); | 1246 ASSERT(state.applyPropertyToRegularStyle()); |
| 1246 state.setApplyPropertyToVisitedLinkStyle(true); | 1247 state.setApplyPropertyToVisitedLinkStyle(true); |
| 1247 } | 1248 } |
| 1248 | 1249 |
| 1249 const ActiveInterpolationsMap& activeInterpolationsMapForAnimations = | 1250 const ActiveInterpolationsMap& activeInterpolationsMapForAnimations = |
| 1250 state.animationUpdate().activeInterpolationsForAnimations(); | 1251 state.animationUpdate().activeInterpolationsForAnimations(); |
| 1251 const ActiveInterpolationsMap& activeInterpolationsMapForTransitions = | 1252 const ActiveInterpolationsMap& activeInterpolationsMapForTransitions = |
| 1252 state.animationUpdate().activeInterpolationsForTransitions(); | 1253 state.animationUpdate().activeInterpolationsForTransitions(); |
| 1253 // TODO(crbug.com/644148): Apply animations on custom properties. | 1254 // TODO(crbug.com/644148): Apply animations on custom properties. |
| (...skipping 695 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1949 visitor->trace(m_siblingRuleSet); | 1950 visitor->trace(m_siblingRuleSet); |
| 1950 visitor->trace(m_uncommonAttributeRuleSet); | 1951 visitor->trace(m_uncommonAttributeRuleSet); |
| 1951 visitor->trace(m_watchedSelectorsRules); | 1952 visitor->trace(m_watchedSelectorsRules); |
| 1952 visitor->trace(m_treeBoundaryCrossingScopes); | 1953 visitor->trace(m_treeBoundaryCrossingScopes); |
| 1953 visitor->trace(m_styleSharingLists); | 1954 visitor->trace(m_styleSharingLists); |
| 1954 visitor->trace(m_pendingStyleSheets); | 1955 visitor->trace(m_pendingStyleSheets); |
| 1955 visitor->trace(m_document); | 1956 visitor->trace(m_document); |
| 1956 } | 1957 } |
| 1957 | 1958 |
| 1958 } // namespace blink | 1959 } // namespace blink |
| OLD | NEW |