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

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 test 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 900 matching lines...) Expand 10 before | Expand all | Expand 10 after
911 collector.setSameOriginOnly(!(rulesToInclude & CrossOriginCSSRules)); 911 collector.setSameOriginOnly(!(rulesToInclude & CrossOriginCSSRules));
912 matchAuthorRules(element, collector, rulesToInclude & EmptyCSSRules); 912 matchAuthorRules(element, collector, rulesToInclude & EmptyCSSRules);
913 } 913 }
914 } 914 }
915 915
916 // ----------------------------------------------------------------------------- -------- 916 // ----------------------------------------------------------------------------- --------
917 // this is mostly boring stuff on how to apply a certain rule to the Computedsty le... 917 // this is mostly boring stuff on how to apply a certain rule to the Computedsty le...
918 918
919 bool StyleResolver::applyAnimatedProperties(StyleResolverState& state, const Ele ment* animatingElement) 919 bool StyleResolver::applyAnimatedProperties(StyleResolverState& state, const Ele ment* animatingElement)
920 { 920 {
921 if (state.style()->insideLink() != NotInsideLink) {
922 state.setApplyPropertyToRegularStyle(true);
Timothy Loh 2015/08/25 08:29:28 ASSERT(state.applyPropertyToRegularStyle())
923 state.setApplyPropertyToVisitedLinkStyle(true);
924 }
925
921 Element* element = state.element(); 926 Element* element = state.element();
922 ASSERT(element); 927 ASSERT(element);
923 928
924 // The animating element may be this element, or its pseudo element. It is 929 // The animating element may be this element, or its pseudo element. It is
925 // null when calculating the style for a potential pseudo element that has 930 // null when calculating the style for a potential pseudo element that has
926 // yet to be created. 931 // yet to be created.
927 ASSERT(animatingElement == element || !animatingElement || animatingElement- >parentOrShadowHostElement() == element); 932 ASSERT(animatingElement == element || !animatingElement || animatingElement- >parentOrShadowHostElement() == element);
928 933
929 if (!(animatingElement && animatingElement->hasAnimations()) 934 if (!(animatingElement && animatingElement->hasAnimations())
930 && !state.style()->transitions() && !state.style()->animations()) 935 && !state.style()->transitions() && !state.style()->animations())
(...skipping 517 matching lines...) Expand 10 before | Expand all | Expand 10 after
1448 visitor->trace(m_watchedSelectorsRules); 1453 visitor->trace(m_watchedSelectorsRules);
1449 visitor->trace(m_treeBoundaryCrossingRules); 1454 visitor->trace(m_treeBoundaryCrossingRules);
1450 visitor->trace(m_styleResourceLoader); 1455 visitor->trace(m_styleResourceLoader);
1451 visitor->trace(m_styleSharingLists); 1456 visitor->trace(m_styleSharingLists);
1452 visitor->trace(m_pendingStyleSheets); 1457 visitor->trace(m_pendingStyleSheets);
1453 visitor->trace(m_document); 1458 visitor->trace(m_document);
1454 #endif 1459 #endif
1455 } 1460 }
1456 1461
1457 } // namespace blink 1462 } // 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