Remove InstallableInkDrop::GetHighlightPathForView

This is replaced with views::GetHighlightPath() which is used by the
other InkDrop and FocusRing.

Bug: chromium:931964, chromium:1007546
Change-Id: Id34c89f3a81edffc72d4ff7460882ebbda346368
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1836372
Auto-Submit: Peter Boström <pbos@chromium.org>
Commit-Queue: Collin Baker <collinbaker@chromium.org>
Reviewed-by: Collin Baker <collinbaker@chromium.org>
Cr-Commit-Position: refs/heads/master@{#702228}

ui/views/animation/installable_ink_drop.cc

@@ -23,6 +23,7 @@
 #include "ui/gfx/skia_util.h"
 #include "ui/views/animation/compositor_animation_runner.h"
 #include "ui/views/animation/ink_drop_host_view.h"
+#include "ui/views/controls/focus_ring.h"
 #include "ui/views/view.h"
 #include "ui/views/view_class_properties.h"
 #include "ui/views/widget/widget.h"
@@ -182,7 +183,7 @@ void InstallableInkDrop::OnPaintLayer(const ui::PaintContext& context) {
 
   ui::PaintRecorder paint_recorder(context, layer_->size());
   gfx::Canvas* canvas = paint_recorder.canvas();
-  canvas->ClipPath(GetHighlightPathForView(view_), true);
+  canvas->ClipPath(GetHighlightPath(view_), true);
 
   painter_.Paint(canvas, view_->size());
 }
@@ -191,24 +192,6 @@ void InstallableInkDrop::OnDeviceScaleFactorChanged(
     float old_device_scale_factor,
     float new_device_scale_factor) {}
 
-// static
-SkPath InstallableInkDrop::GetHighlightPathForView(const View* view) {
-  // Use the provided highlight path if there is one.
-  const SkPath* const path_property = view->GetProperty(kHighlightPathKey);
-  if (path_property)
-    return *path_property;
-
-  // Otherwise, construct a default path. This will be pill shaped, or circular
-  // when |view| is square.
-  SkPath path;
-
-  const float radius =
-      std::min(view->size().width(), view->size().height()) / 2.0f;
-  path.addRoundRect(gfx::RectToSkRect(view->GetLocalBounds()), radius, radius);
-
-  return path;
-}
-
 void InstallableInkDrop::SchedulePaint() {
   layer_->SchedulePaint(gfx::Rect(layer_->size()));
 }

ui/views/animation/installable_ink_drop.h

@@ -19,8 +19,6 @@
 #include "ui/views/view_observer.h"
 #include "ui/views/views_export.h"
 
-class SkPath;
-
 namespace gfx {
 class AnimationContainer;
 class Size;
@@ -94,10 +92,6 @@ class VIEWS_EXPORT InstallableInkDrop : public InkDrop,
   void OnDeviceScaleFactorChanged(float old_device_scale_factor,
                                   float new_device_scale_factor) override;
 
-  // Gets the path that the ink drop fills in for the highlight. This uses
-  // |kHighlightPathKey| if provided but falls back to a pill-shaped path.
-  static SkPath GetHighlightPathForView(const View* view);
-
  private:
   void SchedulePaint();
   void UpdateAnimatorHighlight();