ChromeFont->gfx::Font...

app/gfx/chrome_canvas.h

 // Copyright (c) 2006-2008 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.
 
 #ifndef APP_GFX_CHROME_CANVAS_H_
 #define APP_GFX_CHROME_CANVAS_H_
 
 #if defined(OS_WIN)
 #include <windows.h>
 #endif
 
 #include <string>
 
 #include "base/basictypes.h"
 #include "skia/ext/platform_canvas.h"
 
-class ChromeFont;
 namespace gfx {
+class Font;
 class Rect;
 }
 
 #if defined(OS_LINUX)
 typedef struct _cairo cairo_t;
 #endif
 
 // ChromeCanvas is the SkCanvas used by Views for all painting. It
 // provides a handful of methods for the common operations used throughout
 // Views. With few exceptions, you should NOT create a ChromeCanvas directly,
@@ skipping 116 matching lines @@
   void DrawBitmapInt(const SkBitmap& bitmap, int src_x, int src_y, int src_w,
                      int src_h, int dest_x, int dest_y, int dest_w, int dest_h,
                      bool filter);
   void DrawBitmapInt(const SkBitmap& bitmap, int src_x, int src_y, int src_w,
                      int src_h, int dest_x, int dest_y, int dest_w, int dest_h,
                      bool filter, const SkPaint& paint);
 
   // Draws text with the specified color, font and location. The text is
   // aligned to the left, vertically centered, clipped to the region. If the
   // text is too big, it is truncated and '...' is added to the end.
-  void DrawStringInt(const std::wstring& text, const ChromeFont& font,
+  void DrawStringInt(const std::wstring& text, const gfx::Font& font,
                      const SkColor& color, int x, int y, int w, int h);
 
   // Draws text with the specified color, font and location. The last argument
   // specifies flags for how the text should be rendered. It can be one of
   // TEXT_ALIGN_CENTER, TEXT_ALIGN_RIGHT or TEXT_ALIGN_LEFT.
-  void DrawStringInt(const std::wstring& text, const ChromeFont& font,
+  void DrawStringInt(const std::wstring& text, const gfx::Font& font,
                      const SkColor& color, int x, int y, int w, int h,
                      int flags);
 
 #ifdef OS_WIN  // Only implemented on Windows for now.
   // Draws text with a 1-pixel halo around it of the given color. It allows
   // ClearType to be drawn to an otherwise transparenct bitmap for drag images.
   // Drag images have only 1-bit of transparency, so we don't do any fancy
   // blurring.
-  void DrawStringWithHalo(const std::wstring& text, const ChromeFont& font,
+  void DrawStringWithHalo(const std::wstring& text, const gfx::Font& font,
                           const SkColor& text_color, const SkColor& halo_color,
                           int x, int y, int w, int h, int flags);
 #endif
 
   // Draws a dotted gray rectangle used for focus purposes.
   void DrawFocusRect(int x, int y, int width, int height);
 
   // Tiles the image in the specified region.
   void TileImageInt(const SkBitmap& bitmap, int x, int y, int w, int h);
   void TileImageInt(const SkBitmap& bitmap, int src_x, int src_y,
                     int dest_x, int dest_y, int w, int h);
 
   // Extracts a bitmap from the contents of this canvas.
   SkBitmap ExtractBitmap();
 
 #if defined(OS_LINUX)
   // Applies current matrix on the canvas to the cairo context. This should be
   // invoked anytime you plan on drawing directly to the cairo context. Be
   // sure and set the matrix back to the identity when done.
   void ApplySkiaMatrixToCairoContext(cairo_t* cr);
 #endif
 
   // Compute the size required to draw some text with the provided font.
   // Attempts to fit the text with the provided width and height. Increases
   // height and then width as needed to make the text fit. This method
   // supports multiple lines.
-  static void SizeStringInt(const std::wstring& test, const ChromeFont& font,
+  static void SizeStringInt(const std::wstring& test, const gfx::Font& font,
                             int *width, int* height, int flags);
 
  private:
 #if defined(OS_WIN)
   // Draws text with the specified color, font and location. The text is
   // aligned to the left, vertically centered, clipped to the region. If the
   // text is too big, it is truncated and '...' is added to the end.
   void DrawStringInt(const std::wstring& text, HFONT font,
                      const SkColor& color, int x, int y, int w, int h,
                      int flags);
 #endif
 
   DISALLOW_EVIL_CONSTRUCTORS(ChromeCanvas);
 };
 
 #if defined(OS_WIN) || defined(OS_LINUX)
 typedef skia::CanvasPaintT<ChromeCanvas> ChromeCanvasPaint;
 #endif
 
 #endif  // APP_GFX_CHROME_CANVAS_H_