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

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

Issue 1701813002: Make Keyframe::PropertySpecificKeyframes RefCounted (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: InvalidatableInterpolation RefPtrs Created 4 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 18 matching lines...) Expand all
29 */ 29 */
30 30
31 #include "core/animation/animatable/AnimatableValue.h" 31 #include "core/animation/animatable/AnimatableValue.h"
32 32
33 #include "core/animation/animatable/AnimatableNeutral.h" 33 #include "core/animation/animatable/AnimatableNeutral.h"
34 #include "wtf/StdLibExtras.h" 34 #include "wtf/StdLibExtras.h"
35 #include <algorithm> 35 #include <algorithm>
36 36
37 namespace blink { 37 namespace blink {
38 38
39 const AnimatableValue* AnimatableValue::neutralValue() 39 PassRefPtr<AnimatableValue> AnimatableValue::neutralValue()
40 { 40 {
41 DEFINE_STATIC_REF(AnimatableNeutral, neutralSentinelValue, (AnimatableNeutra l::create())); 41 DEFINE_STATIC_REF(AnimatableNeutral, neutralSentinelValue, (AnimatableNeutra l::create()));
42 return neutralSentinelValue; 42 return neutralSentinelValue;
43 } 43 }
44 44
45 PassRefPtr<AnimatableValue> AnimatableValue::interpolate(const AnimatableValue* left, const AnimatableValue* right, double fraction) 45 PassRefPtr<AnimatableValue> AnimatableValue::interpolate(const AnimatableValue* left, const AnimatableValue* right, double fraction)
46 { 46 {
47 ASSERT(left); 47 ASSERT(left);
48 ASSERT(right); 48 ASSERT(right);
49 ASSERT(!left->isNeutral()); 49 ASSERT(!left->isNeutral());
50 ASSERT(!right->isNeutral()); 50 ASSERT(!right->isNeutral());
51 51
52 if (fraction && fraction != 1 && left->isSameType(right)) 52 if (fraction && fraction != 1 && left->isSameType(right))
53 return left->interpolateTo(right, fraction); 53 return left->interpolateTo(right, fraction);
54 54
55 return defaultInterpolateTo(left, right, fraction); 55 return defaultInterpolateTo(left, right, fraction);
56 } 56 }
57 57
58 } // namespace blink 58 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698