| 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 1202 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1213 | 1213 |
| 1214 if (!update) | 1214 if (!update) |
| 1215 return didApply; | 1215 return didApply; |
| 1216 | 1216 |
| 1217 // FIXME: Remove this repetition by incorporating a merge of newAnimations w
ith AnimationStack. | 1217 // FIXME: Remove this repetition by incorporating a merge of newAnimations w
ith AnimationStack. |
| 1218 // Then resolve the stack before calling applyAnimatedProperties, eg. | 1218 // Then resolve the stack before calling applyAnimatedProperties, eg. |
| 1219 // CompositableValueMap* resolved = timeline->animationStack()->resolveW
ith(newAnimations); | 1219 // CompositableValueMap* resolved = timeline->animationStack()->resolveW
ith(newAnimations); |
| 1220 // applyAnimatedProperties(state, resolved); | 1220 // applyAnimatedProperties(state, resolved); |
| 1221 const Vector<CSSAnimationUpdate::NewAnimation>& newAnimations = update->newA
nimations(); | 1221 const Vector<CSSAnimationUpdate::NewAnimation>& newAnimations = update->newA
nimations(); |
| 1222 for (size_t i = 0; i < newAnimations.size(); ++i) { | 1222 for (size_t i = 0; i < newAnimations.size(); ++i) { |
| 1223 RefPtr<InertAnimation> animation = newAnimations.at(i).animation; | 1223 const HashSet<RefPtr<InertAnimation> >& animations = newAnimations.at(i)
.animations; |
| 1224 OwnPtr<AnimationEffect::CompositableValueMap> compositableValues = anima
tion->sample(); | 1224 for (HashSet<RefPtr<InertAnimation> >::const_iterator animationsIter = a
nimations.begin(); animationsIter != animations.end(); ++animationsIter) { |
| 1225 if (!compositableValues) | 1225 OwnPtr<AnimationEffect::CompositableValueMap> compositableValues = (
*animationsIter)->sample(); |
| 1226 continue; | 1226 if (!compositableValues) |
| 1227 for (AnimationEffect::CompositableValueMap::const_iterator iter = compos
itableValues->begin(); iter != compositableValues->end(); ++iter) { | |
| 1228 CSSPropertyID property = iter->key; | |
| 1229 if (!isPropertyForPass<pass>(property)) | |
| 1230 continue; | 1227 continue; |
| 1231 RefPtr<AnimatableValue> animatableValue = iter->value->compositeOnto
(AnimatableValue::neutralValue()); | 1228 for (AnimationEffect::CompositableValueMap::const_iterator iter = co
mpositableValues->begin(); iter != compositableValues->end(); ++iter) { |
| 1232 if (pass == HighPriorityProperties && property == CSSPropertyLineHei
ght) | 1229 CSSPropertyID property = iter->key; |
| 1233 state.setLineHeightValue(toAnimatableNumber(animatableValue.get(
))->toCSSValue().get()); | 1230 if (!isPropertyForPass<pass>(property)) |
| 1234 else | 1231 continue; |
| 1235 AnimatedStyleBuilder::applyProperty(property, state, animatableV
alue.get()); | 1232 RefPtr<AnimatableValue> animatableValue = iter->value->composite
Onto(AnimatableValue::neutralValue()); |
| 1236 didApply = true; | 1233 if (pass == HighPriorityProperties && property == CSSPropertyLin
eHeight) |
| 1234 state.setLineHeightValue(toAnimatableNumber(animatableValue.
get())->toCSSValue().get()); |
| 1235 else |
| 1236 AnimatedStyleBuilder::applyProperty(property, state, animata
bleValue.get()); |
| 1237 didApply = true; |
| 1238 } |
| 1237 } | 1239 } |
| 1238 } | 1240 } |
| 1239 return didApply; | 1241 return didApply; |
| 1240 } | 1242 } |
| 1241 | 1243 |
| 1242 // http://dev.w3.org/csswg/css3-regions/#the-at-region-style-rule | 1244 // http://dev.w3.org/csswg/css3-regions/#the-at-region-style-rule |
| 1243 // FIXME: add incremental support for other region styling properties. | 1245 // FIXME: add incremental support for other region styling properties. |
| 1244 static inline bool isValidRegionStyleProperty(CSSPropertyID id) | 1246 static inline bool isValidRegionStyleProperty(CSSPropertyID id) |
| 1245 { | 1247 { |
| 1246 switch (id) { | 1248 switch (id) { |
| (...skipping 356 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1603 m_matchedPropertiesSearches, m_matchedPropertiesHit, m_matchedProperties
SharedInheritedHit, m_matchedPropertiesToCache, m_matchedPropertiesEnteredIntoCa
che); | 1605 m_matchedPropertiesSearches, m_matchedPropertiesHit, m_matchedProperties
SharedInheritedHit, m_matchedPropertiesToCache, m_matchedPropertiesEnteredIntoCa
che); |
| 1604 | 1606 |
| 1605 fprintf(stderr, "Total:\n"); | 1607 fprintf(stderr, "Total:\n"); |
| 1606 printStyleStats(m_totalSearches, m_totalElementsEligibleForSharing, m_totalS
tylesShared, m_totalSearchFoundSiblingForSharing, m_totalSearchesMissedSharing, | 1608 printStyleStats(m_totalSearches, m_totalElementsEligibleForSharing, m_totalS
tylesShared, m_totalSearchFoundSiblingForSharing, m_totalSearchesMissedSharing, |
| 1607 m_totalMatchedPropertiesSearches, m_totalMatchedPropertiesHit, m_totalMa
tchedPropertiesSharedInheritedHit, m_totalMatchedPropertiesToCache, m_totalMatch
edPropertiesEnteredIntoCache); | 1609 m_totalMatchedPropertiesSearches, m_totalMatchedPropertiesHit, m_totalMa
tchedPropertiesSharedInheritedHit, m_totalMatchedPropertiesToCache, m_totalMatch
edPropertiesEnteredIntoCache); |
| 1608 fprintf(stderr, "-----------------------------------------------------------
---------------------\n"); | 1610 fprintf(stderr, "-----------------------------------------------------------
---------------------\n"); |
| 1609 } | 1611 } |
| 1610 #endif | 1612 #endif |
| 1611 | 1613 |
| 1612 } // namespace WebCore | 1614 } // namespace WebCore |
| OLD | NEW |