Fix toolbar button highlights

Remove RTL handling in toolbar_ink_drop_util since it's taken care
of by inkdrops.
Fix inkdrop highlight flip to use GetLocalBounds instead of
GetContentsBounds.

Bug: 1001417
Change-Id: I93c3cbe9badd9fa0f22b833e1634392e43998ebe
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1790407Reviewed-by: Peter Boström <pbos@chromium.org>
Reviewed-by: Robert Liao <robliao@chromium.org>
Commit-Queue: Robert Liao <robliao@chromium.org>
Cr-Commit-Position: refs/heads/master@{#694490}

chrome/browser/ui/views/toolbar/toolbar_ink_drop_util.cc

@@ -4,7 +4,6 @@
 
 #include "chrome/browser/ui/views/toolbar/toolbar_ink_drop_util.h"
 
-#include "base/i18n/rtl.h"
 #include "chrome/browser/themes/theme_properties.h"
 #include "chrome/browser/ui/layout_constants.h"
 #include "chrome/browser/ui/views/chrome_layout_provider.h"
@@ -27,19 +26,13 @@ constexpr float kToolbarInkDropHighlightVisibleOpacity = 0.08f;
 
 gfx::Insets GetToolbarInkDropInsets(const views::View* host_view,
                                     const gfx::Insets& margin_insets) {
-  // TODO(pbos): Inkdrop masks and layers should be flipped with RTL. Fix this
-  // and remove RTL handling from here.
-  gfx::Insets inkdrop_insets =
-      base::i18n::IsRTL()
-          ? gfx::Insets(margin_insets.top(), margin_insets.right(),
-                        margin_insets.bottom(), margin_insets.left())
-          : margin_insets;
-
   // Inset the inkdrop insets so that the end result matches the target inkdrop
   // dimensions.
   const gfx::Size host_size = host_view->size();
   const int inkdrop_dimensions = GetLayoutConstant(LOCATION_BAR_HEIGHT);
-  inkdrop_insets += gfx::Insets((host_size.height() - inkdrop_dimensions) / 2);
+  gfx::Insets inkdrop_insets =
+      margin_insets +
+      gfx::Insets((host_size.height() - inkdrop_dimensions) / 2);
 
   return inkdrop_insets;
 }

ui/views/controls/focus_ring.cc

@@ -184,9 +184,9 @@ SkRRect FocusRing::RingRectFromPathRect(const SkRRect& rrect) const {
 SkPath GetHighlightPath(const View* view) {
   SkPath path = GetHighlightPathInternal(view);
   if (view->flip_canvas_on_paint_for_rtl_ui()) {
-    gfx::Point center = view->GetContentsBounds().CenterPoint();
+    gfx::Point center = view->GetLocalBounds().CenterPoint();
     SkMatrix flip;
-    flip.setRotate(180, center.x(), center.y());
+    flip.setScale(-1, 1, center.x(), center.y());
     path.transform(flip);
   }
   return path;