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

Side by Side Diff: third_party/WebKit/Source/core/animation/css/CSSAnimations.cpp

Issue 1373753002: Change CSSToStyleMap functions to take const CSSValue&s (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Small fix for mask Created 5 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:
View unified diff | Download patch
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2013 Google Inc. All rights reserved. 2 * Copyright (C) 2013 Google Inc. All rights reserved.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions are 5 * modification, are permitted provided that the following conditions are
6 * met: 6 * met:
7 * 7 *
8 * * Redistributions of source code must retain the above copyright 8 * * Redistributions of source code must retain the above copyright
9 * notice, this list of conditions and the following disclaimer. 9 * notice, this list of conditions and the following disclaimer.
10 * * Redistributions in binary form must reproduce the above 10 * * Redistributions in binary form must reproduce the above
(...skipping 76 matching lines...) Expand 10 before | Expand all | Expand 10 after
87 const StylePropertySet& properties = styleKeyframe->properties(); 87 const StylePropertySet& properties = styleKeyframe->properties();
88 for (unsigned j = 0; j < properties.propertyCount(); j++) { 88 for (unsigned j = 0; j < properties.propertyCount(); j++) {
89 CSSPropertyID property = properties.propertyAt(j).id(); 89 CSSPropertyID property = properties.propertyAt(j).id();
90 specifiedPropertiesForUseCounter.add(property); 90 specifiedPropertiesForUseCounter.add(property);
91 if (property == CSSPropertyAnimationTimingFunction) { 91 if (property == CSSPropertyAnimationTimingFunction) {
92 CSSValue* value = properties.propertyAt(j).value(); 92 CSSValue* value = properties.propertyAt(j).value();
93 RefPtr<TimingFunction> timingFunction; 93 RefPtr<TimingFunction> timingFunction;
94 if (value->isInheritedValue() && parentStyle->animations()) { 94 if (value->isInheritedValue() && parentStyle->animations()) {
95 timingFunction = parentStyle->animations()->timingFunctionLi st()[0]; 95 timingFunction = parentStyle->animations()->timingFunctionLi st()[0];
96 } else if (value->isValueList()) { 96 } else if (value->isValueList()) {
97 timingFunction = CSSToStyleMap::mapAnimationTimingFunction(t oCSSValueList(value)->item(0)); 97 timingFunction = CSSToStyleMap::mapAnimationTimingFunction(* toCSSValueList(value)->item(0));
98 } else { 98 } else {
99 ASSERT(value->isCSSWideKeyword()); 99 ASSERT(value->isCSSWideKeyword());
100 timingFunction = CSSTimingData::initialTimingFunction(); 100 timingFunction = CSSTimingData::initialTimingFunction();
101 } 101 }
102 keyframe->setEasing(timingFunction.release()); 102 keyframe->setEasing(timingFunction.release());
103 } else if (property == CSSPropertyFilter) { 103 } else if (property == CSSPropertyFilter) {
104 // TODO(alancutter): We will not support animating filter until -webkit-filter is an alias for it. 104 // TODO(alancutter): We will not support animating filter until -webkit-filter is an alias for it.
105 // This is to prevent animations on both -webkit-filter and filt er from being run on the main thread when 105 // This is to prevent animations on both -webkit-filter and filt er from being run on the main thread when
106 // they would otherwise run on the compositor. 106 // they would otherwise run on the compositor.
107 continue; 107 continue;
(...skipping 707 matching lines...) Expand 10 before | Expand all | Expand 10 after
815 } 815 }
816 816
817 DEFINE_TRACE(CSSAnimations) 817 DEFINE_TRACE(CSSAnimations)
818 { 818 {
819 visitor->trace(m_transitions); 819 visitor->trace(m_transitions);
820 visitor->trace(m_pendingUpdate); 820 visitor->trace(m_pendingUpdate);
821 visitor->trace(m_animations); 821 visitor->trace(m_animations);
822 } 822 }
823 823
824 } // namespace blink 824 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698