Revert "Pull chromium at 2c3ffb2355a27c32f45e508ef861416b820c823b"

cc/animation/transform_operation.h

 // 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.
 
 #ifndef CC_ANIMATION_TRANSFORM_OPERATION_H_
 #define CC_ANIMATION_TRANSFORM_OPERATION_H_
 
 #include "ui/gfx/transform.h"
 
 namespace gfx {
 class BoxF;
 }
 
 namespace cc {
 
 struct TransformOperation {
   enum Type {
-    TRANSFORM_OPERATION_TRANSLATE,
-    TRANSFORM_OPERATION_ROTATE,
-    TRANSFORM_OPERATION_SCALE,
-    TRANSFORM_OPERATION_SKEW,
-    TRANSFORM_OPERATION_PERSPECTIVE,
-    TRANSFORM_OPERATION_MATRIX,
-    TRANSFORM_OPERATION_IDENTITY
+    TransformOperationTranslate,
+    TransformOperationRotate,
+    TransformOperationScale,
+    TransformOperationSkew,
+    TransformOperationPerspective,
+    TransformOperationMatrix,
+    TransformOperationIdentity
   };
 
-  TransformOperation() : type(TRANSFORM_OPERATION_IDENTITY) {}
+  TransformOperation()
+      : type(TransformOperationIdentity) {
+  }
 
   Type type;
   gfx::Transform matrix;
 
   union {
     SkMScalar perspective_depth;
 
     struct {
       SkMScalar x, y;
     } skew;
@@ skipping 25 matching lines @@
                                   const TransformOperation* from,
                                   const TransformOperation* to,
                                   SkMScalar min_progress,
                                   SkMScalar max_progress,
                                   gfx::BoxF* bounds);
 };
 
 }  // namespace cc
 
 #endif  // CC_ANIMATION_TRANSFORM_OPERATION_H_