[Mac] Prevent omnibox text bg from drawing over decoration, focus ring.

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

 // Copyright (c) 2012 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.
 
 #import "chrome/browser/ui/cocoa/location_bar/autocomplete_text_field_cell.h"
 
 #include <stddef.h>
 
 #include "base/logging.h"
 #include "base/mac/foundation_util.h"
@@ skipping 346 matching lines @@
                            alpha:1] set];
     } else {
       [[[NSColor keyboardFocusIndicatorColor]
           colorWithAlphaComponent:alphaComponent] set];
     }
     [path stroke];
   }
 }
 
 - (void)drawInteriorWithFrame:(NSRect)cellFrame inView:(NSView*)controlView {
+  ui::ScopedCGContextSmoothFonts fontSmoothing;
+  [super drawInteriorWithFrame:cellFrame inView:controlView];
+
+  // NOTE: This method must closely match the logic in |-textFrameForFrame:|.
   std::vector<LocationBarDecoration*> decorations;
   std::vector<NSRect> decorationFrames;
   NSRect workingFrame;
 
   CalculatePositionsInFrame(cellFrame, leftDecorations_, rightDecorations_,
                             &decorations, &decorationFrames, &workingFrame);
 
-  // Draw the decorations.
+  // Draw the decorations. Do this after drawing the interior because the
+  // field editor's background rect overlaps the right edge of the security
+  // decoration's hover rounded rect.
   for (size_t i = 0; i < decorations.size(); ++i) {
     if (decorations[i]) {
       decorations[i]->DrawWithBackgroundInFrame(decorationFrames[i],
                                                 controlView);
     }
   }
-
-  // NOTE: This function must closely match the logic in
-  // |-textFrameForFrame:|.
-
-  // Superclass draws text portion WRT original |cellFrame|.
-  ui::ScopedCGContextSmoothFonts fontSmoothing;
-  [super drawInteriorWithFrame:cellFrame inView:controlView];
 }
 
 - (BOOL)canDropAtLocationInWindow:(NSPoint)location
                            ofView:(AutocompleteTextField*)controlView {
   NSRect cellFrame = [controlView bounds];
   const NSPoint locationInView =
       [controlView convertPoint:location fromView:nil];
 
   // If we have decorations, the drop can't occur at their horizontal padding.
   if (!leftDecorations_.empty() && locationInView.x < kLeftDecorationXOffset)
@@ skipping 296 matching lines @@
 
 @end
 
 @implementation AutocompleteTextFieldCell (TestingAPI)
 
 - (const std::vector<LocationBarDecoration*>&)mouseTrackingDecorations {
   return mouseTrackingDecorations_;
 }
 
 @end