Instant Extended: Reduce clipping in omnibox

chrome/browser/ui/cocoa/omnibox/omnibox_view_mac.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.
 
 #include "chrome/browser/ui/cocoa/omnibox/omnibox_view_mac.h"
 
 #include <Carbon/Carbon.h>  // kVK_Return
 
 #include "base/mac/foundation_util.h"
 #include "base/string_util.h"
@@ skipping 125 matching lines @@
 
 OmniboxViewMac::OmniboxViewMac(OmniboxEditController* controller,
                                ToolbarModel* toolbar_model,
                                Profile* profile,
                                CommandUpdater* command_updater,
                                AutocompleteTextField* field)
     : OmniboxView(profile, controller, toolbar_model, command_updater),
       popup_view_(OmniboxPopupViewMac::Create(this, model(), field)),
       field_(field),
       delete_was_pressed_(false),
-      delete_at_end_pressed_(false),
-      line_height_(0) {
+      delete_at_end_pressed_(false) {
   [field_ setObserver:this];
 
   // Needed so that editing doesn't lose the styling.
   [field_ setAllowsEditingTextAttributes:YES];
 
   // Get the appropriate line height for the font that we use.
   scoped_nsobject<NSLayoutManager>
       layoutManager([[NSLayoutManager alloc] init]);
   [layoutManager setUsesScreenFonts:YES];
-  line_height_ = [layoutManager defaultLineHeightForFont:GetFieldFont()];
-  DCHECK_GT(line_height_, 0);
 }
 
 OmniboxViewMac::~OmniboxViewMac() {
   // Destroy popup view before this object in case it tries to call us
   // back in the destructor.
   popup_view_.reset();
 
   // Disconnect from |field_|, it outlives this object.
   [field_ setObserver:NULL];
 }
@@ skipping 265 matching lines @@
 
   // A kinda hacky way to add breaking at periods. This is what Safari does.
   // This works for IDNs too, despite the "en_US".
   [as addAttribute:@"NSLanguage" value:@"en_US_POSIX"
              range:as_entire_string];
 
   // Make a paragraph style locking in the standard line height as the maximum,
   // otherwise the baseline may shift "downwards".
   scoped_nsobject<NSMutableParagraphStyle>
       paragraph_style([[NSMutableParagraphStyle alloc] init]);
-  [paragraph_style setMaximumLineHeight:line_height_];
-  [paragraph_style setMinimumLineHeight:line_height_];
+  [paragraph_style setMaximumLineHeight:[[field_ cell] lineHeight]];
+  [paragraph_style setMinimumLineHeight:[[field_ cell] lineHeight]];

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

Definitely memoize this, since the compiler cannot.

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

Done.

   [as addAttribute:NSParagraphStyleAttributeName value:paragraph_style
              range:as_entire_string];
 
   url_parse::Component scheme, host;
   AutocompleteInput::ParseForEmphasizeComponents(
       display_text, &scheme, &host);
   bool grey_out_url = display_text.substr(scheme.begin, scheme.len) ==
       UTF8ToUTF16(extensions::kExtensionScheme);
   if (model()->CurrentTextIsURL() &&
       (host.is_nonempty() || grey_out_url)) {
@@ skipping 521 matching lines @@
 
 NSUInteger OmniboxViewMac::GetTextLength() const {
   return [field_ currentEditor] ?  [[[field_ currentEditor] string] length] :
                                    [[field_ stringValue] length];
 }
 
 bool OmniboxViewMac::IsCaretAtEnd() const {
   const NSRange selection = GetSelectedRange();
   return NSMaxRange(selection) == GetTextLength();
 }