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

views/view_text_utils.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/view_text_utils.h"
 
 #include "app/bidi_line_iterator.h"
 #include "base/i18n/word_iterator.h"
 #include "base/logging.h"
 #include "base/utf_string_conversions.h"
@@ skipping 44 matching lines @@
         text_direction_is_rtl, ltr_inside_rtl_text);
 
     run_start = run_end;  // Advance over what we just drew.
   }
 
   // If the caller is interested in placing a link after this text blurb, we
   // figure out here where to place it.
   if (link && rect) {
     gfx::Size sz = link->GetPreferredSize();
     gfx::Insets insets = link->GetInsets();
-    WrapIfWordDoesntFit(sz.width(), font.height(), position, bounds);
+    WrapIfWordDoesntFit(sz.width(), font.GetHeight(), position, bounds);
     int x = position->width();
     int y = position->height();
 
     // Links have a border to allow them to be focused.
     y -= insets.top();
 
     *rect = gfx::Rect(x, y, sz.width(), sz.height());
 
     // Go from relative pixel coordinates (within the label we are drawing
     // on) to absolute pixel coordinates (relative to the top left corner of
@@ skipping 33 matching lines @@
   // Iterate over each word in the text, or put in a more locale-neutral way:
   // iterate to the next line breaking opportunity.
   while (iter.Advance()) {
     // Get the word and figure out the dimensions.
     std::wstring word;
     if (!ltr_within_rtl)
       word = UTF16ToWide(iter.GetWord());  // Get the next word.
     else
       word = text;  // Draw the whole text at once.
 
-    int w = font.GetStringWidth(word), h = font.height();
+    int w = font.GetStringWidth(word), h = font.GetHeight();
     gfx::CanvasSkia::SizeStringInt(word, font, &w, &h, flags);
 
     // If we exceed the boundaries, we need to wrap.
-    WrapIfWordDoesntFit(w, font.height(), position, bounds);
+    WrapIfWordDoesntFit(w, font.GetHeight(), position, bounds);
 
     int x = label->MirroredXCoordinateInsideView(position->width()) +
                                                  bounds.x();
     if (text_direction_is_rtl) {
       x -= w;
       // When drawing LTR strings inside RTL text we need to make sure we
       // draw the trailing space (if one exists after the LTR text) to the
       // left of the LTR string.
       if (ltr_within_rtl && word[word.size() - 1] == L' ') {
-        int space_w = font.GetStringWidth(L" "), space_h = font.height();
+        int space_w = font.GetStringWidth(L" "), space_h = font.GetHeight();
         gfx::CanvasSkia::SizeStringInt(L" ", font, &space_w, &space_h, flags);
         x += space_w;
       }
     }
     int y = position->height() + bounds.y();
 
     // Draw the text on the screen (mirrored, if RTL run).
-    canvas->DrawStringInt(word, font, text_color, x, y, w, font.height(),
+    canvas->DrawStringInt(word, font, text_color, x, y, w, font.GetHeight(),
                           flags);
 
     if (word.size() > 0 && word[word.size() - 1] == L'\x0a') {
       // When we come across '\n', we move to the beginning of the next line.
       position->set_width(0);
-      position->Enlarge(0, font.height());
+      position->Enlarge(0, font.GetHeight());
     } else {
       // Otherwise, we advance position to the next word.
       position->Enlarge(w, 0);
     }
 
     if (ltr_within_rtl)
       break;  // LTR within RTL is drawn as one unit, so we are done.
   }
 }
 
 void WrapIfWordDoesntFit(int word_width,
                          int font_height,
                          gfx::Size* position,
                          const gfx::Rect& bounds) {
   if (position->width() + word_width > bounds.right()) {
     position->set_width(0);
     position->Enlarge(0, font_height);
   }
 }
 
 }  // namespace view_text_utils