Revert "Pull chromium at 2c3ffb2355a27c32f45e508ef861416b820c823b"

cc/animation/transform_operations.cc

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "cc/animation/transform_operations.h"
 
 #include <algorithm>
 
 #include "ui/gfx/animation/tween.h"
 #include "ui/gfx/geometry/box_f.h"
@@ skipping 67 matching lines @@
                                                  &bounds_for_operation))
       return false;
     *bounds = bounds_for_operation;
   }
 
   return true;
 }
 
 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;
   }
   return false;
 }
 
 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;
     }
   }
   return true;
 }
 
 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;
     }
   }
   return true;
 }
 
 bool TransformOperations::ScaleComponent(gfx::Vector3dF* scale) const {
   *scale = gfx::Vector3dF(1.f, 1.f, 1.f);
   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;
         scale->Scale(operations_[i].scale.x,
                      operations_[i].scale.y,
                      operations_[i].scale.z);
     }
   }
   return true;
 }
@@ skipping 19 matching lines @@
     const TransformOperations& other) const {
   gfx::Transform dummy;
   return BlendInternal(other, 0.5, &dummy);
 }
 
 void TransformOperations::AppendTranslate(SkMScalar x,
                                           SkMScalar y,
                                           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;
   operations_.push_back(to_add);
   decomposed_transform_dirty_ = true;
 }
 
 void TransformOperations::AppendRotate(SkMScalar x,
                                        SkMScalar y,
                                        SkMScalar z,
                                        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;
   to_add.rotate.angle = degrees;
   operations_.push_back(to_add);
   decomposed_transform_dirty_ = true;
 }
 
 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;
   operations_.push_back(to_add);
   decomposed_transform_dirty_ = true;
 }
 
 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);
   decomposed_transform_dirty_ = true;
 }
 
 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;
 }
 
 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;
 }
 
 void TransformOperations::AppendIdentity() {
   operations_.push_back(TransformOperation());
 }
 
 bool TransformOperations::IsIdentity() const {
   for (size_t i = 0; i < operations_.size(); ++i) {
@@ skipping 48 matching lines @@
       decomposed_transform_.reset(new gfx::DecomposedTransform());
     gfx::Transform transform = Apply();
     if (!gfx::DecomposeTransform(decomposed_transform_.get(), transform))
       return false;
     decomposed_transform_dirty_ = false;
   }
   return true;
 }
 
 }  // namespace cc