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

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

Issue 194733002: Web Animations: Use StringKeyframes for element.animate() (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Rebased Created 6 years, 8 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 769 matching lines...) Expand 10 before | Expand all | Expand 10 after
780 780
781 loadPendingResources(state); 781 loadPendingResources(state);
782 782
783 didAccess(); 783 didAccess();
784 784
785 return state.takeStyle(); 785 return state.takeStyle();
786 } 786 }
787 787
788 // This function is used by the WebAnimations JavaScript API method animate(). 788 // This function is used by the WebAnimations JavaScript API method animate().
789 // FIXME: Remove this when animate() switches away from resolution-dependent par sing. 789 // FIXME: Remove this when animate() switches away from resolution-dependent par sing.
790 PassRefPtrWillBeRawPtr<AnimatableValueKeyframeEffectModel> StyleResolver::create KeyframeEffectModel(Element& element, const WillBeHeapVector<RefPtrWillBeMember< MutableStylePropertySet> >& propertySetVector, AnimatableValueKeyframeVector& ke yframes) 790 PassRefPtrWillBeRawPtr<AnimatableValue> StyleResolver::createAnimatableValueSnap shot(Element& element, RenderStyle& style, CSSPropertyID property, CSSValue* val ue)
791 { 791 {
792 ASSERT(propertySetVector.size() == keyframes.size());
793
794 StyleResolverState state(element.document(), &element); 792 StyleResolverState state(element.document(), &element);
795 state.setStyle(RenderStyle::create()); 793 state.setStyle(&style);
796 state.fontBuilder().initForStyleResolve(state.document(), state.style(), sta te.useSVGZoomRules()); 794 state.fontBuilder().initForStyleResolve(state.document(), state.style(), sta te.useSVGZoomRules());
797 795 StyleBuilder::applyProperty(property, state, value);
798 for (unsigned i = 0; i < propertySetVector.size(); ++i) { 796 return CSSAnimatableValueFactory::create(property, style);
799 for (unsigned j = 0; j < propertySetVector[i]->propertyCount(); ++j) {
800 CSSPropertyID id = propertySetVector[i]->propertyAt(j).id();
801 StyleBuilder::applyProperty(id, state, propertySetVector[i]->getProp ertyCSSValue(id).get());
802 keyframes[i]->setPropertyValue(id, CSSAnimatableValueFactory::create (id, *state.style()).get());
803 }
804 }
805 return AnimatableValueKeyframeEffectModel::create(keyframes);
806 } 797 }
807 798
808 PassRefPtr<PseudoElement> StyleResolver::createPseudoElementIfNeeded(Element& pa rent, PseudoId pseudoId) 799 PassRefPtr<PseudoElement> StyleResolver::createPseudoElementIfNeeded(Element& pa rent, PseudoId pseudoId)
809 { 800 {
810 RenderObject* parentRenderer = parent.renderer(); 801 RenderObject* parentRenderer = parent.renderer();
811 if (!parentRenderer) 802 if (!parentRenderer)
812 return nullptr; 803 return nullptr;
813 804
814 if (pseudoId < FIRST_INTERNAL_PSEUDOID && !parentRenderer->style()->hasPseud oStyle(pseudoId)) 805 if (pseudoId < FIRST_INTERNAL_PSEUDOID && !parentRenderer->style()->hasPseud oStyle(pseudoId))
815 return nullptr; 806 return nullptr;
(...skipping 603 matching lines...) Expand 10 before | Expand all | Expand 10 after
1419 visitor->trace(m_keyframesRuleMap); 1410 visitor->trace(m_keyframesRuleMap);
1420 visitor->trace(m_viewportDependentMediaQueryResults); 1411 visitor->trace(m_viewportDependentMediaQueryResults);
1421 visitor->trace(m_viewportStyleResolver); 1412 visitor->trace(m_viewportStyleResolver);
1422 visitor->trace(m_siblingRuleSet); 1413 visitor->trace(m_siblingRuleSet);
1423 visitor->trace(m_uncommonAttributeRuleSet); 1414 visitor->trace(m_uncommonAttributeRuleSet);
1424 visitor->trace(m_watchedSelectorsRules); 1415 visitor->trace(m_watchedSelectorsRules);
1425 visitor->trace(m_treeBoundaryCrossingRules); 1416 visitor->trace(m_treeBoundaryCrossingRules);
1426 } 1417 }
1427 1418
1428 } // namespace WebCore 1419 } // namespace WebCore
OLDNEW
« Source/core/animation/StringKeyframe.cpp ('K') | « Source/core/css/resolver/StyleResolver.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698