| 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 28 matching lines...) Expand all Loading... |
| 39 | 39 |
| 40 if (m_operation->type() != ClipPathOperation::SHAPE || toOperation->m_operat
ion->type() != ClipPathOperation::SHAPE) | 40 if (m_operation->type() != ClipPathOperation::SHAPE || toOperation->m_operat
ion->type() != ClipPathOperation::SHAPE) |
| 41 return true; | 41 return true; |
| 42 | 42 |
| 43 const BasicShape* fromShape = toShapeClipPathOperation(clipPathOperation())-
>basicShape(); | 43 const BasicShape* fromShape = toShapeClipPathOperation(clipPathOperation())-
>basicShape(); |
| 44 const BasicShape* toShape = toShapeClipPathOperation(toOperation->clipPathOp
eration())->basicShape(); | 44 const BasicShape* toShape = toShapeClipPathOperation(toOperation->clipPathOp
eration())->basicShape(); |
| 45 | 45 |
| 46 return !fromShape->canBlend(toShape); | 46 return !fromShape->canBlend(toShape); |
| 47 } | 47 } |
| 48 | 48 |
| 49 PassRefPtrWillBeRawPtr<AnimatableValue> AnimatableClipPathOperation::interpolate
To(const AnimatableValue* value, double fraction) const | 49 AnimatableValue* AnimatableClipPathOperation::interpolateTo(const AnimatableValu
e* value, double fraction) const |
| 50 { | 50 { |
| 51 if (usesDefaultInterpolationWith(value)) | 51 if (usesDefaultInterpolationWith(value)) |
| 52 return defaultInterpolateTo(this, value, fraction); | 52 return defaultInterpolateTo(this, value, fraction); |
| 53 | 53 |
| 54 const AnimatableClipPathOperation* toOperation = toAnimatableClipPathOperati
on(value); | 54 const AnimatableClipPathOperation* toOperation = toAnimatableClipPathOperati
on(value); |
| 55 const BasicShape* fromShape = toShapeClipPathOperation(clipPathOperation())-
>basicShape(); | 55 const BasicShape* fromShape = toShapeClipPathOperation(clipPathOperation())-
>basicShape(); |
| 56 const BasicShape* toShape = toShapeClipPathOperation(toOperation->clipPathOp
eration())->basicShape(); | 56 const BasicShape* toShape = toShapeClipPathOperation(toOperation->clipPathOp
eration())->basicShape(); |
| 57 | 57 |
| 58 return AnimatableClipPathOperation::create(ShapeClipPathOperation::create(to
Shape->blend(fromShape, fraction)).get()); | 58 return AnimatableClipPathOperation::create(ShapeClipPathOperation::create(to
Shape->blend(fromShape, fraction)).get()); |
| 59 } | 59 } |
| 60 | 60 |
| 61 bool AnimatableClipPathOperation::equalTo(const AnimatableValue* value) const | 61 bool AnimatableClipPathOperation::equalTo(const AnimatableValue* value) const |
| 62 { | 62 { |
| 63 const ClipPathOperation* operation = toAnimatableClipPathOperation(value)->m
_operation.get(); | 63 const ClipPathOperation* operation = toAnimatableClipPathOperation(value)->m
_operation.get(); |
| 64 return m_operation == operation || (m_operation && operation && *m_operation
== *operation); | 64 return m_operation == operation || (m_operation && operation && *m_operation
== *operation); |
| 65 } | 65 } |
| 66 | 66 |
| 67 } | 67 } |
| OLD | NEW |