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

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

Issue 2065593002: Unprefix the CSS 'filter' property (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Remove disabler. Try different DCHECK expressions. Created 4 years, 6 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 83 matching lines...) Expand 10 before | Expand all | Expand 10 after
94 RefPtr<TimingFunction> timingFunction; 94 RefPtr<TimingFunction> timingFunction;
95 if (value->isInheritedValue() && parentStyle->animations()) { 95 if (value->isInheritedValue() && parentStyle->animations()) {
96 timingFunction = parentStyle->animations()->timingFunctionLi st()[0]; 96 timingFunction = parentStyle->animations()->timingFunctionLi st()[0];
97 } else if (value->isValueList()) { 97 } else if (value->isValueList()) {
98 timingFunction = CSSToStyleMap::mapAnimationTimingFunction(t oCSSValueList(value)->item(0)); 98 timingFunction = CSSToStyleMap::mapAnimationTimingFunction(t oCSSValueList(value)->item(0));
99 } else { 99 } else {
100 ASSERT(value->isCSSWideKeyword()); 100 ASSERT(value->isCSSWideKeyword());
101 timingFunction = CSSTimingData::initialTimingFunction(); 101 timingFunction = CSSTimingData::initialTimingFunction();
102 } 102 }
103 keyframe->setEasing(timingFunction.release()); 103 keyframe->setEasing(timingFunction.release());
104 } else if (property == CSSPropertyFilter) {
105 // TODO(alancutter): We will not support animating filter until -webkit-filter is an alias for it.
106 // This is to prevent animations on both -webkit-filter and filt er from being run on the main thread when
107 // they would otherwise run on the compositor.
108 continue;
109 } else if (CSSAnimations::isAnimatableProperty(property)) { 104 } else if (CSSAnimations::isAnimatableProperty(property)) {
110 keyframe->setCSSPropertyValue(property, properties.propertyAt(j) .value()); 105 keyframe->setCSSPropertyValue(property, properties.propertyAt(j) .value());
111 } 106 }
112 } 107 }
113 keyframes.append(keyframe); 108 keyframes.append(keyframe);
114 // The last keyframe specified at a given offset is used. 109 // The last keyframe specified at a given offset is used.
115 for (size_t j = 1; j < offsets.size(); ++j) { 110 for (size_t j = 1; j < offsets.size(); ++j) {
116 keyframes.append(toStringKeyframe(keyframe->cloneWithOffset(offsets[ j]).get())); 111 keyframes.append(toStringKeyframe(keyframe->cloneWithOffset(offsets[ j]).get()));
117 } 112 }
118 } 113 }
(...skipping 745 matching lines...) Expand 10 before | Expand all | Expand 10 after
864 } 859 }
865 860
866 DEFINE_TRACE(CSSAnimations) 861 DEFINE_TRACE(CSSAnimations)
867 { 862 {
868 visitor->trace(m_transitions); 863 visitor->trace(m_transitions);
869 visitor->trace(m_pendingUpdate); 864 visitor->trace(m_pendingUpdate);
870 visitor->trace(m_runningAnimations); 865 visitor->trace(m_runningAnimations);
871 } 866 }
872 867
873 } // namespace blink 868 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698