Rework gfx::Font by moving platform-specific code into inner classes....

chrome/browser/autocomplete/autocomplete_popup_view_mac.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>
 
 #include "chrome/browser/autocomplete/autocomplete_popup_view_mac.h"
 
 #include "app/resource_bundle.h"
 #include "app/text_elider.h"
@@ skipping 85 matching lines @@
 NSMutableAttributedString* AutocompletePopupViewMac::DecorateMatchedString(
     const std::wstring &matchString,
     const AutocompleteMatch::ACMatchClassifications &classifications,
     NSColor* textColor, gfx::Font& font) {
   // Cache for on-demand computation of the bold version of |font|.
   NSFont* boldFont = nil;
 
   // Start out with a string using the default style info.
   NSString* s = base::SysWideToNSString(matchString);
   NSDictionary* attributes = [NSDictionary dictionaryWithObjectsAndKeys:
-                                  font.nativeFont(), NSFontAttributeName,
+                                  font.GetNativeFont(), NSFontAttributeName,
                                   textColor, NSForegroundColorAttributeName,
                                   nil];
   NSMutableAttributedString* as =
       [[[NSMutableAttributedString alloc] initWithString:s
                                               attributes:attributes]
         autorelease];
 
   // Mark up the runs which differ from the default.
   for (ACMatchClassifications::const_iterator i = classifications.begin();
        i != classifications.end(); ++i) {
     const BOOL isLast = (i+1) == classifications.end();
     const size_t nextOffset = (isLast ? matchString.length() : (i+1)->offset);
     const NSInteger location = static_cast<NSInteger>(i->offset);
     const NSInteger length = static_cast<NSInteger>(nextOffset - i->offset);
     const NSRange range = NSMakeRange(location, length);
 
     if (0 != (i->style & ACMatchClassification::URL)) {
       [as addAttribute:NSForegroundColorAttributeName
                  value:URLTextColor() range:range];
     }
 
     if (0 != (i->style & ACMatchClassification::MATCH)) {
       if (!boldFont) {
         NSFontManager* fontManager = [NSFontManager sharedFontManager];
-        boldFont = [fontManager convertFont:font.nativeFont()
+        boldFont = [fontManager convertFont:font.GetNativeFont()
                                 toHaveTrait:NSBoldFontMask];
       }
       [as addAttribute:NSFontAttributeName value:boldFont range:range];
     }
   }
 
   return as;
 }
 
 NSMutableAttributedString* AutocompletePopupViewMac::ElideString(
@@ skipping 48 matching lines @@
     // the cell to make sure the description will be at least
     // partially visible.
     // TODO(shess): Consider revising our NSCell subclass to have two
     // bits and just draw them right, rather than truncating here.
     const float textWidth = cellWidth - kTextXOffset;
     as = ElideString(as, match.contents, font,
                      textWidth * kMaxContentsFraction);
 
     NSDictionary* attributes =
         [NSDictionary dictionaryWithObjectsAndKeys:
-             font.nativeFont(), NSFontAttributeName,
+             font.GetNativeFont(), NSFontAttributeName,
              ContentTextColor(), NSForegroundColorAttributeName,
              nil];
     NSString* rawEnDash = [NSString stringWithFormat:@" %C ", 0x2013];
     NSAttributedString* enDash =
         [[[NSAttributedString alloc] initWithString:rawEnDash
                                          attributes:attributes] autorelease];
 
     NSAttributedString* description =
         DecorateMatchedString(match.description, match.description_class,
                               DescriptionTextColor(), font);
@@ skipping 187 matching lines @@
     popup_.reset(nil);
 
     return;
   }
 
   CreatePopupIfNeeded();
 
   // The popup's font is a slightly smaller version of the field's.
   NSFont* fieldFont = AutocompleteEditViewMac::GetFieldFont();
   const CGFloat resultFontSize = [fieldFont pointSize] + kEditFontAdjust;
-  gfx::Font resultFont = gfx::Font::CreateFont(
-      base::SysNSStringToWide([fieldFont fontName]), (int)resultFontSize);
+  gfx::Font resultFont(base::SysNSStringToWide([fieldFont fontName]),
+                       static_cast<int>(resultFontSize));
 
   AutocompleteMatrix* matrix = [popup_ contentView];
 
   // Calculate the width of the matrix based on backing out the
   // popup's border from the width of the field.  Would prefer to use
   // [matrix convertSize:fromView:] for converting from screen size,
   // but that doesn't work until the popup is on-screen (bug?).
   const NSRect fieldRectBase = [field_ convertRect:[field_ bounds] toView:nil];
   const CGFloat popupWidth = NSWidth(fieldRectBase) - 2 * kWindowBorderWidth;
   DCHECK_GT(popupWidth, 0.0);
@@ skipping 314 matching lines @@
                                      yRadius:kPopupRoundingRadius];
 
   // Draw the matrix clipped to our border.
   [NSGraphicsContext saveGraphicsState];
   [path addClip];
   [super drawRect:rect];
   [NSGraphicsContext restoreGraphicsState];
 }
 
 @end