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

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

Issue 1120003002: [Oilpan] Migrate most classes under core/animations to Oilpan heap. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Rebase Created 5 years, 4 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 21 matching lines...) Expand all
32 #include "core/animation/animatable/AnimatableValue.h" 32 #include "core/animation/animatable/AnimatableValue.h"
33 33
34 #include "core/animation/animatable/AnimatableNeutral.h" 34 #include "core/animation/animatable/AnimatableNeutral.h"
35 #include "wtf/StdLibExtras.h" 35 #include "wtf/StdLibExtras.h"
36 #include <algorithm> 36 #include <algorithm>
37 37
38 namespace blink { 38 namespace blink {
39 39
40 const AnimatableValue* AnimatableValue::neutralValue() 40 const AnimatableValue* AnimatableValue::neutralValue()
41 { 41 {
42 DEFINE_STATIC_REF_WILL_BE_PERSISTENT(AnimatableNeutral, neutralSentinelValue , (AnimatableNeutral::create())); 42 static AnimatableNeutral* neutralSentinelValue = (new Persistent<AnimatableN eutral>(AnimatableNeutral::create()))->get();
43 return neutralSentinelValue; 43 return neutralSentinelValue;
44 } 44 }
45 45
46 PassRefPtrWillBeRawPtr<AnimatableValue> AnimatableValue::interpolate(const Anima tableValue* left, const AnimatableValue* right, double fraction) 46 AnimatableValue* AnimatableValue::interpolate(const AnimatableValue* left, const AnimatableValue* right, double fraction)
47 { 47 {
48 ASSERT(left); 48 ASSERT(left);
49 ASSERT(right); 49 ASSERT(right);
50 ASSERT(!left->isNeutral()); 50 ASSERT(!left->isNeutral());
51 ASSERT(!right->isNeutral()); 51 ASSERT(!right->isNeutral());
52 52
53 if (fraction && fraction != 1 && left->isSameType(right)) 53 if (fraction && fraction != 1 && left->isSameType(right))
54 return left->interpolateTo(right, fraction); 54 return left->interpolateTo(right, fraction);
55 55
56 return defaultInterpolateTo(left, right, fraction); 56 return defaultInterpolateTo(left, right, fraction);
57 } 57 }
58 58
59 } // namespace blink 59 } // namespace blink
OLDNEW
« no previous file with comments | « Source/core/animation/animatable/AnimatableValue.h ('k') | Source/core/animation/animatable/AnimatableValueKeyframe.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698