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

views/controls/label.cc

 // 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 "views/controls/label.h"
 
 #include <cmath>
 #include <limits>
 
 #include "app/resource_bundle.h"
@@ skipping 40 matching lines @@
   if (!IsVisible() && collapse_when_hidden_)
     return gfx::Size();
 
   gfx::Size prefsize(GetTextSize());
   gfx::Insets insets = GetInsets();
   prefsize.Enlarge(insets.width(), insets.height());
   return prefsize;
 }
 
 int Label::GetBaseline() {
-  return GetInsets().top() + font_.baseline();
+  return GetInsets().top() + font_.GetBaseline();
 }
 
 int Label::GetHeightForWidth(int w) {
   if (!is_multi_line_)
     return View::GetHeightForWidth(w);
 
   w = std::max(0, w - GetInsets().width());
-  int h = font_.height();
+  int h = font_.GetHeight();
   gfx::CanvasSkia::SizeStringInt(text_, font_, &w, &h, ComputeMultiLineFlags());
   return h + GetInsets().height();
 }
 
 void Label::DidChangeBounds(const gfx::Rect& previous,
                             const gfx::Rect& current) {
   text_size_valid_ &= !is_multi_line_;
 }
 
 void Label::Paint(gfx::Canvas* canvas) {
@@ skipping 205 matching lines @@
 }
 
 gfx::Size Label::GetTextSize() const {
   if (!text_size_valid_) {
     // For single-line strings, we supply the largest possible width, because
     // while adding NO_ELLIPSIS to the flags works on Windows for forcing
     // SizeStringInt() to calculate the desired width, it doesn't seem to work
     // on Linux.
     int w = is_multi_line_ ?
         GetAvailableRect().width() : std::numeric_limits<int>::max();
-    int h = font_.height();
+    int h = font_.GetHeight();
     // For single-line strings, ignore the available width and calculate how
     // wide the text wants to be.
     int flags = ComputeMultiLineFlags();
     if (!is_multi_line_)
       flags |= gfx::Canvas::NO_ELLIPSIS;
     gfx::CanvasSkia::SizeStringInt(text_, font_, &w, &h, flags);
     text_size_.SetSize(w, h);
     text_size_valid_ = true;
   }
 
@@ skipping 138 matching lines @@
     *paint_text = gfx::ElideText(text_, font_, width(), true);
   } else {
     *paint_text = text_;
   }
 
   *text_bounds = GetTextBounds();
   *flags = ComputeMultiLineFlags();
 }
 
 }  // namespace views