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

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

Issue 1851003002: Throw TypeError if easing string is invalid. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix "liner"->"linear" typo in ui/file_manager js file Created 4 years, 8 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 42 matching lines...) Expand 10 before | Expand all | Expand 10 after
53 return new KeyframeEffect(target, model, timing, priority, eventDelegate); 53 return new KeyframeEffect(target, model, timing, priority, eventDelegate);
54 } 54 }
55 55
56 KeyframeEffect* KeyframeEffect::create(ExecutionContext* executionContext, Eleme nt* element, const EffectModelOrDictionarySequenceOrDictionary& effectInput, dou ble duration, ExceptionState& exceptionState) 56 KeyframeEffect* KeyframeEffect::create(ExecutionContext* executionContext, Eleme nt* element, const EffectModelOrDictionarySequenceOrDictionary& effectInput, dou ble duration, ExceptionState& exceptionState)
57 { 57 {
58 ASSERT(RuntimeEnabledFeatures::webAnimationsAPIEnabled()); 58 ASSERT(RuntimeEnabledFeatures::webAnimationsAPIEnabled());
59 if (element) 59 if (element)
60 UseCounter::count(element->document(), UseCounter::AnimationConstructorK eyframeListEffectObjectTiming); 60 UseCounter::count(element->document(), UseCounter::AnimationConstructorK eyframeListEffectObjectTiming);
61 return create(element, EffectInput::convert(element, effectInput, executionC ontext, exceptionState), TimingInput::convert(duration)); 61 return create(element, EffectInput::convert(element, effectInput, executionC ontext, exceptionState), TimingInput::convert(duration));
62 } 62 }
63
63 KeyframeEffect* KeyframeEffect::create(ExecutionContext* executionContext, Eleme nt* element, const EffectModelOrDictionarySequenceOrDictionary& effectInput, con st KeyframeEffectOptions& timingInput, ExceptionState& exceptionState) 64 KeyframeEffect* KeyframeEffect::create(ExecutionContext* executionContext, Eleme nt* element, const EffectModelOrDictionarySequenceOrDictionary& effectInput, con st KeyframeEffectOptions& timingInput, ExceptionState& exceptionState)
64 { 65 {
65 ASSERT(RuntimeEnabledFeatures::webAnimationsAPIEnabled()); 66 ASSERT(RuntimeEnabledFeatures::webAnimationsAPIEnabled());
66 if (element) 67 if (element)
67 UseCounter::count(element->document(), UseCounter::AnimationConstructorK eyframeListEffectObjectTiming); 68 UseCounter::count(element->document(), UseCounter::AnimationConstructorK eyframeListEffectObjectTiming);
68 return create(element, EffectInput::convert(element, effectInput, executionC ontext, exceptionState), TimingInput::convert(timingInput, &element->document()) ); 69 Timing timing;
70 bool success = TimingInput::convert(timingInput, timing, &element->document( ), exceptionState);
71 if (!success || exceptionState.hadException())
72 return nullptr;
73
74 return create(element, EffectInput::convert(element, effectInput, executionC ontext, exceptionState), timing);
69 } 75 }
76
70 KeyframeEffect* KeyframeEffect::create(ExecutionContext* executionContext, Eleme nt* element, const EffectModelOrDictionarySequenceOrDictionary& effectInput, Exc eptionState& exceptionState) 77 KeyframeEffect* KeyframeEffect::create(ExecutionContext* executionContext, Eleme nt* element, const EffectModelOrDictionarySequenceOrDictionary& effectInput, Exc eptionState& exceptionState)
71 { 78 {
72 ASSERT(RuntimeEnabledFeatures::webAnimationsAPIEnabled()); 79 ASSERT(RuntimeEnabledFeatures::webAnimationsAPIEnabled());
73 if (element) 80 if (element)
74 UseCounter::count(element->document(), UseCounter::AnimationConstructorK eyframeListEffectNoTiming); 81 UseCounter::count(element->document(), UseCounter::AnimationConstructorK eyframeListEffectNoTiming);
75 return create(element, EffectInput::convert(element, effectInput, executionC ontext, exceptionState), Timing()); 82 return create(element, EffectInput::convert(element, effectInput, executionC ontext, exceptionState), Timing());
76 } 83 }
77 84
78 KeyframeEffect::KeyframeEffect(Element* target, EffectModel* model, const Timing & timing, Priority priority, EventDelegate* eventDelegate) 85 KeyframeEffect::KeyframeEffect(Element* target, EffectModel* model, const Timing & timing, Priority priority, EventDelegate* eventDelegate)
79 : AnimationEffect(timing, eventDelegate) 86 : AnimationEffect(timing, eventDelegate)
(...skipping 281 matching lines...) Expand 10 before | Expand all | Expand 10 after
361 368
362 DEFINE_TRACE(KeyframeEffect) 369 DEFINE_TRACE(KeyframeEffect)
363 { 370 {
364 visitor->trace(m_target); 371 visitor->trace(m_target);
365 visitor->trace(m_model); 372 visitor->trace(m_model);
366 visitor->trace(m_sampledEffect); 373 visitor->trace(m_sampledEffect);
367 AnimationEffect::trace(visitor); 374 AnimationEffect::trace(visitor);
368 } 375 }
369 376
370 } // namespace blink 377 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698