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

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

Issue 1319083003: Ignore filter property in CSS Animations (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: -\n Created 5 years, 3 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/virtual/threaded/animations/composited-filter-webkit-filter.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) 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 82 matching lines...) Expand 10 before | Expand all | Expand 10 after
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(t oCSSValueList(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) {
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
106 // they would otherwise run on the compositor.
107 continue;
103 } else if (CSSAnimations::isAnimatableProperty(property)) { 108 } else if (CSSAnimations::isAnimatableProperty(property)) {
104 keyframe->setPropertyValue(property, properties.propertyAt(j).va lue()); 109 keyframe->setPropertyValue(property, properties.propertyAt(j).va lue());
105 } 110 }
106 } 111 }
107 keyframes.append(keyframe); 112 keyframes.append(keyframe);
108 // The last keyframe specified at a given offset is used. 113 // The last keyframe specified at a given offset is used.
109 for (size_t j = 1; j < offsets.size(); ++j) { 114 for (size_t j = 1; j < offsets.size(); ++j) {
110 keyframes.append(toStringKeyframe(keyframe->cloneWithOffset(offsets[ j]).get())); 115 keyframes.append(toStringKeyframe(keyframe->cloneWithOffset(offsets[ j]).get()));
111 } 116 }
112 } 117 }
(...skipping 678 matching lines...) Expand 10 before | Expand all | Expand 10 after
791 { 796 {
792 #if ENABLE(OILPAN) 797 #if ENABLE(OILPAN)
793 visitor->trace(m_transitions); 798 visitor->trace(m_transitions);
794 visitor->trace(m_pendingUpdate); 799 visitor->trace(m_pendingUpdate);
795 visitor->trace(m_animations); 800 visitor->trace(m_animations);
796 visitor->trace(m_previousActiveInterpolationsForAnimations); 801 visitor->trace(m_previousActiveInterpolationsForAnimations);
797 #endif 802 #endif
798 } 803 }
799 804
800 } // namespace blink 805 } // namespace blink
OLDNEW
« no previous file with comments | « LayoutTests/virtual/threaded/animations/composited-filter-webkit-filter.html ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698