Move |PlatformFont::GetStringWidth()| implementation up into font.cc directly.

ui/gfx/canvas_skia.cc

 // 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 "ui/gfx/canvas_skia.h"
 
 #include <limits>
 
 #include "base/i18n/rtl.h"
 #include "base/logging.h"
@@ skipping 59 matching lines @@
 CanvasSkia::CanvasSkia(SkCanvas* canvas)
     : owned_canvas_(),
       canvas_(canvas) {
   DCHECK(canvas);
 }
 
 CanvasSkia::~CanvasSkia() {
 }
 
 // static
+int CanvasSkia::GetStringWidth(const string16& text, const gfx::Font& font) {
+  int width = 0, height = 0;
+  CanvasSkia::SizeStringInt(text, font, &width, &height, Canvas::NO_ELLIPSIS);
+  return width;
+}
+
+// static
 int CanvasSkia::DefaultCanvasTextAlignment() {
   if (!base::i18n::IsRTL())
     return gfx::Canvas::TEXT_ALIGN_LEFT;
   return gfx::Canvas::TEXT_ALIGN_RIGHT;
 }
 
 SkBitmap CanvasSkia::ExtractBitmap() const {
   const SkBitmap& device_bitmap = canvas_->getDevice()->accessBitmap(false);
 
   // Make a bitmap to return, and a canvas to draw into it. We don't just want
@@ skipping 330 matching lines @@
 
 CanvasPaint* CanvasPaint::CreateCanvasPaint(gfx::NativeView view) {
 #if defined(OS_WIN) && !defined(USE_AURA)
   return new CanvasPaintWin(view);
 #else
   return NULL;
 #endif
 }
 
 }  // namespace gfx