| OLD | NEW |
| 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. | 5 * Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 Apple Inc. |
| 6 * All rights reserved. | 6 * All rights reserved. |
| 7 * Copyright (C) 2007 Alexey Proskuryakov <ap@webkit.org> | 7 * Copyright (C) 2007 Alexey Proskuryakov <ap@webkit.org> |
| 8 * Copyright (C) 2007, 2008 Eric Seidel <eric@webkit.org> | 8 * Copyright (C) 2007, 2008 Eric Seidel <eric@webkit.org> |
| 9 * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved. | 9 * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved. |
| 10 * (http://www.torchmobile.com/) | 10 * (http://www.torchmobile.com/) |
| (...skipping 788 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 799 // TODO(alancutter): Avoid creating a StyleResolverState just to apply a | 799 // TODO(alancutter): Avoid creating a StyleResolverState just to apply a |
| 800 // single value on a ComputedStyle. | 800 // single value on a ComputedStyle. |
| 801 StyleResolverState state(element.document(), &element, parentStyle, | 801 StyleResolverState state(element.document(), &element, parentStyle, |
| 802 parentStyle); | 802 parentStyle); |
| 803 state.setStyle(ComputedStyle::clone(baseStyle)); | 803 state.setStyle(ComputedStyle::clone(baseStyle)); |
| 804 if (value) { | 804 if (value) { |
| 805 StyleBuilder::applyProperty(property, state, *value); | 805 StyleBuilder::applyProperty(property, state, *value); |
| 806 state.fontBuilder().createFont( | 806 state.fontBuilder().createFont( |
| 807 state.document().styleEngine().fontSelector(), state.mutableStyleRef()); | 807 state.document().styleEngine().fontSelector(), state.mutableStyleRef()); |
| 808 } | 808 } |
| 809 return CSSAnimatableValueFactory::create(property, *state.style()); | 809 return CSSAnimatableValueFactory::create(PropertyHandle(property), |
| 810 *state.style()); |
| 810 } | 811 } |
| 811 | 812 |
| 812 PseudoElement* StyleResolver::createPseudoElement(Element* parent, | 813 PseudoElement* StyleResolver::createPseudoElement(Element* parent, |
| 813 PseudoId pseudoId) { | 814 PseudoId pseudoId) { |
| 814 if (pseudoId == PseudoIdFirstLetter) | 815 if (pseudoId == PseudoIdFirstLetter) |
| 815 return FirstLetterPseudoElement::create(parent); | 816 return FirstLetterPseudoElement::create(parent); |
| 816 return PseudoElement::create(parent, pseudoId); | 817 return PseudoElement::create(parent, pseudoId); |
| 817 } | 818 } |
| 818 | 819 |
| 819 PseudoElement* StyleResolver::createPseudoElementIfNeeded(Element& parent, | 820 PseudoElement* StyleResolver::createPseudoElementIfNeeded(Element& parent, |
| (...skipping 1125 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1945 | 1946 |
| 1946 DEFINE_TRACE(StyleResolver) { | 1947 DEFINE_TRACE(StyleResolver) { |
| 1947 visitor->trace(m_matchedPropertiesCache); | 1948 visitor->trace(m_matchedPropertiesCache); |
| 1948 visitor->trace(m_selectorFilter); | 1949 visitor->trace(m_selectorFilter); |
| 1949 visitor->trace(m_styleSharingLists); | 1950 visitor->trace(m_styleSharingLists); |
| 1950 visitor->trace(m_document); | 1951 visitor->trace(m_document); |
| 1951 visitor->trace(m_tracker); | 1952 visitor->trace(m_tracker); |
| 1952 } | 1953 } |
| 1953 | 1954 |
| 1954 } // namespace blink | 1955 } // namespace blink |
| OLD | NEW |