cc: Make PictureLayerImpl use a better choice for animated raster scale.

cc/animation/transform_operations.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_OPERATIONS_H_
 #define CC_ANIMATION_TRANSFORM_OPERATIONS_H_
 
 #include <vector>
 
 #include "base/memory/scoped_ptr.h"
@@ skipping 45 matching lines @@
                            SkMScalar min_progress,
                            SkMScalar max_progress,
                            gfx::BoxF* bounds) const;
 
   // Returns true if these operations affect scale.
   bool AffectsScale() const;
 
   // Returns true if these operations are only translations.
   bool IsTranslation() const;
 
-  // Sets |max_scale| to be the maximum scale in any dimension when calling
-  // Blend on |from| with progress in the range [min_progress, max_progress]. If
-  // this maximum scale cannot be computed, returns false.
-  bool MaximumScale(const TransformOperations& from,
-                    SkMScalar min_progress,
-                    SkMScalar max_progress,
-                    float* max_scale) const;
-
   // Returns true if this operation and its descendants have the same types
   // as other and its descendants.
   bool MatchesTypes(const TransformOperations& other) const;
 
   // Returns true if these operations can be blended. It will only return
   // false if we must resort to matrix interpolation, and matrix interpolation
   // fails (this can happen if either matrix cannot be decomposed).
   bool CanBlendWith(const TransformOperations& other) const;
 
+  // If these operations have no more than one scale operation, and if the only
+  // other operations are translations, sets |scale| to the scale component
+  // of these operations. Otherwise, returns false.
+  bool ScaleComponent(gfx::Vector3dF* scale) const;
+
   void AppendTranslate(SkMScalar x, SkMScalar y, SkMScalar z);
   void AppendRotate(SkMScalar x, SkMScalar y, SkMScalar z, SkMScalar degrees);
   void AppendScale(SkMScalar x, SkMScalar y, SkMScalar z);
   void AppendSkew(SkMScalar x, SkMScalar y);
   void AppendPerspective(SkMScalar depth);
   void AppendMatrix(const gfx::Transform& matrix);
   void AppendIdentity();
   bool IsIdentity() const;
 
  private:
   bool BlendInternal(const TransformOperations& from,
                      SkMScalar progress,
                      gfx::Transform* result) const;
 
   std::vector<TransformOperation> operations_;
 
   bool ComputeDecomposedTransform() const;
 
-  // If these operations have no more than one scale operation, and if the only
-  // other operations are translations, sets |scale| to the scale component
-  // of these operations. Otherwise, returns false.
-  bool ScaleComponent(gfx::Vector3dF* scale) const;
-
   // For efficiency, we cache the decomposed transform.
   mutable scoped_ptr<gfx::DecomposedTransform> decomposed_transform_;
   mutable bool decomposed_transform_dirty_;
 
   DISALLOW_ASSIGN(TransformOperations);
 };
 
 }  // namespace cc
 
 #endif  // CC_ANIMATION_TRANSFORM_OPERATIONS_H_