Revert 111288 - Possibly broke media_unittests on Mac

ui/gfx/canvas_skia.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_SKIA_H_
 #define UI_GFX_CANVAS_SKIA_H_
 #pragma once
 
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
@@ skipping 91 matching lines @@
   virtual void Restore() OVERRIDE;
   virtual bool ClipRect(const gfx::Rect& rect) OVERRIDE;
   virtual void Translate(const gfx::Point& point) OVERRIDE;
   virtual void Scale(int x_scale, int y_scale) OVERRIDE;
   virtual void FillRect(const SkColor& color, const gfx::Rect& rect) OVERRIDE;
   virtual void FillRect(const SkColor& color,
                         const gfx::Rect& rect,
                         SkXfermode::Mode mode) OVERRIDE;
   virtual void FillRect(const gfx::Brush* brush,
                         const gfx::Rect& rect) OVERRIDE;
-  virtual void DrawRect(const gfx::Rect& rect, const SkColor& color) OVERRIDE;
-  virtual void DrawRect(const gfx::Rect& rect,
-                        const SkColor& color,
-                        SkXfermode::Mode mode) OVERRIDE;
-  virtual void DrawRect(const gfx::Rect& rect, const SkPaint& paint) 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) 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) 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) 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,
@@ skipping 66 matching lines @@
 
   scoped_ptr<skia::PlatformCanvas> owned_canvas_;
   SkCanvas* canvas_;
 
   DISALLOW_COPY_AND_ASSIGN(CanvasSkia);
 };
 
 }  // namespace gfx
 
 #endif  // UI_GFX_CANVAS_SKIA_H_