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

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

Issue 22799020: Web Animations CSS: Support Animation of StyleImage and LengthBox (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Update length conversion for keywords. Created 7 years, 3 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
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 818 matching lines...) Expand 10 before | Expand all | Expand 10 after
829 RefPtr<Keyframe> firstOffsetKeyframe; 829 RefPtr<Keyframe> firstOffsetKeyframe;
830 for (size_t j = 0; j < offsets.size(); ++j) { 830 for (size_t j = 0; j < offsets.size(); ++j) {
831 RefPtr<Keyframe> keyframe = Keyframe::create(); 831 RefPtr<Keyframe> keyframe = Keyframe::create();
832 keyframe->setOffset(offsets[j]); 832 keyframe->setOffset(offsets[j]);
833 const StylePropertySet* properties = styleKeyframe->properties(); 833 const StylePropertySet* properties = styleKeyframe->properties();
834 for (unsigned k = 0; k < properties->propertyCount(); k++) { 834 for (unsigned k = 0; k < properties->propertyCount(); k++) {
835 CSSPropertyID property = properties->propertyAt(k).id(); 835 CSSPropertyID property = properties->propertyAt(k).id();
836 // FIXME: Build the correct chained timing function when this pr operty is specified. 836 // FIXME: Build the correct chained timing function when this pr operty is specified.
837 if (property == CSSPropertyWebkitAnimationTimingFunction || prop erty == CSSPropertyAnimationTimingFunction) 837 if (property == CSSPropertyWebkitAnimationTimingFunction || prop erty == CSSPropertyAnimationTimingFunction)
838 continue; 838 continue;
839 if (!CSSAnimations::isAnimatableProperty(property))
840 continue;
839 keyframe->setPropertyValue(property, firstOffsetKeyframe ? first OffsetKeyframe->propertyValue(property) : CSSAnimatableValueFactory::create(prop erty, keyframeStyle.get()).get()); 841 keyframe->setPropertyValue(property, firstOffsetKeyframe ? first OffsetKeyframe->propertyValue(property) : CSSAnimatableValueFactory::create(prop erty, keyframeStyle.get()).get());
840 } 842 }
841 if (!firstOffsetKeyframe) 843 if (!firstOffsetKeyframe)
842 firstOffsetKeyframe = keyframe; 844 firstOffsetKeyframe = keyframe;
843 keyframes.append(keyframe); 845 keyframes.append(keyframe);
844 } 846 }
845 } 847 }
846 848
847 if (keyframes.isEmpty()) 849 if (keyframes.isEmpty())
848 return; 850 return;
(...skipping 689 matching lines...) Expand 10 before | Expand all | Expand 10 after
1538 m_matchedPropertiesSearches, m_matchedPropertiesHit, m_matchedProperties SharedInheritedHit, m_matchedPropertiesToCache, m_matchedPropertiesEnteredIntoCa che); 1540 m_matchedPropertiesSearches, m_matchedPropertiesHit, m_matchedProperties SharedInheritedHit, m_matchedPropertiesToCache, m_matchedPropertiesEnteredIntoCa che);
1539 1541
1540 fprintf(stderr, "Total:\n"); 1542 fprintf(stderr, "Total:\n");
1541 printStyleStats(m_totalSearches, m_totalElementsEligibleForSharing, m_totalS tylesShared, m_totalSearchFoundSiblingForSharing, m_totalSearchesMissedSharing, 1543 printStyleStats(m_totalSearches, m_totalElementsEligibleForSharing, m_totalS tylesShared, m_totalSearchFoundSiblingForSharing, m_totalSearchesMissedSharing,
1542 m_totalMatchedPropertiesSearches, m_totalMatchedPropertiesHit, m_totalMa tchedPropertiesSharedInheritedHit, m_totalMatchedPropertiesToCache, m_totalMatch edPropertiesEnteredIntoCache); 1544 m_totalMatchedPropertiesSearches, m_totalMatchedPropertiesHit, m_totalMa tchedPropertiesSharedInheritedHit, m_totalMatchedPropertiesToCache, m_totalMatch edPropertiesEnteredIntoCache);
1543 fprintf(stderr, "----------------------------------------------------------- ---------------------\n"); 1545 fprintf(stderr, "----------------------------------------------------------- ---------------------\n");
1544 } 1546 }
1545 #endif 1547 #endif
1546 1548
1547 } // namespace WebCore 1549 } // namespace WebCore
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698