third_party/WebKit/Source/core/css/resolver/StyleResolver.cpp - Issue 2309873003: Extend PropertyHandle to include custom property identifiers

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

Issue 2309873003: Extend PropertyHandle to include custom property identifiers (Closed)

Patch Set: Add unit tests Created 4 years, 2 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:

« no previous file with comments | « third_party/WebKit/Source/core/animation/css/CSSAnimations.cpp ('k') | no next file » | no next file with comments »

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 1117 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
1128	1128

1129 CSSAnimations::snapshotCompositorKeyframes(element, state.animationUpdate() , state.style(), state.parentStyle());	1129 CSSAnimations::snapshotCompositorKeyframes(element, state.animationUpdate() , state.style(), state.parentStyle());

1130	1130

1131 if (state.style()->insideLink() != NotInsideLink) {	1131 if (state.style()->insideLink() != NotInsideLink) {

1132 ASSERT(state.applyPropertyToRegularStyle());	1132 ASSERT(state.applyPropertyToRegularStyle());

1133 state.setApplyPropertyToVisitedLinkStyle(true);	1133 state.setApplyPropertyToVisitedLinkStyle(true);

1134 }	1134 }

1135	1135

1136 const ActiveInterpolationsMap& activeInterpolationsMapForAnimations = state. animationUpdate().activeInterpolationsForAnimations();	1136 const ActiveInterpolationsMap& activeInterpolationsMapForAnimations = state. animationUpdate().activeInterpolationsForAnimations();

1137 const ActiveInterpolationsMap& activeInterpolationsMapForTransitions = state .animationUpdate().activeInterpolationsForTransitions();	1137 const ActiveInterpolationsMap& activeInterpolationsMapForTransitions = state .animationUpdate().activeInterpolationsForTransitions();

	1138 // TODO(crbug.com/644148): Apply animations on custom properties.

1138 applyAnimatedProperties<HighPropertyPriority>(state, activeInterpolationsMap ForAnimations);	1139 applyAnimatedProperties<HighPropertyPriority>(state, activeInterpolationsMap ForAnimations);

1139 applyAnimatedProperties<HighPropertyPriority>(state, activeInterpolationsMap ForTransitions);	1140 applyAnimatedProperties<HighPropertyPriority>(state, activeInterpolationsMap ForTransitions);

1140	1141

1141 updateFont(state);	1142 updateFont(state);

1142	1143

1143 applyAnimatedProperties<LowPropertyPriority>(state, activeInterpolationsMapF orAnimations);	1144 applyAnimatedProperties<LowPropertyPriority>(state, activeInterpolationsMapF orAnimations);

1144 applyAnimatedProperties<LowPropertyPriority>(state, activeInterpolationsMapF orTransitions);	1145 applyAnimatedProperties<LowPropertyPriority>(state, activeInterpolationsMapF orTransitions);

1145	1146

1146 // Start loading resources used by animations.	1147 // Start loading resources used by animations.

1147 loadPendingResources(state);	1148 loadPendingResources(state);

(...skipping 596 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
1744 visitor->trace(m_siblingRuleSet);	1745 visitor->trace(m_siblingRuleSet);

1745 visitor->trace(m_uncommonAttributeRuleSet);	1746 visitor->trace(m_uncommonAttributeRuleSet);

1746 visitor->trace(m_watchedSelectorsRules);	1747 visitor->trace(m_watchedSelectorsRules);

1747 visitor->trace(m_treeBoundaryCrossingScopes);	1748 visitor->trace(m_treeBoundaryCrossingScopes);

1748 visitor->trace(m_styleSharingLists);	1749 visitor->trace(m_styleSharingLists);

1749 visitor->trace(m_pendingStyleSheets);	1750 visitor->trace(m_pendingStyleSheets);

1750 visitor->trace(m_document);	1751 visitor->trace(m_document);

1751 }	1752 }

1752	1753

1753 } // namespace blink	1754 } // namespace blink

OLD	NEW