Improve toolbar button ink drop ripples at 1.25x

ui/views/animation/square_ink_drop_ripple.h

 // 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.
 
 #ifndef UI_VIEWS_ANIMATION_SQUARE_INK_DROP_RIPPLE_H_
 #define UI_VIEWS_ANIMATION_SQUARE_INK_DROP_RIPPLE_H_
 
 #include <memory>
 #include <string>
 
@@ skipping 113 matching lines @@
   // LayerAnimationSequences if not null.
   void AnimateToOpacity(
       float opacity,
       base::TimeDelta duration,
       ui::LayerAnimator::PreemptionStrategy preemption_strategy,
       gfx::Tween::Type tween,
       ui::LayerAnimationObserver* observer);
 
   // Updates all of the Transforms in |transforms_out| for a circle of the given
   // |size|.
-  void CalculateCircleTransforms(const gfx::Size& size,
+  void CalculateCircleTransforms(const gfx::Size& desired_size,
                                  InkDropTransforms* transforms_out) const;
 
   // Updates all of the Transforms in |transforms_out| for a rounded rectangle
-  // of the given |size| and |corner_radius|.
-  void CalculateRectTransforms(const gfx::Size& size,
+  // of the given |desired_size| and |corner_radius|. The effective size may
+  // differ from |desired_size| at certain scale factors to make sure the ripple
+  // is pixel-aligned.
+  void CalculateRectTransforms(const gfx::Size& desired_size,
                                float corner_radius,
                                InkDropTransforms* transforms_out) const;
 
+  // Calculates a Transform for a circle layer.
+  gfx::Transform CalculateCircleTransform(float scale,
+                                          float target_center_x,
+                                          float target_center_y) const;
+
+  // Calculates a Transform for a rectangle layer.
+  gfx::Transform CalculateRectTransform(float x_scale, float y_scale) const;
+
   // Updates all of the Transforms in |transforms_out| to the current Transforms
   // of the painted shape Layers.
   void GetCurrentTransforms(InkDropTransforms* transforms_out) const;
 
   // Updates all of the Transforms in |transforms_out| with the target
   // Transforms for the ACTIVATED animation.
   void GetActivatedTargetTransforms(InkDropTransforms* transforms_out) const;
 
   // Updates all of the Transforms in |transforms_out| with the target
   // Transforms for the DEACTIVATED animation.
   void GetDeactivatedTargetTransforms(InkDropTransforms* transforms_out) const;
 
   // Adds and configures a new |painted_shape| layer to |painted_layers_|.
   void AddPaintLayer(PaintedShape painted_shape);
 
   // The shape used for the ACTIVATED/DEACTIVATED states.
   ActivatedShape activated_shape_;
 
   // Ink drop opacity when it is visible.
-  const float visible_opacity_;
+  float visible_opacity_;
 
   // Maximum size that an ink drop will be drawn to for any InkDropState whose
   // final frame should be large.
   const gfx::Size large_size_;
 
   // Corner radius used to draw the rounded rectangles corner for any
   // InkDropState whose final frame should be large.
   const int large_corner_radius_;
 
   // Maximum size that an ink drop will be drawn to for any InkDropState whose
   // final frame should be small.
   const gfx::Size small_size_;
 
   // Corner radius used to draw the rounded rectangles corner for any
   // InkDropState whose final frame should be small.
   const int small_corner_radius_;
 
+  // The center point of the ripple, relative to the root layer's origin.
+  gfx::Point center_point_;
+
   // ui::LayerDelegate to paint circles for all the circle layers.
   std::unique_ptr<CircleLayerDelegate> circle_layer_delegate_;
 
   // ui::LayerDelegate to paint rectangles for all the rectangle layers.
   std::unique_ptr<RectangleLayerDelegate> rect_layer_delegate_;
 
   // The root layer that parents the animating layers. The root layer is used to
   // manipulate opacity and location, and its children are used to manipulate
   // the different painted shapes that compose the ink drop.
   ui::Layer root_layer_;
 
   // ui::Layers for all of the painted shape layers that compose the ink drop.
   std::unique_ptr<ui::Layer> painted_layers_[PAINTED_SHAPE_COUNT];
 
   DISALLOW_COPY_AND_ASSIGN(SquareInkDropRipple);
 };
 
 }  // namespace views
 
 #endif  // UI_VIEWS_ANIMATION_SQUARE_INK_DROP_RIPPLE_H_