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

cc/animation/keyframed_animation_curve.cc

 // Copyright 2012 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 <algorithm>
 
 #include "cc/animation/keyframed_animation_curve.h"
 #include "ui/gfx/animation/tween.h"
 #include "ui/gfx/box_f.h"
 
@@ skipping 348 matching lines @@
 
 bool KeyframedTransformAnimationCurve::IsTranslation() const {
   for (size_t i = 0; i < keyframes_.size(); ++i) {
     if (!keyframes_[i]->Value().IsTranslation() &&
         !keyframes_[i]->Value().IsIdentity())
       return false;
   }
   return true;
 }
 
-bool KeyframedTransformAnimationCurve::MaximumScale(float* max_scale) const {
+bool KeyframedTransformAnimationCurve::MaximumTargetScale(
+    bool forward_direction,
+    float* max_scale) const {
   DCHECK_GE(keyframes_.size(), 2ul);
   *max_scale = 0.f;
-  for (size_t i = 1; i < keyframes_.size(); ++i) {
-    float min_progress = 0.f;
-    float max_progress = 1.f;
-    if (keyframes_[i - 1]->timing_function())
-      keyframes_[i - 1]->timing_function()->Range(&min_progress, &max_progress);
 
-    float max_scale_for_segment = 0.f;
-    if (!keyframes_[i]->Value().MaximumScale(keyframes_[i - 1]->Value(),
-                                             min_progress,
-                                             max_progress,
-                                             &max_scale_for_segment))
+  // If |forward_direction| is true, then skip the first frame, otherwise
+  // skip the last frame, since that is the original position in the animation.
+  size_t start = 1;
+  size_t end = keyframes_.size();
+  if (!forward_direction) {
+    --start;
+    --end;
+  }
+
+  for (size_t i = start; i < end; ++i) {
+    gfx::Vector3dF target_scale_for_segment;
+    if (!keyframes_[i]->Value().ScaleComponent(&target_scale_for_segment))
       return false;
-
-    *max_scale = std::max(*max_scale, max_scale_for_segment);
+    float max_scale_for_segment =
+        fmax(std::abs(target_scale_for_segment.x()),
+             fmax(std::abs(target_scale_for_segment.y()),
+                  std::abs(target_scale_for_segment.z())));
+    *max_scale = fmax(*max_scale, max_scale_for_segment);
   }
   return true;
 }
 
 scoped_ptr<KeyframedFilterAnimationCurve> KeyframedFilterAnimationCurve::
     Create() {
   return make_scoped_ptr(new KeyframedFilterAnimationCurve);
 }
 
 KeyframedFilterAnimationCurve::KeyframedFilterAnimationCurve() {}
@@ skipping 38 matching lines @@
 bool KeyframedFilterAnimationCurve::HasFilterThatMovesPixels() const {
   for (size_t i = 0; i < keyframes_.size(); ++i) {
     if (keyframes_[i]->Value().HasFilterThatMovesPixels()) {
       return true;
     }
   }
   return false;
 }
 
 }  // namespace cc