[Mac] Fix bubble anchors in RTL

chrome/browser/ui/cocoa/location_bar/bubble_decoration.mm

 // Copyright (c) 2010 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 <cmath>
 
 #import "chrome/browser/ui/cocoa/location_bar/bubble_decoration.h"
 
 #include "base/logging.h"
 #include "base/mac/foundation_util.h"
@@ skipping 60 matching lines @@
          DividerPadding() + kLeftSidePadding;
 }
 
 NSRect BubbleDecoration::GetImageRectInFrame(NSRect frame) {
   NSRect image_rect = NSInsetRect(frame, 0.0, kImageFrameYInset);
   if (image_) {
     // Center the image vertically.
     const NSSize image_size = [image_ size];
 
     image_rect.origin.y +=
-        std::floor((NSHeight(frame) - image_size.height) / 2.0);
+        std::floor((NSHeight(image_rect) - image_size.height) / 2.0);
+    image_rect.origin.x += kLeftSidePadding;
     image_rect.size = image_size;
+    if (cocoa_l10n_util::ShouldDoExperimentalRTLLayout()) {
+      image_rect.origin.x =
+          NSMaxX(frame) - NSWidth(image_rect) - NSMinX(image_rect);
+    }
   }
   return image_rect;
 }
 
 NSColor* BubbleDecoration::GetDarkModeTextColor() {
   return skia::SkColorToSRGBNSColor(kMaterialDarkModeTextColor);
 }
 
 CGFloat BubbleDecoration::GetWidthForSpace(CGFloat width) {
   const CGFloat all_width = GetWidthForImageAndLabel(image_, label_);
@@ skipping 14 matching lines @@
   return background_frame;
 }
 
 void BubbleDecoration::DrawInFrame(NSRect frame, NSView* control_view) {
   const NSRect decoration_frame = NSInsetRect(frame, 0.0, kImageFrameYInset);
   CGFloat text_left_offset = NSMinX(decoration_frame);
   CGFloat text_right_offset = NSMaxX(decoration_frame);
   const BOOL is_rtl = cocoa_l10n_util::ShouldDoExperimentalRTLLayout();
 
   if (image_) {
-    // Center the image vertically.
-    const NSSize image_size = [image_ size];
-    NSRect image_rect = decoration_frame;
-    if (is_rtl) {
-      image_rect.origin.x =
-          NSMaxX(decoration_frame) - image_size.width - kLeftSidePadding;
-    } else {
-      image_rect.origin.x += kLeftSidePadding;
-    }
-    image_rect.origin.y +=
-        std::floor((NSHeight(decoration_frame) - image_size.height) / 2.0);
-    image_rect.size = image_size;
+    NSRect image_rect = GetImageRectInFrame(frame);
     [image_ drawInRect:image_rect
               fromRect:NSZeroRect  // Entire image
              operation:NSCompositeSourceOver
               fraction:1.0
         respectFlipped:YES
                  hints:nil];
     if (is_rtl)
       text_right_offset = NSMinX(image_rect) - kIconLabelPadding;
     else
       text_left_offset = NSMaxX(image_rect) + kIconLabelPadding;
@@ skipping 58 matching lines @@
   [attributes_ setObject:text_color forKey:NSForegroundColorAttributeName];
 }
 
 void BubbleDecoration::SetFont(NSFont* font) {
   [attributes_ setObject:font forKey:NSFontAttributeName];
 }
 
 void BubbleDecoration::SetRetinaBaselineOffset(CGFloat offset) {
   retina_baseline_offset_ = offset;
 }