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

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

Issue 1045723009: Move core/layout/style to core/style (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Rebase. Created 5 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 | Annotate | Revision Log
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 14 matching lines...) Expand all
25 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY 25 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
26 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 26 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
27 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE 27 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
28 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 28 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
29 */ 29 */
30 30
31 #include "config.h" 31 #include "config.h"
32 #include "core/animation/animatable/AnimatableImage.h" 32 #include "core/animation/animatable/AnimatableImage.h"
33 33
34 #include "core/css/CSSImageValue.h" 34 #include "core/css/CSSImageValue.h"
35 #include "core/layout/style/StyleGeneratedImage.h" 35 #include "core/style/StyleGeneratedImage.h"
36 #include "wtf/MathExtras.h" 36 #include "wtf/MathExtras.h"
37 37
38 namespace blink { 38 namespace blink {
39 39
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())
(...skipping 13 matching lines...) Expand all
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
« no previous file with comments | « Source/core/animation/animatable/AnimatableImage.h ('k') | Source/core/animation/animatable/AnimatableSVGPaint.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698