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

Side by Side Diff: Source/core/css/resolver/StyleResolver.cpp

Issue 73643003: Web Animations CSS: Check if animating element exists before calculating animation update (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 7 years, 1 month 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 /* 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. All rights reserved. 5 * Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 Apple Inc. All rights reserved.
6 * Copyright (C) 2007 Alexey Proskuryakov <ap@webkit.org> 6 * Copyright (C) 2007 Alexey Proskuryakov <ap@webkit.org>
7 * Copyright (C) 2007, 2008 Eric Seidel <eric@webkit.org> 7 * Copyright (C) 2007, 2008 Eric Seidel <eric@webkit.org>
8 * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved. (http://www.t orchmobile.com/) 8 * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved. (http://www.t orchmobile.com/)
9 * Copyright (c) 2011, Code Aurora Forum. All rights reserved. 9 * Copyright (c) 2011, Code Aurora Forum. All rights reserved.
10 * Copyright (C) Research In Motion Limited 2011. All rights reserved. 10 * Copyright (C) Research In Motion Limited 2011. All rights reserved.
(...skipping 1261 matching lines...) Expand 10 before | Expand all | Expand 10 after
1272 INCREMENT_STYLE_STATS_COUNTER(*this, matchedPropertyCacheInheritedHi t); 1272 INCREMENT_STYLE_STATS_COUNTER(*this, matchedPropertyCacheInheritedHi t);
1273 1273
1274 EInsideLink linkStatus = state.style()->insideLink(); 1274 EInsideLink linkStatus = state.style()->insideLink();
1275 // If the cache item parent style has identical inherited properties to the current parent style then the 1275 // If the cache item parent style has identical inherited properties to the current parent style then the
1276 // resulting style will be identical too. We copy the inherited prop erties over from the cache and are done. 1276 // resulting style will be identical too. We copy the inherited prop erties over from the cache and are done.
1277 state.style()->inheritFrom(cachedMatchedProperties->renderStyle.get( )); 1277 state.style()->inheritFrom(cachedMatchedProperties->renderStyle.get( ));
1278 1278
1279 // Unfortunately the link status is treated like an inherited proper ty. We need to explicitly restore it. 1279 // Unfortunately the link status is treated like an inherited proper ty. We need to explicitly restore it.
1280 state.style()->setInsideLink(linkStatus); 1280 state.style()->setInsideLink(linkStatus);
1281 1281
1282 if (RuntimeEnabledFeatures::webAnimationsCSSEnabled() 1282 if (RuntimeEnabledFeatures::webAnimationsCSSEnabled() && animatingEl ement
1283 && (animatingElement->hasActiveAnimations() 1283 && (animatingElement->hasActiveAnimations()
1284 || (state.style()->transitions() && !state.style()->transiti ons()->isEmpty()) 1284 || (state.style()->transitions() && !state.style()->transiti ons()->isEmpty())
1285 || (state.style()->animations() && !state.style()->animation s()->isEmpty()))) 1285 || (state.style()->animations() && !state.style()->animation s()->isEmpty())))
1286 applyAnimatedProperties(state, animatingElement); 1286 applyAnimatedProperties(state, animatingElement);
1287 return; 1287 return;
1288 } 1288 }
1289 applyInheritedOnly = true; 1289 applyInheritedOnly = true;
1290 } 1290 }
1291 1291
1292 // First apply all variable definitions, as they may be used during applicat ion of later properties. 1292 // First apply all variable definitions, as they may be used during applicat ion of later properties.
(...skipping 132 matching lines...) Expand 10 before | Expand all | Expand 10 after
1425 bool StyleResolver::affectedByViewportChange() const 1425 bool StyleResolver::affectedByViewportChange() const
1426 { 1426 {
1427 for (unsigned i = 0; i < m_viewportDependentMediaQueryResults.size(); ++i) { 1427 for (unsigned i = 0; i < m_viewportDependentMediaQueryResults.size(); ++i) {
1428 if (m_medium->eval(&m_viewportDependentMediaQueryResults[i]->m_expressio n) != m_viewportDependentMediaQueryResults[i]->m_result) 1428 if (m_medium->eval(&m_viewportDependentMediaQueryResults[i]->m_expressio n) != m_viewportDependentMediaQueryResults[i]->m_result)
1429 return true; 1429 return true;
1430 } 1430 }
1431 return false; 1431 return false;
1432 } 1432 }
1433 1433
1434 } // namespace WebCore 1434 } // namespace WebCore
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