| 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.
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 1253 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1264 INCREMENT_STYLE_STATS_COUNTER(*this, matchedPropertyCacheInheritedHi
t); | 1264 INCREMENT_STYLE_STATS_COUNTER(*this, matchedPropertyCacheInheritedHi
t); |
| 1265 | 1265 |
| 1266 EInsideLink linkStatus = state.style()->insideLink(); | 1266 EInsideLink linkStatus = state.style()->insideLink(); |
| 1267 // If the cache item parent style has identical inherited properties
to the current parent style then the | 1267 // If the cache item parent style has identical inherited properties
to the current parent style then the |
| 1268 // resulting style will be identical too. We copy the inherited prop
erties over from the cache and are done. | 1268 // resulting style will be identical too. We copy the inherited prop
erties over from the cache and are done. |
| 1269 state.style()->inheritFrom(cachedMatchedProperties->renderStyle.get(
)); | 1269 state.style()->inheritFrom(cachedMatchedProperties->renderStyle.get(
)); |
| 1270 | 1270 |
| 1271 // Unfortunately the link status is treated like an inherited proper
ty. We need to explicitly restore it. | 1271 // Unfortunately the link status is treated like an inherited proper
ty. We need to explicitly restore it. |
| 1272 state.style()->setInsideLink(linkStatus); | 1272 state.style()->setInsideLink(linkStatus); |
| 1273 | 1273 |
| 1274 if (RuntimeEnabledFeatures::webAnimationsCSSEnabled() | 1274 if (RuntimeEnabledFeatures::webAnimationsCSSEnabled() && animatingEl
ement |
| 1275 && (animatingElement->hasActiveAnimations() | 1275 && (animatingElement->hasActiveAnimations() |
| 1276 || (state.style()->transitions() && !state.style()->transiti
ons()->isEmpty()) | 1276 || (state.style()->transitions() && !state.style()->transiti
ons()->isEmpty()) |
| 1277 || (state.style()->animations() && !state.style()->animation
s()->isEmpty()))) | 1277 || (state.style()->animations() && !state.style()->animation
s()->isEmpty()))) |
| 1278 applyAnimatedProperties(state, animatingElement); | 1278 applyAnimatedProperties(state, animatingElement); |
| 1279 return; | 1279 return; |
| 1280 } | 1280 } |
| 1281 applyInheritedOnly = true; | 1281 applyInheritedOnly = true; |
| 1282 } | 1282 } |
| 1283 | 1283 |
| 1284 // First apply all variable definitions, as they may be used during applicat
ion of later properties. | 1284 // 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 Loading... |
| 1417 bool StyleResolver::affectedByViewportChange() const | 1417 bool StyleResolver::affectedByViewportChange() const |
| 1418 { | 1418 { |
| 1419 for (unsigned i = 0; i < m_viewportDependentMediaQueryResults.size(); ++i) { | 1419 for (unsigned i = 0; i < m_viewportDependentMediaQueryResults.size(); ++i) { |
| 1420 if (m_medium->eval(&m_viewportDependentMediaQueryResults[i]->m_expressio
n) != m_viewportDependentMediaQueryResults[i]->m_result) | 1420 if (m_medium->eval(&m_viewportDependentMediaQueryResults[i]->m_expressio
n) != m_viewportDependentMediaQueryResults[i]->m_result) |
| 1421 return true; | 1421 return true; |
| 1422 } | 1422 } |
| 1423 return false; | 1423 return false; |
| 1424 } | 1424 } |
| 1425 | 1425 |
| 1426 } // namespace WebCore | 1426 } // namespace WebCore |
| OLD | NEW |