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

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

Issue 1312983003: Apply CSS Animations on color properties to visited and unvisited link computed styles (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Fix compile Created 5 years, 4 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 | « LayoutTests/animations/visited-link-color-animation-expected.html ('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 916 matching lines...) Expand 10 before | Expand all | Expand 10 after
927 ASSERT(animatingElement == element || !animatingElement || animatingElement- >parentOrShadowHostElement() == element); 927 ASSERT(animatingElement == element || !animatingElement || animatingElement- >parentOrShadowHostElement() == element);
928 928
929 if (!(animatingElement && animatingElement->hasAnimations()) 929 if (!(animatingElement && animatingElement->hasAnimations())
930 && !state.style()->transitions() && !state.style()->animations()) 930 && !state.style()->transitions() && !state.style()->animations())
931 return false; 931 return false;
932 932
933 CSSAnimations::calculateUpdate(animatingElement, *element, *state.style(), s tate.parentStyle(), state.animationUpdate(), this); 933 CSSAnimations::calculateUpdate(animatingElement, *element, *state.style(), s tate.parentStyle(), state.animationUpdate(), this);
934 if (state.animationUpdate().isEmpty()) 934 if (state.animationUpdate().isEmpty())
935 return false; 935 return false;
936 936
937 if (state.style()->insideLink() != NotInsideLink) {
938 ASSERT(state.applyPropertyToRegularStyle());
939 state.setApplyPropertyToVisitedLinkStyle(true);
940 }
941
937 const ActiveInterpolationMap& activeInterpolationsForAnimations = state.anim ationUpdate().activeInterpolationsForAnimations(); 942 const ActiveInterpolationMap& activeInterpolationsForAnimations = state.anim ationUpdate().activeInterpolationsForAnimations();
938 const ActiveInterpolationMap& activeInterpolationsForTransitions = state.ani mationUpdate().activeInterpolationsForTransitions(); 943 const ActiveInterpolationMap& activeInterpolationsForTransitions = state.ani mationUpdate().activeInterpolationsForTransitions();
939 applyAnimatedProperties<HighPropertyPriority>(state, activeInterpolationsFor Animations); 944 applyAnimatedProperties<HighPropertyPriority>(state, activeInterpolationsFor Animations);
940 applyAnimatedProperties<HighPropertyPriority>(state, activeInterpolationsFor Transitions); 945 applyAnimatedProperties<HighPropertyPriority>(state, activeInterpolationsFor Transitions);
941 946
942 updateFont(state); 947 updateFont(state);
943 948
944 applyAnimatedProperties<LowPropertyPriority>(state, activeInterpolationsForA nimations); 949 applyAnimatedProperties<LowPropertyPriority>(state, activeInterpolationsForA nimations);
945 applyAnimatedProperties<LowPropertyPriority>(state, activeInterpolationsForT ransitions); 950 applyAnimatedProperties<LowPropertyPriority>(state, activeInterpolationsForT ransitions);
946 951
947 // Start loading resources used by animations. 952 // Start loading resources used by animations.
948 loadPendingResources(state); 953 loadPendingResources(state);
949 954
950 ASSERT(!state.fontBuilder().fontDirty()); 955 ASSERT(!state.fontBuilder().fontDirty());
951 956
957 state.setApplyPropertyToVisitedLinkStyle(false);
958
952 return true; 959 return true;
953 } 960 }
954 961
955 StyleRuleKeyframes* StyleResolver::findKeyframesRule(const Element* element, con st AtomicString& animationName) 962 StyleRuleKeyframes* StyleResolver::findKeyframesRule(const Element* element, con st AtomicString& animationName)
956 { 963 {
957 WillBeHeapVector<RawPtrWillBeMember<ScopedStyleResolver>, 8> resolvers; 964 WillBeHeapVector<RawPtrWillBeMember<ScopedStyleResolver>, 8> resolvers;
958 collectScopedResolversForHostedShadowTrees(element, resolvers); 965 collectScopedResolversForHostedShadowTrees(element, resolvers);
959 if (ScopedStyleResolver* scopedResolver = element->treeScope().scopedStyleRe solver()) 966 if (ScopedStyleResolver* scopedResolver = element->treeScope().scopedStyleRe solver())
960 resolvers.append(scopedResolver); 967 resolvers.append(scopedResolver);
961 968
(...skipping 486 matching lines...) Expand 10 before | Expand all | Expand 10 after
1448 visitor->trace(m_watchedSelectorsRules); 1455 visitor->trace(m_watchedSelectorsRules);
1449 visitor->trace(m_treeBoundaryCrossingRules); 1456 visitor->trace(m_treeBoundaryCrossingRules);
1450 visitor->trace(m_styleResourceLoader); 1457 visitor->trace(m_styleResourceLoader);
1451 visitor->trace(m_styleSharingLists); 1458 visitor->trace(m_styleSharingLists);
1452 visitor->trace(m_pendingStyleSheets); 1459 visitor->trace(m_pendingStyleSheets);
1453 visitor->trace(m_document); 1460 visitor->trace(m_document);
1454 #endif 1461 #endif
1455 } 1462 }
1456 1463
1457 } // namespace blink 1464 } // namespace blink
OLDNEW
« no previous file with comments | « LayoutTests/animations/visited-link-color-animation-expected.html ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698