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

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

Issue 22707006: Web Animations CSS: Assert underlying value is not used (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Review changes Created 7 years, 4 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « Source/core/animation/KeyframeAnimationEffectTest.cpp ('k') | 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 1144 matching lines...) Expand 10 before | Expand all | Expand 10 after
1155 1155
1156 for (size_t i = 0; i < animations.size(); ++i) { 1156 for (size_t i = 0; i < animations.size(); ++i) {
1157 RefPtr<Animation> animation = animations.at(i); 1157 RefPtr<Animation> animation = animations.at(i);
1158 if (update && update->isFiltered(animation->player())) 1158 if (update && update->isFiltered(animation->player()))
1159 continue; 1159 continue;
1160 const AnimationEffect::CompositableValueMap* compositableValues = animat ion->compositableValues(); 1160 const AnimationEffect::CompositableValueMap* compositableValues = animat ion->compositableValues();
1161 for (AnimationEffect::CompositableValueMap::const_iterator iter = compos itableValues->begin(); iter != compositableValues->end(); ++iter) { 1161 for (AnimationEffect::CompositableValueMap::const_iterator iter = compos itableValues->begin(); iter != compositableValues->end(); ++iter) {
1162 CSSPropertyID property = iter->key; 1162 CSSPropertyID property = iter->key;
1163 if (!isPropertyForPass<pass>(property)) 1163 if (!isPropertyForPass<pass>(property))
1164 continue; 1164 continue;
1165 RefPtr<AnimatableValue> animatableValue = iter->value->compositeOnto (AnimatableValue::neutralValue()); 1165 RELEASE_ASSERT_WITH_MESSAGE(!iter->value->dependsOnUnderlyingValue() , "Not yet implemented: An interface for compositing onto the underlying value." );
1166 RefPtr<AnimatableValue> animatableValue = iter->value->compositeOnto (0);
1166 if (pass == HighPriorityProperties && property == CSSPropertyLineHei ght) 1167 if (pass == HighPriorityProperties && property == CSSPropertyLineHei ght)
1167 state.setLineHeightValue(toAnimatableNumber(animatableValue.get( ))->toCSSValue().get()); 1168 state.setLineHeightValue(toAnimatableNumber(animatableValue.get( ))->toCSSValue().get());
1168 else 1169 else
1169 AnimatedStyleBuilder::applyProperty(property, state, animatableV alue.get()); 1170 AnimatedStyleBuilder::applyProperty(property, state, animatableV alue.get());
1170 } 1171 }
1171 } 1172 }
1172 } 1173 }
1173 1174
1174 // http://dev.w3.org/csswg/css3-regions/#the-at-region-style-rule 1175 // http://dev.w3.org/csswg/css3-regions/#the-at-region-style-rule
1175 // FIXME: add incremental support for other region styling properties. 1176 // FIXME: add incremental support for other region styling properties.
(...skipping 350 matching lines...) Expand 10 before | Expand all | Expand 10 after
1526 m_matchedPropertiesSearches, m_matchedPropertiesHit, m_matchedProperties SharedInheritedHit, m_matchedPropertiesToCache, m_matchedPropertiesEnteredIntoCa che); 1527 m_matchedPropertiesSearches, m_matchedPropertiesHit, m_matchedProperties SharedInheritedHit, m_matchedPropertiesToCache, m_matchedPropertiesEnteredIntoCa che);
1527 1528
1528 fprintf(stderr, "Total:\n"); 1529 fprintf(stderr, "Total:\n");
1529 printStyleStats(m_totalSearches, m_totalElementsEligibleForSharing, m_totalS tylesShared, m_totalSearchFoundSiblingForSharing, m_totalSearchesMissedSharing, 1530 printStyleStats(m_totalSearches, m_totalElementsEligibleForSharing, m_totalS tylesShared, m_totalSearchFoundSiblingForSharing, m_totalSearchesMissedSharing,
1530 m_totalMatchedPropertiesSearches, m_totalMatchedPropertiesHit, m_totalMa tchedPropertiesSharedInheritedHit, m_totalMatchedPropertiesToCache, m_totalMatch edPropertiesEnteredIntoCache); 1531 m_totalMatchedPropertiesSearches, m_totalMatchedPropertiesHit, m_totalMa tchedPropertiesSharedInheritedHit, m_totalMatchedPropertiesToCache, m_totalMatch edPropertiesEnteredIntoCache);
1531 fprintf(stderr, "----------------------------------------------------------- ---------------------\n"); 1532 fprintf(stderr, "----------------------------------------------------------- ---------------------\n");
1532 } 1533 }
1533 #endif 1534 #endif
1534 1535
1535 } // namespace WebCore 1536 } // namespace WebCore
OLDNEW
« no previous file with comments | « Source/core/animation/KeyframeAnimationEffectTest.cpp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698