| 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 30 matching lines...) Expand all Loading... |
| 41 || shapeValue->m_shape->type() != ShapeValue::Shape | 41 || shapeValue->m_shape->type() != ShapeValue::Shape |
| 42 || m_shape->cssBox() != shapeValue->m_shape->cssBox()) | 42 || m_shape->cssBox() != shapeValue->m_shape->cssBox()) |
| 43 return true; | 43 return true; |
| 44 | 44 |
| 45 const BasicShape* fromShape = this->m_shape->shape(); | 45 const BasicShape* fromShape = this->m_shape->shape(); |
| 46 const BasicShape* toShape = shapeValue->m_shape->shape(); | 46 const BasicShape* toShape = shapeValue->m_shape->shape(); |
| 47 | 47 |
| 48 return !fromShape->canBlend(toShape); | 48 return !fromShape->canBlend(toShape); |
| 49 } | 49 } |
| 50 | 50 |
| 51 PassRefPtrWillBeRawPtr<AnimatableValue> AnimatableShapeValue::interpolateTo(cons
t AnimatableValue* value, double fraction) const | 51 PassRefPtr<AnimatableValue> AnimatableShapeValue::interpolateTo(const Animatable
Value* value, double fraction) const |
| 52 { | 52 { |
| 53 if (usesDefaultInterpolationWith(value)) | 53 if (usesDefaultInterpolationWith(value)) |
| 54 return defaultInterpolateTo(this, value, fraction); | 54 return defaultInterpolateTo(this, value, fraction); |
| 55 | 55 |
| 56 const AnimatableShapeValue* shapeValue = toAnimatableShapeValue(value); | 56 const AnimatableShapeValue* shapeValue = toAnimatableShapeValue(value); |
| 57 const BasicShape* fromShape = this->m_shape->shape(); | 57 const BasicShape* fromShape = this->m_shape->shape(); |
| 58 const BasicShape* toShape = shapeValue->m_shape->shape(); | 58 const BasicShape* toShape = shapeValue->m_shape->shape(); |
| 59 return AnimatableShapeValue::create(ShapeValue::createShapeValue(toShape->bl
end(fromShape, fraction), shapeValue->m_shape->cssBox()).get()); | 59 return AnimatableShapeValue::create(ShapeValue::createShapeValue(toShape->bl
end(fromShape, fraction), shapeValue->m_shape->cssBox()).get()); |
| 60 } | 60 } |
| 61 | 61 |
| 62 bool AnimatableShapeValue::equalTo(const AnimatableValue* value) const | 62 bool AnimatableShapeValue::equalTo(const AnimatableValue* value) const |
| 63 { | 63 { |
| 64 const ShapeValue* shape = toAnimatableShapeValue(value)->m_shape.get(); | 64 const ShapeValue* shape = toAnimatableShapeValue(value)->m_shape.get(); |
| 65 return m_shape == shape || (m_shape && shape && *m_shape == *shape); | 65 return m_shape == shape || (m_shape && shape && *m_shape == *shape); |
| 66 } | 66 } |
| 67 | 67 |
| 68 DEFINE_TRACE(AnimatableShapeValue) | |
| 69 { | |
| 70 visitor->trace(m_shape); | |
| 71 AnimatableValue::trace(visitor); | |
| 72 } | 68 } |
| 73 | |
| 74 } | |
| OLD | NEW |