Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1467)

Unified Diff: third_party/WebKit/Source/platform/transforms/TransformOperations.cpp

Issue 2616863002: Remove TransformOperation::None (Closed)
Patch Set: address comments Created 3 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « third_party/WebKit/Source/platform/transforms/TransformOperation.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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:
« no previous file with comments | « third_party/WebKit/Source/platform/transforms/TransformOperation.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698