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

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

Issue 2750293003: Delete unused AnimatableValue code (Closed)
Patch Set: Fix unit tests Created 3 years, 9 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 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 "core/animation/animatable/AnimatableShapeValue.h" 31 #include "core/animation/animatable/AnimatableShapeValue.h"
32 32
33 namespace blink { 33 namespace blink {
34 34
35 bool AnimatableShapeValue::usesDefaultInterpolationWith(
36 const AnimatableValue* value) const {
37 const AnimatableShapeValue* shapeValue = toAnimatableShapeValue(value);
38
39 if (m_shape->type() != ShapeValue::Shape ||
40 shapeValue->m_shape->type() != ShapeValue::Shape ||
41 m_shape->cssBox() != shapeValue->m_shape->cssBox())
42 return true;
43
44 const BasicShape* fromShape = this->m_shape->shape();
45 const BasicShape* toShape = shapeValue->m_shape->shape();
46
47 return !fromShape->canBlend(toShape);
48 }
49
50 PassRefPtr<AnimatableValue> AnimatableShapeValue::interpolateTo(
51 const AnimatableValue* value,
52 double fraction) const {
53 if (usesDefaultInterpolationWith(value))
54 return defaultInterpolateTo(this, value, fraction);
55
56 const AnimatableShapeValue* shapeValue = toAnimatableShapeValue(value);
57 const BasicShape* fromShape = this->m_shape->shape();
58 const BasicShape* toShape = shapeValue->m_shape->shape();
59 return AnimatableShapeValue::create(ShapeValue::createShapeValue(
60 toShape->blend(fromShape, fraction), shapeValue->m_shape->cssBox()));
61 }
62
63 bool AnimatableShapeValue::equalTo(const AnimatableValue* value) const { 35 bool AnimatableShapeValue::equalTo(const AnimatableValue* value) const {
64 const ShapeValue* shape = toAnimatableShapeValue(value)->m_shape.get(); 36 const ShapeValue* shape = toAnimatableShapeValue(value)->m_shape.get();
65 return m_shape == shape || (m_shape && shape && *m_shape == *shape); 37 return m_shape == shape || (m_shape && shape && *m_shape == *shape);
66 } 38 }
67 39
68 } // namespace blink 40 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698