Revert 50784 - Canvas refactoring part 3....

gfx/font_skia.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 "gfx/font.h"
 
 #include <gdk/gdk.h>
 #include <map>
 #include <pango/pango.h>
 
 #include "base/logging.h"
 #include "base/string_piece.h"
 #include "base/sys_string_conversions.h"
-#include "gfx/canvas_skia.h"
+#include "gfx/canvas.h"
 #include "third_party/skia/include/core/SkTypeface.h"
 #include "third_party/skia/include/core/SkPaint.h"
 
 namespace {
 
 // The font family name which is used when a user's application font for
 // GNOME/KDE is a non-scalable one. The name should be listed in the
 // IsFallbackFontAllowed function in skia/ext/SkFontHost_fontconfig_direct.cpp.
 const char* kFallbackFontFamilyName = "sans";
 
@@ skipping 145 matching lines @@
   paint->setSubpixelText(false);
   paint->setTextSize(SkFloatToScalar(font_size_ * Font::GetPangoScaleFactor()));
   paint->setTypeface(typeface_);
   paint->setFakeBoldText((BOLD & style_) && !typeface_->isBold());
   paint->setTextSkewX((ITALIC & style_) && !typeface_->isItalic() ?
                       -SK_Scalar1/4 : 0);
 }
 
 int Font::GetStringWidth(const std::wstring& text) const {
   int width = 0, height = 0;
-  CanvasSkia::SizeStringInt(text, *this, &width, &height,
-                            gfx::Canvas::NO_ELLIPSIS);
+  Canvas::SizeStringInt(text, *this, &width, &height, gfx::Canvas::NO_ELLIPSIS);
   return width;
 }
 
 void Font::InitPangoMetrics() {
   if (!pango_metrics_inited_) {
     pango_metrics_inited_ = true;
     PangoFontDescription* pango_desc = PangoFontFromGfxFont(*this);
     PangoFontMetrics* pango_metrics = GetPangoFontMetrics(pango_desc);
 
     underline_position_ =
@@ skipping 54 matching lines @@
 
 int Font::FontSize() {
   return font_size_;
 }
 
 NativeFont Font::nativeFont() const {
   return typeface_;
 }
 
 }  // namespace gfx