| Index: third_party/WebKit/Source/platform/transforms/TransformOperations.cpp
|
| diff --git a/third_party/WebKit/Source/platform/transforms/TransformOperations.cpp b/third_party/WebKit/Source/platform/transforms/TransformOperations.cpp
|
| index 8473f4923324630174faa3a92ccaf6e9060ff6e8..305bd025f6aea600f24e18b758430530ebfbcc0f 100644
|
| --- a/third_party/WebKit/Source/platform/transforms/TransformOperations.cpp
|
| +++ b/third_party/WebKit/Source/platform/transforms/TransformOperations.cpp
|
| @@ -283,16 +283,10 @@ bool TransformOperations::blendedBoundsForBox(const FloatBox& box,
|
| (i < fromSize) ? from.operations()[i] : nullptr;
|
| RefPtr<TransformOperation> toOperation =
|
| (i < toSize) ? operations()[i] : nullptr;
|
| - if (fromOperation && fromOperation->type() == TransformOperation::None)
|
| - fromOperation = nullptr;
|
| -
|
| - if (toOperation && toOperation->type() == TransformOperation::None)
|
| - toOperation = nullptr;
|
|
|
| + DCHECK(fromOperation || toOperation);
|
| TransformOperation::OperationType interpolationType =
|
| - toOperation
|
| - ? toOperation->type()
|
| - : fromOperation ? fromOperation->type() : TransformOperation::None;
|
| + toOperation ? toOperation->type() : fromOperation->type();
|
| if (fromOperation && toOperation &&
|
| !fromOperation->canBlendWith(*toOperation.get()))
|
| return false;
|
| @@ -408,8 +402,6 @@ bool TransformOperations::blendedBoundsForBox(const FloatBox& box,
|
| }
|
| }
|
| continue;
|
| - case TransformOperation::None:
|
| - continue;
|
| case TransformOperation::Matrix:
|
| case TransformOperation::Matrix3D:
|
| case TransformOperation::Interpolated:
|
|
|