| 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.
       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 670 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 681 | 681 | 
| 682     loadPendingResources(state); | 682     loadPendingResources(state); | 
| 683 | 683 | 
| 684     didAccess(); | 684     didAccess(); | 
| 685 | 685 | 
| 686     return state.takeStyle(); | 686     return state.takeStyle(); | 
| 687 } | 687 } | 
| 688 | 688 | 
| 689 // This function is used by the WebAnimations JavaScript API method animate(). | 689 // This function is used by the WebAnimations JavaScript API method animate(). | 
| 690 // FIXME: Remove this when animate() switches away from resolution-dependent par
      sing. | 690 // FIXME: Remove this when animate() switches away from resolution-dependent par
      sing. | 
| 691 PassRefPtrWillBeRawPtr<AnimatableValue> StyleResolver::createAnimatableValueSnap
      shot(Element& element, const ComputedStyle* baseStyle, CSSPropertyID property, C
      SSValue* value) | 691 AnimatableValue* StyleResolver::createAnimatableValueSnapshot(Element& element, 
      const ComputedStyle* baseStyle, CSSPropertyID property, CSSValue* value) | 
| 692 { | 692 { | 
| 693     StyleResolverState state(element.document(), &element); | 693     StyleResolverState state(element.document(), &element); | 
| 694     state.setStyle(baseStyle ? ComputedStyle::clone(*baseStyle) : ComputedStyle:
      :create()); | 694     state.setStyle(baseStyle ? ComputedStyle::clone(*baseStyle) : ComputedStyle:
      :create()); | 
| 695     return createAnimatableValueSnapshot(state, property, value); | 695     return createAnimatableValueSnapshot(state, property, value); | 
| 696 } | 696 } | 
| 697 | 697 | 
| 698 PassRefPtrWillBeRawPtr<AnimatableValue> StyleResolver::createAnimatableValueSnap
      shot(StyleResolverState& state, CSSPropertyID property, CSSValue* value) | 698 AnimatableValue* StyleResolver::createAnimatableValueSnapshot(StyleResolverState
      & state, CSSPropertyID property, CSSValue* value) | 
| 699 { | 699 { | 
| 700     if (value) { | 700     if (value) { | 
| 701         StyleBuilder::applyProperty(property, state, value); | 701         StyleBuilder::applyProperty(property, state, value); | 
| 702         state.fontBuilder().createFont(state.document().styleEngine().fontSelect
      or(), state.mutableStyleRef()); | 702         state.fontBuilder().createFont(state.document().styleEngine().fontSelect
      or(), state.mutableStyleRef()); | 
| 703     } | 703     } | 
| 704     return CSSAnimatableValueFactory::create(property, *state.style()); | 704     return CSSAnimatableValueFactory::create(property, *state.style()); | 
| 705 } | 705 } | 
| 706 | 706 | 
| 707 PassRefPtrWillBeRawPtr<PseudoElement> StyleResolver::createPseudoElement(Element
      * parent, PseudoId pseudoId) | 707 PassRefPtrWillBeRawPtr<PseudoElement> StyleResolver::createPseudoElement(Element
      * parent, PseudoId pseudoId) | 
| 708 { | 708 { | 
| (...skipping 283 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 992         resolvers.append(scopedResolver); | 992         resolvers.append(scopedResolver); | 
| 993 | 993 | 
| 994     for (size_t i = 0; i < resolvers.size(); ++i) { | 994     for (size_t i = 0; i < resolvers.size(); ++i) { | 
| 995         if (StyleRuleKeyframes* keyframesRule = resolvers[i]->keyframeStylesForA
      nimation(animationName.impl())) | 995         if (StyleRuleKeyframes* keyframesRule = resolvers[i]->keyframeStylesForA
      nimation(animationName.impl())) | 
| 996             return keyframesRule; | 996             return keyframesRule; | 
| 997     } | 997     } | 
| 998     return nullptr; | 998     return nullptr; | 
| 999 } | 999 } | 
| 1000 | 1000 | 
| 1001 template <CSSPropertyPriority priority> | 1001 template <CSSPropertyPriority priority> | 
| 1002 void StyleResolver::applyAnimatedProperties(StyleResolverState& state, const Wil
      lBeHeapHashMap<PropertyHandle, RefPtrWillBeMember<Interpolation>>& activeInterpo
      lations) | 1002 void StyleResolver::applyAnimatedProperties(StyleResolverState& state, const Hea
      pHashMap<PropertyHandle, Member<Interpolation>>& activeInterpolations) | 
| 1003 { | 1003 { | 
| 1004     for (const auto& interpolationEntry : activeInterpolations) { | 1004     for (const auto& interpolationEntry : activeInterpolations) { | 
| 1005         if (!interpolationEntry.key.isCSSProperty()) | 1005         if (!interpolationEntry.key.isCSSProperty()) | 
| 1006             continue; | 1006             continue; | 
| 1007         CSSPropertyID property = interpolationEntry.key.cssProperty(); | 1007         CSSPropertyID property = interpolationEntry.key.cssProperty(); | 
| 1008         if (!CSSPropertyPriorityData<priority>::propertyHasPriority(property)) | 1008         if (!CSSPropertyPriorityData<priority>::propertyHasPriority(property)) | 
| 1009             continue; | 1009             continue; | 
| 1010         const StyleInterpolation* interpolation = toStyleInterpolation(interpola
      tionEntry.value.get()); | 1010         const StyleInterpolation* interpolation = toStyleInterpolation(interpola
      tionEntry.value.get()); | 
| 1011         interpolation->apply(state); | 1011         interpolation->apply(state); | 
| 1012     } | 1012     } | 
| (...skipping 469 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 1482     visitor->trace(m_watchedSelectorsRules); | 1482     visitor->trace(m_watchedSelectorsRules); | 
| 1483     visitor->trace(m_treeBoundaryCrossingRules); | 1483     visitor->trace(m_treeBoundaryCrossingRules); | 
| 1484     visitor->trace(m_styleResourceLoader); | 1484     visitor->trace(m_styleResourceLoader); | 
| 1485     visitor->trace(m_styleSharingLists); | 1485     visitor->trace(m_styleSharingLists); | 
| 1486     visitor->trace(m_pendingStyleSheets); | 1486     visitor->trace(m_pendingStyleSheets); | 
| 1487     visitor->trace(m_document); | 1487     visitor->trace(m_document); | 
| 1488 #endif | 1488 #endif | 
| 1489 } | 1489 } | 
| 1490 | 1490 | 
| 1491 } // namespace blink | 1491 } // namespace blink | 
| OLD | NEW | 
|---|