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

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: Support animation of clip:' 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
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 811 matching lines...) Expand 10 before | Expand all | Expand 10 after
822 RefPtr<Keyframe> firstOffsetKeyframe; 822 RefPtr<Keyframe> firstOffsetKeyframe;
823 for (size_t j = 0; j < offsets.size(); ++j) { 823 for (size_t j = 0; j < offsets.size(); ++j) {
824 RefPtr<Keyframe> keyframe = Keyframe::create(); 824 RefPtr<Keyframe> keyframe = Keyframe::create();
825 keyframe->setOffset(offsets[j]); 825 keyframe->setOffset(offsets[j]);
826 const StylePropertySet* properties = styleKeyframe->properties(); 826 const StylePropertySet* properties = styleKeyframe->properties();
827 for (unsigned k = 0; k < properties->propertyCount(); k++) { 827 for (unsigned k = 0; k < properties->propertyCount(); k++) {
828 CSSPropertyID property = properties->propertyAt(k).id(); 828 CSSPropertyID property = properties->propertyAt(k).id();
829 // FIXME: Build the correct chained timing function when this pr operty is specified. 829 // FIXME: Build the correct chained timing function when this pr operty is specified.
830 if (property == CSSPropertyWebkitAnimationTimingFunction || prop erty == CSSPropertyAnimationTimingFunction) 830 if (property == CSSPropertyWebkitAnimationTimingFunction || prop erty == CSSPropertyAnimationTimingFunction)
831 continue; 831 continue;
832 if (!CSSAnimations::isAnimatableProperty(property))
833 continue;
832 keyframe->setPropertyValue(property, firstOffsetKeyframe ? first OffsetKeyframe->propertyValue(property) : CSSAnimatableValueFactory::create(prop erty, keyframeStyle.get()).get()); 834 keyframe->setPropertyValue(property, firstOffsetKeyframe ? first OffsetKeyframe->propertyValue(property) : CSSAnimatableValueFactory::create(prop erty, keyframeStyle.get()).get());
833 } 835 }
834 if (!firstOffsetKeyframe) 836 if (!firstOffsetKeyframe)
835 firstOffsetKeyframe = keyframe; 837 firstOffsetKeyframe = keyframe;
836 keyframes.append(keyframe); 838 keyframes.append(keyframe);
837 } 839 }
838 } 840 }
839 841
840 if (keyframes.isEmpty()) 842 if (keyframes.isEmpty())
841 return; 843 return;
(...skipping 689 matching lines...) Expand 10 before | Expand all | Expand 10 after
1531 m_matchedPropertiesSearches, m_matchedPropertiesHit, m_matchedProperties SharedInheritedHit, m_matchedPropertiesToCache, m_matchedPropertiesEnteredIntoCa che); 1533 m_matchedPropertiesSearches, m_matchedPropertiesHit, m_matchedProperties SharedInheritedHit, m_matchedPropertiesToCache, m_matchedPropertiesEnteredIntoCa che);
1532 1534
1533 fprintf(stderr, "Total:\n"); 1535 fprintf(stderr, "Total:\n");
1534 printStyleStats(m_totalSearches, m_totalElementsEligibleForSharing, m_totalS tylesShared, m_totalSearchFoundSiblingForSharing, m_totalSearchesMissedSharing, 1536 printStyleStats(m_totalSearches, m_totalElementsEligibleForSharing, m_totalS tylesShared, m_totalSearchFoundSiblingForSharing, m_totalSearchesMissedSharing,
1535 m_totalMatchedPropertiesSearches, m_totalMatchedPropertiesHit, m_totalMa tchedPropertiesSharedInheritedHit, m_totalMatchedPropertiesToCache, m_totalMatch edPropertiesEnteredIntoCache); 1537 m_totalMatchedPropertiesSearches, m_totalMatchedPropertiesHit, m_totalMa tchedPropertiesSharedInheritedHit, m_totalMatchedPropertiesToCache, m_totalMatch edPropertiesEnteredIntoCache);
1536 fprintf(stderr, "----------------------------------------------------------- ---------------------\n"); 1538 fprintf(stderr, "----------------------------------------------------------- ---------------------\n");
1537 } 1539 }
1538 #endif 1540 #endif
1539 1541
1540 } // namespace WebCore 1542 } // namespace WebCore
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698