ChromeFont->gfx::Font...

app/gfx/chrome_canvas_win.cc

 // 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.
 
 #include "app/gfx/chrome_canvas.h"
 
 #include <limits>
 
 #include "app/gfx/chrome_font.h"
 #include "app/l10n_util.h"
@@ skipping 111 matching lines @@
 }
 
 ChromeCanvas::ChromeCanvas() : skia::PlatformCanvasWin() {
 }
 
 ChromeCanvas::~ChromeCanvas() {
 }
 
 // static
 void ChromeCanvas::SizeStringInt(const std::wstring& text,
-                                 const ChromeFont& font,
+                                 const gfx::Font& font,
                                  int *width, int *height, int flags) {
   HDC dc = GetDC(NULL);
   HFONT old_font = static_cast<HFONT>(SelectObject(dc, font.hfont()));
   RECT b;
   b.left = 0;
   b.top = 0;
   b.right = *width;
   if (b.right == 0 && !text.empty()) {
     // Width needs to be at least 1 or else DoDrawText will not resize it.
     b.right = 1;
@@ skipping 32 matching lines @@
   // deletes the font and the DC lives longer.
   SelectObject(dc, old_font);
 
   // Windows will have cleared the alpha channel of the text we drew. Assume
   // we're drawing to an opaque surface, or at least the text rect area is
   // opaque.
   getTopPlatformDevice().makeOpaque(x, y, w, h);
 }
 
 void ChromeCanvas::DrawStringInt(const std::wstring& text,
-                                 const ChromeFont& font,
+                                 const gfx::Font& font,
                                  const SkColor& color,
                                  int x, int y, int w, int h, int flags) {
   DrawStringInt(text, font.hfont(), color, x, y, w, h, flags);
 }
 
 // Checks each pixel immediately adjacent to the given pixel in the bitmap. If
 // any of them are not the halo color, returns true. This defines the halo of
 // pixels that will appear around the text. Note that we have to check each
 // pixel against both the halo color and transparent since DrawStringWithHalo
 // will modify the bitmap as it goes, and clears pixels shouldn't count as
@@ skipping 13 matching lines @@
       *bitmap.getAddr32(x, y - 1) != 0)
     return true;  // Touched pixel above.
   if (y < bitmap.height() - 1 &&
       *bitmap.getAddr32(x, y + 1) != halo_color &&
       *bitmap.getAddr32(x, y + 1) != 0)
     return true;  // Touched pixel below.
   return false;
 }
 
 void ChromeCanvas::DrawStringWithHalo(const std::wstring& text,
-                                      const ChromeFont& font,
+                                      const gfx::Font& font,
                                       const SkColor& text_color,
                                       const SkColor& halo_color_in,
                                       int x, int y, int w, int h,
                                       int flags) {
   // Some callers will have semitransparent halo colors, which we don't handle
   // (since the resulting image can have 1-bit transparency only).
   SkColor halo_color = halo_color_in | 0xFF000000;
 
   // Create a temporary buffer filled with the halo color. It must leave room
   // for the 1-pixel border around the text.
@@ skipping 25 matching lines @@
           text_row[cur_x] = 0;  // Make transparent.
       } else {
         text_row[cur_x] |= 0xff << SK_A32_SHIFT;  // Make opaque.
       }
     }
   }
 
   // Draw the halo bitmap with blur.
   drawBitmap(text_bitmap, SkIntToScalar(x - 1), SkIntToScalar(y - 1));
 }