ChromeCanvas->gfx::Canvas

app/gfx/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_
+#ifndef APP_GFX_CANVAS_H_
+#define APP_GFX_CANVAS_H_
 
 #if defined(OS_WIN)
 #include <windows.h>
 #endif
 
 #include <string>
 
 #include "base/basictypes.h"
 #include "skia/ext/platform_canvas.h"
 
-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,
-// rather one will be passed to you via the various paint methods in view.
+namespace gfx {
+
+class Font;
+class Rect;
+
+// Canvas is a SkCanvas subclass that provides a number of methods for common
+// operations used throughout an application built using base/gfx and app/gfx.
 //
 // All methods that take integer arguments (as is used throughout views)
 // end with Int. If you need to use methods provided by the superclass
 // you'll need to do a conversion. In particular you'll need to use
 // macro SkIntToScalar(xxx), or if converting from a scalar to an integer
 // SkScalarRound.
 //
 // A handful of methods in this class are overloaded providing an additional
 // argument of type SkPorterDuff::Mode. SkPorterDuff::Mode specifies how the
 // source and destination colors are combined. Unless otherwise specified,
 // the variant that does not take a SkPorterDuff::Mode uses a transfer mode
 // of kSrcOver_Mode.
-class ChromeCanvas : public skia::PlatformCanvas {
+class Canvas : public skia::PlatformCanvas {
  public:
   // Specifies the alignment for text rendered with the DrawStringInt method.
   enum {
     TEXT_ALIGN_LEFT = 1,
     TEXT_ALIGN_CENTER = 2,
     TEXT_ALIGN_RIGHT = 4,
     TEXT_VALIGN_TOP = 8,
     TEXT_VALIGN_MIDDLE = 16,
     TEXT_VALIGN_BOTTOM = 32,
 
     // Specifies the text consists of multiple lines.
     MULTI_LINE = 64,
 
     // By default DrawStringInt does not process the prefix ('&') character
     // specially. That is, the string "&foo" is rendered as "&foo". When
     // rendering text from a resource that uses the prefix character for
     // mnemonics, the prefix should be processed and can be rendered as an
     // underline (SHOW_PREFIX), or not rendered at all (HIDE_PREFIX).
     SHOW_PREFIX = 128,
     HIDE_PREFIX = 256,
 
     // Prevent ellipsizing
     NO_ELLIPSIS = 512,
 
     // Specifies if words can be split by new lines.
     // This only works with MULTI_LINE.
     CHARACTER_BREAK = 1024,
   };
 
-  // Creates an empty ChromeCanvas. Callers must use initialize before using
-  // the canvas.
-  ChromeCanvas();
+  // Creates an empty Canvas. Callers must use initialize before using the
+  // canvas.
+  Canvas();
 
-  ChromeCanvas(int width, int height, bool is_opaque);
+  Canvas(int width, int height, bool is_opaque);
 
-  virtual ~ChromeCanvas();
+  virtual ~Canvas();
 
   // Retrieves the clip rectangle and sets it in the specified rectangle if any.
   // Returns true if the clip rect is non-empty.
   bool GetClipRect(gfx::Rect* clip_rect);
 
   // Wrapper function that takes integer arguments.
   // Returns true if the clip is non-empty.
   // See clipRect for specifics.
   bool ClipRectInt(int x, int y, int w, int h);
 
@@ skipping 111 matching lines @@
  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);
+  DISALLOW_COPY_AND_ASSIGN(Canvas);
 };
 
 #if defined(OS_WIN) || defined(OS_LINUX)
-typedef skia::CanvasPaintT<ChromeCanvas> ChromeCanvasPaint;
+typedef skia::CanvasPaintT<Canvas> CanvasPaint;
 #endif
 
-#endif  // APP_GFX_CHROME_CANVAS_H_
+}  // namespace gfx;
+
+#endif  // #ifndef APP_GFX_CANVAS_H_