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

Side by Side Diff: Source/core/animation/animatable/AnimatableImage.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: Resize expect size of Persistent Created 5 years, 6 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 29 matching lines...) Expand all
40 // FIXME: Once cross-fade works on generated image types, remove this method. 40 // FIXME: Once cross-fade works on generated image types, remove this method.
41 bool AnimatableImage::usesDefaultInterpolationWith(const AnimatableValue* value) const 41 bool AnimatableImage::usesDefaultInterpolationWith(const AnimatableValue* value) const
42 { 42 {
43 if (!m_value->isImageValue()) 43 if (!m_value->isImageValue())
44 return true; 44 return true;
45 if (!toAnimatableImage(value)->toCSSValue()->isImageValue()) 45 if (!toAnimatableImage(value)->toCSSValue()->isImageValue())
46 return true; 46 return true;
47 return false; 47 return false;
48 } 48 }
49 49
50 PassRefPtrWillBeRawPtr<AnimatableValue> AnimatableImage::interpolateTo(const Ani matableValue* value, double fraction) const 50 AnimatableValue* AnimatableImage::interpolateTo(const AnimatableValue* value, do uble fraction) const
51 { 51 {
52 if (fraction <= 0 || fraction >= 1 || usesDefaultInterpolationWith(value)) 52 if (fraction <= 0 || fraction >= 1 || usesDefaultInterpolationWith(value))
53 return defaultInterpolateTo(this, value, fraction); 53 return defaultInterpolateTo(this, value, fraction);
54 54
55 CSSValue* fromValue = toCSSValue(); 55 CSSValue* fromValue = toCSSValue();
56 CSSValue* toValue = toAnimatableImage(value)->toCSSValue(); 56 CSSValue* toValue = toAnimatableImage(value)->toCSSValue();
57 57
58 RefPtrWillBeRawPtr<CSSCrossfadeValue> crossfadeValue = CSSCrossfadeValue::cr eate(fromValue, toValue); 58 RefPtrWillBeRawPtr<CSSCrossfadeValue> crossfadeValue = CSSCrossfadeValue::cr eate(fromValue, toValue);
59 crossfadeValue->setPercentage(CSSPrimitiveValue::create(fraction, CSSPrimiti veValue::CSS_NUMBER)); 59 crossfadeValue->setPercentage(CSSPrimitiveValue::create(fraction, CSSPrimiti veValue::CSS_NUMBER));
60 return create(crossfadeValue); 60 return create(crossfadeValue);
61 } 61 }
62 62
63 bool AnimatableImage::equalTo(const AnimatableValue* value) const 63 bool AnimatableImage::equalTo(const AnimatableValue* value) const
64 { 64 {
65 return m_value->equals(*toAnimatableImage(value)->m_value.get()); 65 return m_value->equals(*toAnimatableImage(value)->m_value.get());
66 } 66 }
67 67
68 } 68 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698