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

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/box_f.h"
@@ skipping 96 matching lines @@
       case TransformOperation::TransformOperationRotate:
       case TransformOperation::TransformOperationScale:
       case TransformOperation::TransformOperationSkew:
       case TransformOperation::TransformOperationPerspective:
         return false;
     }
   }
   return true;
 }
 
-bool TransformOperations::MaximumScale(const TransformOperations& from,
-                                       SkMScalar min_progress,
-                                       SkMScalar max_progress,
-                                       float* max_scale) const {
-  if (!MatchesTypes(from))
-    return false;
-
-  gfx::Vector3dF from_scale;
-  gfx::Vector3dF to_scale;
-
-  if (!from.ScaleComponent(&from_scale) || !ScaleComponent(&to_scale))
-    return false;
-
-  gfx::Vector3dF scale_at_min_progress(
-      std::abs(gfx::Tween::FloatValueBetween(
-          min_progress, from_scale.x(), to_scale.x())),
-      std::abs(gfx::Tween::FloatValueBetween(
-          min_progress, from_scale.y(), to_scale.y())),
-      std::abs(gfx::Tween::FloatValueBetween(
-          min_progress, from_scale.z(), to_scale.z())));
-  gfx::Vector3dF scale_at_max_progress(
-      std::abs(gfx::Tween::FloatValueBetween(
-          max_progress, from_scale.x(), to_scale.x())),
-      std::abs(gfx::Tween::FloatValueBetween(
-          max_progress, from_scale.y(), to_scale.y())),
-      std::abs(gfx::Tween::FloatValueBetween(
-          max_progress, from_scale.z(), to_scale.z())));
-
-  gfx::Vector3dF max_scale_3d = scale_at_min_progress;
-  max_scale_3d.SetToMax(scale_at_max_progress);
-  *max_scale =
-      std::max(max_scale_3d.x(), std::max(max_scale_3d.y(), max_scale_3d.z()));
-  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::TransformOperationIdentity:
       case TransformOperation::TransformOperationTranslate:
         continue;
       case TransformOperation::TransformOperationMatrix:
         if (!operations_[i].matrix.IsIdentityOrTranslation())
@@ skipping 162 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