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

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

Issue 2617703004: Combine {Legacy,}StyleInterpolation (Closed)
Patch Set: Created 3 years, 11 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
« no previous file with comments | « third_party/WebKit/Source/core/animation/LegacyStyleInterpolation.h ('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. 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 1167 matching lines...) Expand 10 before | Expand all | Expand 10 after
1178 if (!CSSPropertyPriorityData<priority>::propertyHasPriority(property)) 1178 if (!CSSPropertyPriorityData<priority>::propertyHasPriority(property))
1179 continue; 1179 continue;
1180 const Interpolation& interpolation = *entry.value.front(); 1180 const Interpolation& interpolation = *entry.value.front();
1181 if (interpolation.isInvalidatableInterpolation()) { 1181 if (interpolation.isInvalidatableInterpolation()) {
1182 CSSInterpolationTypesMap map(state.document().propertyRegistry()); 1182 CSSInterpolationTypesMap map(state.document().propertyRegistry());
1183 InterpolationEnvironment environment(map, state); 1183 InterpolationEnvironment environment(map, state);
1184 InvalidatableInterpolation::applyStack(entry.value, environment); 1184 InvalidatableInterpolation::applyStack(entry.value, environment);
1185 } else { 1185 } else {
1186 // TODO(alancutter): Remove this old code path once animations have 1186 // TODO(alancutter): Remove this old code path once animations have
1187 // completely migrated to InterpolationTypes. 1187 // completely migrated to InterpolationTypes.
1188 toStyleInterpolation(interpolation).apply(state); 1188 toLegacyStyleInterpolation(interpolation).apply(state);
1189 } 1189 }
1190 } 1190 }
1191 } 1191 }
1192 1192
1193 static inline bool isValidCueStyleProperty(CSSPropertyID id) { 1193 static inline bool isValidCueStyleProperty(CSSPropertyID id) {
1194 switch (id) { 1194 switch (id) {
1195 case CSSPropertyBackground: 1195 case CSSPropertyBackground:
1196 case CSSPropertyBackgroundAttachment: 1196 case CSSPropertyBackgroundAttachment:
1197 case CSSPropertyBackgroundClip: 1197 case CSSPropertyBackgroundClip:
1198 case CSSPropertyBackgroundColor: 1198 case CSSPropertyBackgroundColor:
(...skipping 725 matching lines...) Expand 10 before | Expand all | Expand 10 after
1924 1924
1925 DEFINE_TRACE(StyleResolver) { 1925 DEFINE_TRACE(StyleResolver) {
1926 visitor->trace(m_matchedPropertiesCache); 1926 visitor->trace(m_matchedPropertiesCache);
1927 visitor->trace(m_selectorFilter); 1927 visitor->trace(m_selectorFilter);
1928 visitor->trace(m_styleSharingLists); 1928 visitor->trace(m_styleSharingLists);
1929 visitor->trace(m_document); 1929 visitor->trace(m_document);
1930 visitor->trace(m_tracker); 1930 visitor->trace(m_tracker);
1931 } 1931 }
1932 1932
1933 } // namespace blink 1933 } // namespace blink
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/core/animation/LegacyStyleInterpolation.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698