| Index: cc/animation/transform_operation.h
|
| diff --git a/cc/animation/transform_operation.h b/cc/animation/transform_operation.h
|
| index 3ea5fc20210a230a1014915a16fdaaf2bf07a8d9..1a6a8168ea57bd09379ede386dd9a8c8678edbfa 100644
|
| --- a/cc/animation/transform_operation.h
|
| +++ b/cc/animation/transform_operation.h
|
| @@ -54,10 +54,14 @@ struct TransformOperation {
|
| };
|
|
|
| bool IsIdentity() const;
|
| +
|
| + // Sets |matrix| based on type and the union values.
|
| + void Bake();
|
| +
|
| static bool BlendTransformOperations(const TransformOperation* from,
|
| const TransformOperation* to,
|
| SkMScalar progress,
|
| - gfx::Transform* result);
|
| + TransformOperation* result);
|
|
|
| static bool BlendedBoundsForBox(const gfx::BoxF& box,
|
| const TransformOperation* from,
|
|
|