ui/gfx: Convert Canvas::ClipRectInt() to use gfx::Rect.

ui/gfx/canvas_direct2d.h

Index: ui/gfx/canvas_direct2d.h
diff --git a/ui/gfx/canvas_direct2d.h b/ui/gfx/canvas_direct2d.h
index 82710e9d5c7db88a27c56f924be913165370e909..e5a8aadf0b0da6bb495184a1d00e5ae927b6674c 100644
--- a/ui/gfx/canvas_direct2d.h
+++ b/ui/gfx/canvas_direct2d.h
@@ -10,6 +10,7 @@
 
 #include <stack>
 
+#include "base/compiler_specific.h"
 #include "base/win/scoped_comptr.h"
 #include "ui/gfx/canvas.h"
 
@@ -25,62 +26,69 @@ class UI_EXPORT CanvasDirect2D : public Canvas {
   static ID2D1Factory* GetD2D1Factory();
 
   // Overridden from Canvas:
-  virtual void Save();
-  virtual void SaveLayerAlpha(uint8 alpha);
-  virtual void SaveLayerAlpha(uint8 alpha, const gfx::Rect& layer_bounds);
-  virtual void Restore();
-  virtual bool ClipRectInt(int x, int y, int w, int h);
-  virtual void TranslateInt(int x, int y);
-  virtual void ScaleInt(int x, int y);
-  virtual void FillRectInt(const SkColor& color, int x, int y, int w, int h);
-  virtual void FillRectInt(const SkColor& color, int x, int y, int w, int h,
-                           SkXfermode::Mode mode);
-  virtual void FillRectInt(const gfx::Brush* brush, int x, int y, int w, int h);
-  virtual void DrawRectInt(const SkColor& color, int x, int y, int w, int h);
+  virtual void Save() OVERRIDE;
+  virtual void SaveLayerAlpha(uint8 alpha) OVERRIDE;
+  virtual void SaveLayerAlpha(uint8 alpha,
+                              const gfx::Rect& layer_bounds) OVERRIDE;
+  virtual void Restore() OVERRIDE;
+  virtual bool ClipRectInt(const gfx::Rect& rect) OVERRIDE;
+  virtual void TranslateInt(int x, int y) OVERRIDE;
+  virtual void ScaleInt(int x, int y) OVERRIDE;
+  virtual void FillRectInt(const SkColor& color,
+                           int x, int y, int w, int h) OVERRIDE;
+  virtual void FillRectInt(const SkColor& color,
+                           int x, int y, int w, int h,
+                           SkXfermode::Mode mode) OVERRIDE;
+  virtual void FillRectInt(const gfx::Brush* brush,
+                           int x, int y, int w, int h) OVERRIDE;
+  virtual void DrawRectInt(const SkColor& color,
+                           int x, int y, int w, int h) OVERRIDE;
   virtual void DrawRectInt(const SkColor& color,
                            int x, int y, int w, int h,
-                           SkXfermode::Mode mode);
-  virtual void DrawRectInt(int x, int y, int w, int h, const SkPaint& paint);
+                           SkXfermode::Mode mode) OVERRIDE;
+  virtual void DrawRectInt(int x, int y, int w, int h,
+                           const SkPaint& paint) OVERRIDE;
   virtual void DrawLineInt(const SkColor& color,
                            int x1, int y1,
-                           int x2, int y2);
-  virtual void DrawBitmapInt(const SkBitmap& bitmap, int x, int y);
+                           int x2, int y2) OVERRIDE;
+  virtual void DrawBitmapInt(const SkBitmap& bitmap, int x, int y) OVERRIDE;
   virtual void DrawBitmapInt(const SkBitmap& bitmap,
                              int x, int y,
-                             const SkPaint& paint);
+                             const SkPaint& paint) OVERRIDE;
   virtual 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);
+                             bool filter) OVERRIDE;
   virtual 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);
+                             const SkPaint& paint) OVERRIDE;
   virtual void DrawStringInt(const string16& text,
                              const gfx::Font& font,
                              const SkColor& color,
-                             int x, int y, int w, int h);
+                             int x, int y, int w, int h) OVERRIDE;
   virtual void DrawStringInt(const string16& text,
                              const gfx::Font& font,
                              const SkColor& color,
-                             const gfx::Rect& display_rect);
+                             const gfx::Rect& display_rect) OVERRIDE;
   virtual void DrawStringInt(const string16& text,
                              const gfx::Font& font,
                              const SkColor& color,
                              int x, int y, int w, int h,
-                             int flags);
-  virtual void DrawFocusRect(const gfx::Rect& rect);
-  virtual void TileImageInt(const SkBitmap& bitmap, int x, int y, int w, int h);
+                             int flags) OVERRIDE;
+  virtual void DrawFocusRect(const gfx::Rect& rect) OVERRIDE;
+  virtual void TileImageInt(const SkBitmap& bitmap,
+                            int x, int y, int w, int h) OVERRIDE;
   virtual void TileImageInt(const SkBitmap& bitmap,
                             int src_x, int src_y,
-                            int dest_x, int dest_y, int w, int h);
-  virtual gfx::NativeDrawingContext BeginPlatformPaint();
-  virtual void EndPlatformPaint();
-  virtual void Transform(const ui::Transform& transform);
-  virtual ui::TextureID GetTextureID();
-  virtual CanvasSkia* AsCanvasSkia();
-  virtual const CanvasSkia* AsCanvasSkia() const;
+                            int dest_x, int dest_y, int w, int h) OVERRIDE;
+  virtual gfx::NativeDrawingContext BeginPlatformPaint() OVERRIDE;
+  virtual void EndPlatformPaint() OVERRIDE;
+  virtual void Transform(const ui::Transform& transform) OVERRIDE;
+  virtual ui::TextureID GetTextureID() OVERRIDE;
+  virtual CanvasSkia* AsCanvasSkia() OVERRIDE;
+  virtual const CanvasSkia* AsCanvasSkia() const OVERRIDE;
 
  private:
   void SaveInternal(ID2D1Layer* layer);