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

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

Issue 273683005: Web Animations API: Deferred computation of interpolated values (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Add missing test file Created 6 years, 7 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/css/resolver/StyleResolver.h ('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 737 matching lines...) Expand 10 before | Expand all | Expand 10 after
748 748
749 loadPendingResources(state); 749 loadPendingResources(state);
750 750
751 didAccess(); 751 didAccess();
752 752
753 return state.takeStyle(); 753 return state.takeStyle();
754 } 754 }
755 755
756 // This function is used by the WebAnimations JavaScript API method animate(). 756 // This function is used by the WebAnimations JavaScript API method animate().
757 // FIXME: Remove this when animate() switches away from resolution-dependent par sing. 757 // FIXME: Remove this when animate() switches away from resolution-dependent par sing.
758 PassRefPtrWillBeRawPtr<AnimatableValue> StyleResolver::createAnimatableValueSnap shot(Element& element, CSSPropertyID property, CSSValue* value) 758 PassRefPtrWillBeRawPtr<AnimatableValue> StyleResolver::applyAndSnapshotAnimatabl eValue(Element& element, CSSPropertyID property, CSSValue& value, RenderStyle* m utableStyle)
759 { 759 {
760 // We use a fresh RenderStyle here because certain values (eg. background-po sition) won't always completely replace the previously applied property. 760 RefPtr<RenderStyle> style;
761 RefPtr<RenderStyle> style = element.renderStyle() ? RenderStyle::clone(eleme nt.renderStyle()) : RenderStyle::create(); 761 if (mutableStyle)
762 style = mutableStyle;
763 else if (element.renderStyle())
764 style = RenderStyle::clone(element.renderStyle());
765 else
766 style = RenderStyle::create();
762 StyleResolverState state(element.document(), &element); 767 StyleResolverState state(element.document(), &element);
763 state.setStyle(style.get()); 768 state.setStyle(style.get());
764 state.fontBuilder().initForStyleResolve(state.document(), state.style(), sta te.useSVGZoomRules()); 769 state.fontBuilder().initForStyleResolve(state.document(), state.style(), sta te.useSVGZoomRules());
765 StyleBuilder::applyProperty(property, state, value); 770 StyleBuilder::applyProperty(property, state, &value);
766 return CSSAnimatableValueFactory::create(property, *style); 771 return CSSAnimatableValueFactory::create(property, *style);
767 } 772 }
768 773
769 PassRefPtr<PseudoElement> StyleResolver::createPseudoElementIfNeeded(Element& pa rent, PseudoId pseudoId) 774 PassRefPtr<PseudoElement> StyleResolver::createPseudoElementIfNeeded(Element& pa rent, PseudoId pseudoId)
770 { 775 {
771 RenderObject* parentRenderer = parent.renderer(); 776 RenderObject* parentRenderer = parent.renderer();
772 if (!parentRenderer) 777 if (!parentRenderer)
773 return nullptr; 778 return nullptr;
774 779
775 if (pseudoId < FIRST_INTERNAL_PSEUDOID && !parentRenderer->style()->hasPseud oStyle(pseudoId)) 780 if (pseudoId < FIRST_INTERNAL_PSEUDOID && !parentRenderer->style()->hasPseud oStyle(pseudoId))
(...skipping 723 matching lines...) Expand 10 before | Expand all | Expand 10 after
1499 visitor->trace(m_viewportStyleResolver); 1504 visitor->trace(m_viewportStyleResolver);
1500 visitor->trace(m_siblingRuleSet); 1505 visitor->trace(m_siblingRuleSet);
1501 visitor->trace(m_uncommonAttributeRuleSet); 1506 visitor->trace(m_uncommonAttributeRuleSet);
1502 visitor->trace(m_watchedSelectorsRules); 1507 visitor->trace(m_watchedSelectorsRules);
1503 visitor->trace(m_treeBoundaryCrossingRules); 1508 visitor->trace(m_treeBoundaryCrossingRules);
1504 visitor->trace(m_pendingStyleSheets); 1509 visitor->trace(m_pendingStyleSheets);
1505 CSSFontSelectorClient::trace(visitor); 1510 CSSFontSelectorClient::trace(visitor);
1506 } 1511 }
1507 1512
1508 } // namespace WebCore 1513 } // namespace WebCore
OLDNEW
« no previous file with comments | « Source/core/css/resolver/StyleResolver.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698