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

Side by Side Diff: Source/core/animation/EffectInput.cpp

Issue 863863004: Implemented additive animations for length (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Fixed AnimationStackTest Created 5 years, 10 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 93 matching lines...) Expand 10 before | Expand all | Expand 10 after
104 DictionaryHelper::get(keyframeDictionary, property, value); 104 DictionaryHelper::get(keyframeDictionary, property, value);
105 keyframe->setPropertyValue(id, value, styleSheetContents); 105 keyframe->setPropertyValue(id, value, styleSheetContents);
106 } 106 }
107 } 107 }
108 108
109 RefPtrWillBeRawPtr<StringKeyframeEffectModel> keyframeEffectModel = StringKe yframeEffectModel::create(keyframes); 109 RefPtrWillBeRawPtr<StringKeyframeEffectModel> keyframeEffectModel = StringKe yframeEffectModel::create(keyframes);
110 if (keyframeEffectModel->hasSyntheticKeyframes()) { 110 if (keyframeEffectModel->hasSyntheticKeyframes()) {
111 exceptionState.throwDOMException(NotSupportedError, "Partial keyframes a re not supported."); 111 exceptionState.throwDOMException(NotSupportedError, "Partial keyframes a re not supported.");
112 return nullptr; 112 return nullptr;
113 } 113 }
114 if (!keyframeEffectModel->isReplaceOnly()) { 114 if (!keyframeEffectModel->isReplaceOnly() && !RuntimeEnabledFeatures::webAni mationsAPIEnabled()) {
115 exceptionState.throwDOMException(NotSupportedError, "Additive animations are not supported."); 115 exceptionState.throwDOMException(NotSupportedError, "Additive animations are not supported.");
116 return nullptr; 116 return nullptr;
117 } 117 }
118 keyframeEffectModel->forceConversionsToAnimatableValues(element); 118 keyframeEffectModel->forceConversionsToAnimatableValues(element);
119 119
120 return keyframeEffectModel; 120 return keyframeEffectModel;
121 } 121 }
122 122
123 } // namespace blink 123 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698