Revert 50784 - Canvas refactoring part 3....

gfx/font_win.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 <windows.h>
 #include <math.h>
 
 #include <algorithm>
 
 #include "base/logging.h"
 #include "base/string_util.h"
 #include "base/win_util.h"
-#include "gfx/canvas_skia.h"
+#include "gfx/canvas.h"
 
 namespace gfx {
 
 // static
 Font::HFontRef* Font::base_font_ref_;
 
 // static
 Font::AdjustFontCallback Font::adjust_font_callback = NULL;
 Font::GetMinimumFontSizeCallback Font::get_minimum_font_size_callback = NULL;
 
@@ skipping 138 matching lines @@
   font_info.lfUnderline = ((style & UNDERLINED) == UNDERLINED);
   font_info.lfItalic = ((style & ITALIC) == ITALIC);
   font_info.lfWeight = (style & BOLD) ? FW_BOLD : FW_NORMAL;
 
   HFONT hfont = CreateFontIndirect(&font_info);
   return Font(CreateHFontRef(hfont));
 }
 
 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;
 }
 
 Font::HFontRef* Font::CreateHFontRef(HFONT font) {
   TEXTMETRIC font_metrics;
   HDC screen_dc = GetDC(NULL);
   HFONT previous_font = static_cast<HFONT>(SelectObject(screen_dc, font));
   int last_map_mode = SetMapMode(screen_dc, MM_TEXT);
   GetTextMetrics(screen_dc, &font_metrics);
   // Yes, this is how Microsoft recommends calculating the dialog unit
@@ skipping 21 matching lines @@
   }
   if (font_metrics.tmWeight >= kTextMetricWeightBold) {
     style |= Font::BOLD;
   }
 
   return new HFontRef(font, height, baseline, ave_char_width, style,
                       dlu_base_x);
 }
 
 }  // namespace gfx