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

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

Issue 1305383006: Oilpan: Unship CSSValues and AnimatableValues Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 5 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 659 matching lines...) Expand 10 before | Expand all | Expand 10 after
670 670
671 if (state.style()->hasRemUnits()) 671 if (state.style()->hasRemUnits())
672 document().styleEngine().setUsesRemUnit(true); 672 document().styleEngine().setUsesRemUnit(true);
673 673
674 // Now return the style. 674 // Now return the style.
675 return state.takeStyle(); 675 return state.takeStyle();
676 } 676 }
677 677
678 // This function is used by the WebAnimations JavaScript API method animate(). 678 // This function is used by the WebAnimations JavaScript API method animate().
679 // FIXME: Remove this when animate() switches away from resolution-dependent par sing. 679 // FIXME: Remove this when animate() switches away from resolution-dependent par sing.
680 PassRefPtrWillBeRawPtr<AnimatableValue> StyleResolver::createAnimatableValueSnap shot(Element& element, const ComputedStyle* baseStyle, CSSPropertyID property, C SSValue* value) 680 PassRefPtr<AnimatableValue> StyleResolver::createAnimatableValueSnapshot(Element & element, const ComputedStyle* baseStyle, CSSPropertyID property, CSSValue* val ue)
681 { 681 {
682 StyleResolverState state(element.document(), &element); 682 StyleResolverState state(element.document(), &element);
683 state.setStyle(baseStyle ? ComputedStyle::clone(*baseStyle) : ComputedStyle: :create()); 683 state.setStyle(baseStyle ? ComputedStyle::clone(*baseStyle) : ComputedStyle: :create());
684 return createAnimatableValueSnapshot(state, property, value); 684 return createAnimatableValueSnapshot(state, property, value);
685 } 685 }
686 686
687 PassRefPtrWillBeRawPtr<AnimatableValue> StyleResolver::createAnimatableValueSnap shot(StyleResolverState& state, CSSPropertyID property, CSSValue* value) 687 PassRefPtr<AnimatableValue> StyleResolver::createAnimatableValueSnapshot(StyleRe solverState& state, CSSPropertyID property, CSSValue* value)
688 { 688 {
689 if (value) { 689 if (value) {
690 StyleBuilder::applyProperty(property, state, value); 690 StyleBuilder::applyProperty(property, state, value);
691 state.fontBuilder().createFont(state.document().styleEngine().fontSelect or(), state.mutableStyleRef()); 691 state.fontBuilder().createFont(state.document().styleEngine().fontSelect or(), state.mutableStyleRef());
692 } 692 }
693 return CSSAnimatableValueFactory::create(property, *state.style()); 693 return CSSAnimatableValueFactory::create(property, *state.style());
694 } 694 }
695 695
696 PassRefPtrWillBeRawPtr<PseudoElement> StyleResolver::createPseudoElement(Element * parent, PseudoId pseudoId) 696 PassRefPtrWillBeRawPtr<PseudoElement> StyleResolver::createPseudoElement(Element * parent, PseudoId pseudoId)
697 { 697 {
(...skipping 827 matching lines...) Expand 10 before | Expand all | Expand 10 after
1525 visitor->trace(m_watchedSelectorsRules); 1525 visitor->trace(m_watchedSelectorsRules);
1526 visitor->trace(m_treeBoundaryCrossingScopes); 1526 visitor->trace(m_treeBoundaryCrossingScopes);
1527 visitor->trace(m_styleResourceLoader); 1527 visitor->trace(m_styleResourceLoader);
1528 visitor->trace(m_styleSharingLists); 1528 visitor->trace(m_styleSharingLists);
1529 visitor->trace(m_pendingStyleSheets); 1529 visitor->trace(m_pendingStyleSheets);
1530 visitor->trace(m_document); 1530 visitor->trace(m_document);
1531 #endif 1531 #endif
1532 } 1532 }
1533 1533
1534 } // namespace blink 1534 } // namespace blink
OLDNEW
« no previous file with comments | « Source/core/css/resolver/StyleResolver.h ('k') | Source/core/css/resolver/ViewportStyleResolver.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698