[AiS] changing mac omnibox suggestions form NSMatrix to NSTableView

chrome/browser/ui/cocoa/omnibox/omnibox_popup_cell.mm

 // Copyright 2013 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/omnibox/omnibox_popup_cell.h"
 
 #include <algorithm>
 #include <cmath>
 
 #include "base/i18n/rtl.h"
 #include "base/mac/scoped_nsobject.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_util.h"
 #include "base/strings/sys_string_conversions.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/ui/cocoa/omnibox/omnibox_popup_view_mac.h"
 #include "chrome/browser/ui/cocoa/omnibox/omnibox_view_mac.h"
 #include "chrome/browser/ui/omnibox/omnibox_popup_model.h"
 #include "chrome/grit/generated_resources.h"
 #include "components/omnibox/suggestion_answer.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/gfx/font.h"
 
 namespace {
 
+// How much to adjust the cell sizing up from the default determined
+// by the font.
+const CGFloat kCellHeightAdjust = 6.0;

[dschuyler, 2015/04/24 18:43:08]

This is moved from another file in this CL.

+
 // How far to offset image column from the left.
 const CGFloat kImageXOffset = 5.0;
 
 // How far to offset the text column from the left.
 const CGFloat kTextStartOffset = 28.0;
 
 // Rounding radius of selection and hover background on popup items.
 const CGFloat kCellRoundingRadius = 2.0;
 
 // Flips the given |rect| in context of the given |frame|.
@@ skipping 162 matching lines @@
     description_.reset([CreateClassifiedAttributedString(
         answerString, DimTextColor(), match_.description_class) retain]);
   } else if (match_.description.empty()) {
     description_.reset();
   } else {
     description_.reset([CreateClassifiedAttributedString(
         match_.description, DimTextColor(), match_.description_class) retain]);
   }
 }
 
+- (id)copyWithZone:(NSZone*)zone {
+  NSAttributedString* separator = separator_.release();

[groby-ooo-7-16, 2015/04/24 20:11:16]

Why release them?

[dschuyler, 2015/04/25 01:05:42]

I was using code from this file as a pattern:
src/ui/base/cocoa/controls/hyperlink_button_cell.mm
I was getting a crash in this code and looked for a how it was done elsewhere.

[groby-ooo-7-16, 2015/04/25 01:31:11]

Huh? HyperlinkButtonCell's -copyWithZone: does not release?

+  NSAttributedString* description = description_.release();
+  NSAttributedString* prefix = prefix_.release();

[dschuyler, 2015/04/24 18:43:08]

This is my first shot at a copyWithZone member.  I patterned this after other
examples I found in chromium.
I thought something like this should work, though it didn't seem to:
copy->separator_.reset([separator_.get() copy]);

[groby-ooo-7-16, 2015/04/24 20:11:16]

Why does this not work? Also, copy->separator_reset([separator_ copy]); // no
get needed.

[dschuyler, 2015/04/25 01:05:42]

I must have mislead myself.  I was getting a crash (segfault iirc) in this code,
so I changed it to pattern after some existing code (that did a release). 
Changing back to the way I wanted it (as you suggest) seems fine now.  There
likely was an unrelated issue that I fixed separately and didn't realize that it
would fix this.  I'm changing to the other way of doing the copy.
Done.

[groby-ooo-7-16, 2015/04/25 01:31:11]

I know it's tempting, but please don't cargo-cult around alloc/retain - we'll
all pay for that :)

+  OmniboxPopupCell* copy = [super copyWithZone:zone];
+  copy->match_ = match_;
+  copy->separator_.reset([separator copy]);
+  separator_.reset(separator);
+  copy->description_.reset([description copy]);
+  description_.reset(description);
+  copy->prefix_.reset([prefix copy]);
+  prefix_.reset(prefix);
+  copy->maxMatchContentsWidth_ = maxMatchContentsWidth_;
+  copy->contentsOffset_ = contentsOffset_;
+  return copy;
+}
+
+- (NSRect)drawingRectForBounds:(NSRect)theRect {
+  // Enlarge the cell size.
+  theRect.size.height -= kCellHeightAdjust;
+  return theRect;
+}
+
 - (void)setMaxMatchContentsWidth:(CGFloat)maxMatchContentsWidth {
   maxMatchContentsWidth_ = maxMatchContentsWidth;
 }
 
 - (void)setContentsOffset:(CGFloat)contentsOffset {
   contentsOffset_ = contentsOffset;
 }
 
 // The default NSButtonCell drawing leaves the image flush left and
 // the title next to the image.  This spaces things out to line up
@@ skipping 209 matching lines @@
   }
   glyphOffset -= minOffset;
   if (glyphWidth == 0)
     glyphWidth = inputWidth - glyphOffset;
   if (isContentsRTL)
     glyphOffset += glyphWidth;
   return isRTL ? (inputWidth - glyphOffset) : glyphOffset;
 }
 
 @end