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 811 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
822 // single value on a ComputedStyle. | 822 // single value on a ComputedStyle. |
823 StyleResolverState state(element.GetDocument(), &element, parent_style, | 823 StyleResolverState state(element.GetDocument(), &element, parent_style, |
824 parent_style); | 824 parent_style); |
825 state.SetStyle(ComputedStyle::Clone(base_style)); | 825 state.SetStyle(ComputedStyle::Clone(base_style)); |
826 if (value) { | 826 if (value) { |
827 StyleBuilder::ApplyProperty(property, state, *value); | 827 StyleBuilder::ApplyProperty(property, state, *value); |
828 state.GetFontBuilder().CreateFont( | 828 state.GetFontBuilder().CreateFont( |
829 state.GetDocument().GetStyleEngine().FontSelector(), | 829 state.GetDocument().GetStyleEngine().FontSelector(), |
830 state.MutableStyleRef()); | 830 state.MutableStyleRef()); |
831 } | 831 } |
832 return CSSAnimatableValueFactory::Create(PropertyHandle(property), | 832 return CSSAnimatableValueFactory::Create(property, *state.Style()); |
833 *state.Style()); | |
834 } | 833 } |
835 | 834 |
836 PseudoElement* StyleResolver::CreatePseudoElement(Element* parent, | 835 PseudoElement* StyleResolver::CreatePseudoElement(Element* parent, |
837 PseudoId pseudo_id) { | 836 PseudoId pseudo_id) { |
838 if (pseudo_id == kPseudoIdFirstLetter) | 837 if (pseudo_id == kPseudoIdFirstLetter) |
839 return FirstLetterPseudoElement::Create(parent); | 838 return FirstLetterPseudoElement::Create(parent); |
840 return PseudoElement::Create(parent, pseudo_id); | 839 return PseudoElement::Create(parent, pseudo_id); |
841 } | 840 } |
842 | 841 |
843 PseudoElement* StyleResolver::CreatePseudoElementIfNeeded(Element& parent, | 842 PseudoElement* StyleResolver::CreatePseudoElementIfNeeded(Element& parent, |
(...skipping 1178 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2022 | 2021 |
2023 DEFINE_TRACE(StyleResolver) { | 2022 DEFINE_TRACE(StyleResolver) { |
2024 visitor->Trace(matched_properties_cache_); | 2023 visitor->Trace(matched_properties_cache_); |
2025 visitor->Trace(selector_filter_); | 2024 visitor->Trace(selector_filter_); |
2026 visitor->Trace(style_sharing_lists_); | 2025 visitor->Trace(style_sharing_lists_); |
2027 visitor->Trace(document_); | 2026 visitor->Trace(document_); |
2028 visitor->Trace(tracker_); | 2027 visitor->Trace(tracker_); |
2029 } | 2028 } |
2030 | 2029 |
2031 } // namespace blink | 2030 } // namespace blink |
OLD | NEW |