Instant Extended: Reduce clipping in omnibox

chrome/browser/ui/cocoa/styled_text_field_cell.mm

 // Copyright (c) 2011 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/styled_text_field_cell.h"
 
 #include "base/logging.h"
 #include "chrome/browser/themes/theme_properties.h"
 #include "chrome/browser/themes/theme_service.h"
 #import "chrome/browser/ui/cocoa/nsview_additions.h"
 #import "chrome/browser/ui/cocoa/themed_window.h"
 #include "grit/theme_resources.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/gfx/font.h"
 #include "ui/gfx/scoped_ns_graphics_context_save_gstate_mac.h"
 
+@interface StyledTextFieldCell ()
+- (NSRect)textFrameForFrameInternal:(NSRect)cellFrame;

[Scott Hess - ex-Googler, 2013/05/23 20:08:02]

I would just put this method above the two clients, and then drop the
@interface.  Rest of the code ain't sorted...

[sail, 2013/05/23 20:45:44]

Done.

+@end
+
 @implementation StyledTextFieldCell
 
-- (CGFloat)baselineAdjust {
+- (CGFloat)topTextFrameOffset {
   return 0.0;
 }
 
+- (CGFloat)bottomTextFrameOffset {
+  return 0.0;
+}
+
 - (CGFloat)cornerRadius {
   return 0.0;
 }
 
 - (rect_path_utils::RoundedCornerFlags)roundedCornerFlags {
   return rect_path_utils::RoundedCornerAll;
 }
 
 - (BOOL)shouldDrawBezel {
   return NO;
 }
 
 // Returns the same value as textCursorFrameForFrame, but does not call it
 // directly to avoid potential infinite loops.
 - (NSRect)textFrameForFrame:(NSRect)cellFrame {
-  return NSInsetRect(cellFrame, 0, [self baselineAdjust]);
+  return [self textFrameForFrameInternal:cellFrame];
 }
 
 // Returns the same value as textFrameForFrame, but does not call it directly to
 // avoid potential infinite loops.
 - (NSRect)textCursorFrameForFrame:(NSRect)cellFrame {
-  return NSInsetRect(cellFrame, 0, [self baselineAdjust]);
+  return [self textFrameForFrameInternal:cellFrame];
 }
 
 // Override to show the I-beam cursor only in the area given by
 // |textCursorFrameForFrame:|.
 - (void)resetCursorRect:(NSRect)cellFrame inView:(NSView *)controlView {
   [super resetCursorRect:[self textCursorFrameForFrame:cellFrame]
                   inView:controlView];
 }
 
 // For NSTextFieldCell this is the area within the borders.  For our
@@ skipping 95 matching lines @@
 
   // Draw the focus ring if needed.
   if ([self showsFirstResponder]) {
     NSColor* color = [[NSColor keyboardFocusIndicatorColor]
         colorWithAlphaComponent:0.5 / lineWidth];
     rect_path_utils::FrameRectWithInset(roundedCornerFlags, frame, 0.0, 0.0,
                                         radius, lineWidth * 2, color);
   }
 }
 
+- (NSRect)textFrameForFrameInternal:(NSRect)cellFrame {
+  CGFloat topOffset = [self topTextFrameOffset];
+  NSRect textFrame = cellFrame;
+  textFrame.origin.y += topOffset;
+  textFrame.size.height -= topOffset + [self bottomTextFrameOffset];
+  return textFrame;
+}
+
 @end