Fixed material design ink drop location for the MD download shelf buttons.

ui/views/animation/flood_fill_ink_drop_animation.cc

 // Copyright 2016 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 "ui/views/animation/flood_fill_ink_drop_animation.h"
 
 #include <algorithm>
 
 #include "base/logging.h"
 #include "third_party/skia/include/core/SkColor.h"
@@ skipping 92 matching lines @@
 }
 
 }  // namespace
 
 namespace views {
 
 FloodFillInkDropAnimation::FloodFillInkDropAnimation(
     const gfx::Size& size,
     const gfx::Point& center_point,
     SkColor color)
-    : size_(size),
+    : FloodFillInkDropAnimation(gfx::Rect(size), center_point, color) {}

[Evan Stade, 2016/04/27 23:51:22]

It looks like you can get rid of this one as well if you update just a couple
places we use size() --- instead, use GetLocalBounds().

[bruthig, 2016/04/28 00:04:40]

Done.

+
+FloodFillInkDropAnimation::FloodFillInkDropAnimation(
+    const gfx::Rect& clip_bounds,
+    const gfx::Point& center_point,
+    SkColor color)
+    : clip_bounds_(clip_bounds),
       center_point_(center_point),
       root_layer_(ui::LAYER_NOT_DRAWN),
-      circle_layer_delegate_(color,
-                             std::max(size_.width(), size_.height()) / 2.f),
+      circle_layer_delegate_(
+          color,
+          std::max(clip_bounds_.width(), clip_bounds_.height()) / 2.f),
       ink_drop_state_(InkDropState::HIDDEN) {
   root_layer_.set_name("FloodFillInkDropAnimation:ROOT_LAYER");
   root_layer_.SetMasksToBounds(true);
-  root_layer_.SetBounds(gfx::Rect(size_));
+  root_layer_.SetBounds(clip_bounds);
 
-  const gfx::Vector2dF translate_vector =
-      center_point_ - root_layer_.bounds().CenterPoint();
-  gfx::Transform transfrom;
-  transfrom.Translate(translate_vector.x(), translate_vector.y());
-  root_layer_.SetTransform(transfrom);
-
-  const int painted_size_length = 2 * std::max(size_.width(), size_.height());
+  const int painted_size_length =
+      2 * std::max(clip_bounds_.width(), clip_bounds_.height());
 
   painted_layer_.SetBounds(gfx::Rect(painted_size_length, painted_size_length));
   painted_layer_.SetFillsBoundsOpaquely(false);
   painted_layer_.set_delegate(&circle_layer_delegate_);
   painted_layer_.SetVisible(true);
   painted_layer_.SetOpacity(1.0);
   painted_layer_.SetMasksToBounds(false);
   painted_layer_.set_name("FloodFillInkDropAnimation:PAINTED_LAYER");
 
   root_layer_.Add(&painted_layer_);
@@ skipping 166 matching lines @@
   animator->StartAnimation(animation_sequence);
 }
 
 gfx::Transform FloodFillInkDropAnimation::CalculateTransform(
     float target_radius) const {
   const float target_scale = target_radius / circle_layer_delegate_.radius();
   const gfx::Point drawn_center_point =
       ToRoundedPoint(circle_layer_delegate_.GetCenterPoint());
 
   gfx::Transform transform = gfx::Transform();
-  transform.Translate(root_layer_.bounds().CenterPoint().x(),
-                      root_layer_.bounds().CenterPoint().y());
+  transform.Translate(center_point_.x(), center_point_.y());
   transform.Scale(target_scale, target_scale);
-  transform.Translate(-drawn_center_point.x(), -drawn_center_point.y());
+  transform.Translate(-drawn_center_point.x() - root_layer_.bounds().x(),
+                      -drawn_center_point.y() - root_layer_.bounds().y());
 
   return transform;
 }
 
 gfx::Transform FloodFillInkDropAnimation::GetMaxSizeTargetTransform() const {
   // TODO(estade): get rid of this 2, but make the fade out start before the
   // active/action transform is done.
   return CalculateTransform(
-      gfx::Vector2dF(size_.width(), size_.height()).Length() / 2);
+      gfx::Vector2dF(clip_bounds_.width(), clip_bounds_.height()).Length() / 2);
 }
 
 }  // namespace views