| OLD | NEW |
| 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 10 matching lines...) Expand all Loading... |
| 21 * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT | 21 * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT |
| 22 * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, | 22 * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, |
| 23 * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT | 23 * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT |
| 24 * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, | 24 * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, |
| 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 "sky/engine/config.h" | |
| 32 #include "sky/engine/core/animation/animatable/AnimatableShapeValue.h" | 31 #include "sky/engine/core/animation/animatable/AnimatableShapeValue.h" |
| 33 | 32 |
| 34 namespace blink { | 33 namespace blink { |
| 35 | 34 |
| 36 bool AnimatableShapeValue::usesDefaultInterpolationWith(const AnimatableValue* v
alue) const | 35 bool AnimatableShapeValue::usesDefaultInterpolationWith(const AnimatableValue* v
alue) const |
| 37 { | 36 { |
| 38 const AnimatableShapeValue* shapeValue = toAnimatableShapeValue(value); | 37 const AnimatableShapeValue* shapeValue = toAnimatableShapeValue(value); |
| 39 | 38 |
| 40 if (m_shape->type() != ShapeValue::Shape | 39 if (m_shape->type() != ShapeValue::Shape |
| 41 || shapeValue->m_shape->type() != ShapeValue::Shape | 40 || shapeValue->m_shape->type() != ShapeValue::Shape |
| (...skipping 17 matching lines...) Expand all Loading... |
| 59 return AnimatableShapeValue::create(ShapeValue::createShapeValue(toShape->bl
end(fromShape, fraction), shapeValue->m_shape->cssBox()).get()); | 58 return AnimatableShapeValue::create(ShapeValue::createShapeValue(toShape->bl
end(fromShape, fraction), shapeValue->m_shape->cssBox()).get()); |
| 60 } | 59 } |
| 61 | 60 |
| 62 bool AnimatableShapeValue::equalTo(const AnimatableValue* value) const | 61 bool AnimatableShapeValue::equalTo(const AnimatableValue* value) const |
| 63 { | 62 { |
| 64 const ShapeValue* shape = toAnimatableShapeValue(value)->m_shape.get(); | 63 const ShapeValue* shape = toAnimatableShapeValue(value)->m_shape.get(); |
| 65 return m_shape == shape || (m_shape && shape && *m_shape == *shape); | 64 return m_shape == shape || (m_shape && shape && *m_shape == *shape); |
| 66 } | 65 } |
| 67 | 66 |
| 68 } | 67 } |
| OLD | NEW |