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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: cc/animation/transform_operations.cc

Issue 951673002: Revert "Pull chromium at 2c3ffb2355a27c32f45e508ef861416b820c823b" (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: Created 5 years, 10 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 | « cc/animation/transform_operation.cc ('k') | cc/base/latency_info_swap_promise_monitor.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/animation/transform_operations.cc
diff --git a/cc/animation/transform_operations.cc b/cc/animation/transform_operations.cc
index 20e8c6a6587abd0f1ca11881062fbf4c75f47199..d9d58f2d36bbde4d74bb0f5bf6b35db99ea59876 100644
--- a/cc/animation/transform_operations.cc
+++ b/cc/animation/transform_operations.cc
@@ -85,9 +85,9 @@ bool TransformOperations::BlendedBoundsForBox(const gfx::BoxF& box,
bool TransformOperations::AffectsScale() const {
for (size_t i = 0; i < operations_.size(); ++i) {
- if (operations_[i].type == TransformOperation::TRANSFORM_OPERATION_SCALE)
+ if (operations_[i].type == TransformOperation::TransformOperationScale)
return true;
- if (operations_[i].type == TransformOperation::TRANSFORM_OPERATION_MATRIX &&
+ if (operations_[i].type == TransformOperation::TransformOperationMatrix &&
!operations_[i].matrix.IsIdentityOrTranslation())
return true;
}
@@ -97,18 +97,18 @@ bool TransformOperations::AffectsScale() const {
bool TransformOperations::PreservesAxisAlignment() const {
for (size_t i = 0; i < operations_.size(); ++i) {
switch (operations_[i].type) {
- case TransformOperation::TRANSFORM_OPERATION_IDENTITY:
- case TransformOperation::TRANSFORM_OPERATION_TRANSLATE:
- case TransformOperation::TRANSFORM_OPERATION_SCALE:
+ case TransformOperation::TransformOperationIdentity:
+ case TransformOperation::TransformOperationTranslate:
+ case TransformOperation::TransformOperationScale:
continue;
- case TransformOperation::TRANSFORM_OPERATION_MATRIX:
+ case TransformOperation::TransformOperationMatrix:
if (!operations_[i].matrix.IsIdentity() &&
!operations_[i].matrix.IsScaleOrTranslation())
return false;
continue;
- case TransformOperation::TRANSFORM_OPERATION_ROTATE:
- case TransformOperation::TRANSFORM_OPERATION_SKEW:
- case TransformOperation::TRANSFORM_OPERATION_PERSPECTIVE:
+ case TransformOperation::TransformOperationRotate:
+ case TransformOperation::TransformOperationSkew:
+ case TransformOperation::TransformOperationPerspective:
return false;
}
}
@@ -118,17 +118,17 @@ bool TransformOperations::PreservesAxisAlignment() const {
bool TransformOperations::IsTranslation() const {
for (size_t i = 0; i < operations_.size(); ++i) {
switch (operations_[i].type) {
- case TransformOperation::TRANSFORM_OPERATION_IDENTITY:
- case TransformOperation::TRANSFORM_OPERATION_TRANSLATE:
+ case TransformOperation::TransformOperationIdentity:
+ case TransformOperation::TransformOperationTranslate:
continue;
- case TransformOperation::TRANSFORM_OPERATION_MATRIX:
+ case TransformOperation::TransformOperationMatrix:
if (!operations_[i].matrix.IsIdentityOrTranslation())
return false;
continue;
- case TransformOperation::TRANSFORM_OPERATION_ROTATE:
- case TransformOperation::TRANSFORM_OPERATION_SCALE:
- case TransformOperation::TRANSFORM_OPERATION_SKEW:
- case TransformOperation::TRANSFORM_OPERATION_PERSPECTIVE:
+ case TransformOperation::TransformOperationRotate:
+ case TransformOperation::TransformOperationScale:
+ case TransformOperation::TransformOperationSkew:
+ case TransformOperation::TransformOperationPerspective:
return false;
}
}
@@ -140,18 +140,18 @@ bool TransformOperations::ScaleComponent(gfx::Vector3dF* scale) const {
bool has_scale_component = false;
for (size_t i = 0; i < operations_.size(); ++i) {
switch (operations_[i].type) {
- case TransformOperation::TRANSFORM_OPERATION_IDENTITY:
- case TransformOperation::TRANSFORM_OPERATION_TRANSLATE:
+ case TransformOperation::TransformOperationIdentity:
+ case TransformOperation::TransformOperationTranslate:
continue;
- case TransformOperation::TRANSFORM_OPERATION_MATRIX:
+ case TransformOperation::TransformOperationMatrix:
if (!operations_[i].matrix.IsIdentityOrTranslation())
return false;
continue;
- case TransformOperation::TRANSFORM_OPERATION_ROTATE:
- case TransformOperation::TRANSFORM_OPERATION_SKEW:
- case TransformOperation::TRANSFORM_OPERATION_PERSPECTIVE:
+ case TransformOperation::TransformOperationRotate:
+ case TransformOperation::TransformOperationSkew:
+ case TransformOperation::TransformOperationPerspective:
return false;
- case TransformOperation::TRANSFORM_OPERATION_SCALE:
+ case TransformOperation::TransformOperationScale:
if (has_scale_component)
return false;
has_scale_component = true;
@@ -191,7 +191,7 @@ void TransformOperations::AppendTranslate(SkMScalar x,
SkMScalar z) {
TransformOperation to_add;
to_add.matrix.Translate3d(x, y, z);
- to_add.type = TransformOperation::TRANSFORM_OPERATION_TRANSLATE;
+ to_add.type = TransformOperation::TransformOperationTranslate;
to_add.translate.x = x;
to_add.translate.y = y;
to_add.translate.z = z;
@@ -205,7 +205,7 @@ void TransformOperations::AppendRotate(SkMScalar x,
SkMScalar degrees) {
TransformOperation to_add;
to_add.matrix.RotateAbout(gfx::Vector3dF(x, y, z), degrees);
- to_add.type = TransformOperation::TRANSFORM_OPERATION_ROTATE;
+ to_add.type = TransformOperation::TransformOperationRotate;
to_add.rotate.axis.x = x;
to_add.rotate.axis.y = y;
to_add.rotate.axis.z = z;
@@ -217,7 +217,7 @@ void TransformOperations::AppendRotate(SkMScalar x,
void TransformOperations::AppendScale(SkMScalar x, SkMScalar y, SkMScalar z) {
TransformOperation to_add;
to_add.matrix.Scale3d(x, y, z);
- to_add.type = TransformOperation::TRANSFORM_OPERATION_SCALE;
+ to_add.type = TransformOperation::TransformOperationScale;
to_add.scale.x = x;
to_add.scale.y = y;
to_add.scale.z = z;
@@ -229,7 +229,7 @@ void TransformOperations::AppendSkew(SkMScalar x, SkMScalar y) {
TransformOperation to_add;
to_add.matrix.SkewX(x);
to_add.matrix.SkewY(y);
- to_add.type = TransformOperation::TRANSFORM_OPERATION_SKEW;
+ to_add.type = TransformOperation::TransformOperationSkew;
to_add.skew.x = x;
to_add.skew.y = y;
operations_.push_back(to_add);
@@ -239,7 +239,7 @@ void TransformOperations::AppendSkew(SkMScalar x, SkMScalar y) {
void TransformOperations::AppendPerspective(SkMScalar depth) {
TransformOperation to_add;
to_add.matrix.ApplyPerspectiveDepth(depth);
- to_add.type = TransformOperation::TRANSFORM_OPERATION_PERSPECTIVE;
+ to_add.type = TransformOperation::TransformOperationPerspective;
to_add.perspective_depth = depth;
operations_.push_back(to_add);
decomposed_transform_dirty_ = true;
@@ -248,7 +248,7 @@ void TransformOperations::AppendPerspective(SkMScalar depth) {
void TransformOperations::AppendMatrix(const gfx::Transform& matrix) {
TransformOperation to_add;
to_add.matrix = matrix;
- to_add.type = TransformOperation::TRANSFORM_OPERATION_MATRIX;
+ to_add.type = TransformOperation::TransformOperationMatrix;
operations_.push_back(to_add);
decomposed_transform_dirty_ = true;
}
« no previous file with comments | « cc/animation/transform_operation.cc ('k') | cc/base/latency_info_swap_promise_monitor.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698