Revert 111288 - Possibly broke media_unittests on Mac

ui/gfx/canvas.h

 // Copyright (c) 2011 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 UI_GFX_CANVAS_H_
 #define UI_GFX_CANVAS_H_
 #pragma once
 
 #include <string>
 
@@ skipping 104 matching lines @@
                         const gfx::Rect& rect,
                         SkXfermode::Mode mode) = 0;
 
   // Fills the specified region with the specified brush.
   virtual void FillRect(const gfx::Brush* brush, const gfx::Rect& rect) = 0;
 
   // Draws a single pixel rect in the specified region with the specified
   // color, using a transfer mode of SkXfermode::kSrcOver_Mode.
   //
   // NOTE: if you need a single pixel line, use DrawLineInt.
-  virtual void DrawRect(const gfx::Rect& rect, const SkColor& color) = 0;
+  virtual void DrawRectInt(const SkColor& color,
+                           int x, int y, int w, int h) = 0;
 
   // Draws a single pixel rect in the specified region with the specified
   // color and transfer mode.
   //
   // NOTE: if you need a single pixel line, use DrawLineInt.
-  virtual void DrawRect(const gfx::Rect& rect,
-                        const SkColor& color,
-                        SkXfermode::Mode mode) = 0;
+  virtual void DrawRectInt(const SkColor& color,
+                           int x, int y, int w, int h,
+                           SkXfermode::Mode mode) = 0;
 
   // Draws the given rectangle with the given paint's parameters.
-  virtual void DrawRect(const gfx::Rect& rect, const SkPaint& paint) = 0;
+  virtual void DrawRectInt(int x, int y, int w, int h,
+                           const SkPaint& paint) = 0;
 
   // Draws a single pixel line with the specified color.
   virtual void DrawLineInt(const SkColor& color,
                            int x1, int y1,
                            int x2, int y2) = 0;
 
   // Draws a bitmap with the origin at the specified location. The upper left
   // corner of the bitmap is rendered at the specified location.
   virtual void DrawBitmapInt(const SkBitmap& bitmap, int x, int y) = 0;
 
@@ skipping 96 matching lines @@
   // Returns the rectangle that is invalid.
   virtual gfx::Rect GetInvalidRect() const = 0;
 
   // Returns the underlying Canvas.
   virtual Canvas* AsCanvas() = 0;
 };
 
 }  // namespace gfx
 
 #endif  // UI_GFX_CANVAS_H_