| Index: cc/animation/transform_operation.h
|
| diff --git a/cc/animation/transform_operation.h b/cc/animation/transform_operation.h
|
| index d5f2830daf6263534f5732c2da01277f281a250f..345ff295e390b4aa81bbf2c55ad92373904d2497 100644
|
| --- a/cc/animation/transform_operation.h
|
| +++ b/cc/animation/transform_operation.h
|
| @@ -32,40 +32,40 @@ struct TransformOperation {
|
| gfx::Transform matrix;
|
|
|
| union {
|
| - double perspective_depth;
|
| + SkMScalar perspective_depth;
|
|
|
| struct {
|
| - double x, y;
|
| + SkMScalar x, y;
|
| } skew;
|
|
|
| struct {
|
| - double x, y, z;
|
| + SkMScalar x, y, z;
|
| } scale;
|
|
|
| struct {
|
| - double x, y, z;
|
| + SkMScalar x, y, z;
|
| } translate;
|
|
|
| struct {
|
| struct {
|
| - double x, y, z;
|
| + SkMScalar x, y, z;
|
| } axis;
|
|
|
| - double angle;
|
| + SkMScalar angle;
|
| } rotate;
|
| };
|
|
|
| bool IsIdentity() const;
|
| static bool BlendTransformOperations(const TransformOperation* from,
|
| const TransformOperation* to,
|
| - double progress,
|
| + SkMScalar progress,
|
| gfx::Transform* result);
|
|
|
| static bool BlendedBoundsForBox(const gfx::BoxF& box,
|
| const TransformOperation* from,
|
| const TransformOperation* to,
|
| - double min_progress,
|
| - double max_progress,
|
| + SkMScalar min_progress,
|
| + SkMScalar max_progress,
|
| gfx::BoxF* bounds);
|
| };
|
|
|
|
|