Revert 111288 - Possibly broke media_unittests on Mac

ui/gfx/canvas_skia.cc

 // 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.
 
 #include "ui/gfx/canvas_skia.h"
 
 #include <limits>
 
 #include "base/i18n/rtl.h"
 #include "base/logging.h"
@@ skipping 115 matching lines @@
   FillRect(color, rect, SkXfermode::kSrcOver_Mode);
 }
 
 void CanvasSkia::FillRect(const SkColor& color,
                           const gfx::Rect& rect,
                           SkXfermode::Mode mode) {
   SkPaint paint;
   paint.setColor(color);
   paint.setStyle(SkPaint::kFill_Style);
   paint.setXfermodeMode(mode);
-  DrawRect(rect, paint);
+  DrawRectInt(rect.x(), rect.y(), rect.width(), rect.height(), paint);
 }
 
 void CanvasSkia::FillRect(const gfx::Brush* brush, const gfx::Rect& rect) {
   const SkiaShader* shader = static_cast<const SkiaShader*>(brush);
   SkPaint paint;
   paint.setShader(shader->shader());
   // TODO(beng): set shader transform to match canvas transform.
-  DrawRect(rect, paint);
+  DrawRectInt(rect.x(), rect.y(), rect.width(), rect.height(), paint);
 }
 
-void CanvasSkia::DrawRect(const gfx::Rect& rect, const SkColor& color) {
-  DrawRect(rect, color, SkXfermode::kSrcOver_Mode);
+void CanvasSkia::DrawRectInt(const SkColor& color, int x, int y, int w, int h) {
+  DrawRectInt(color, x, y, w, h, SkXfermode::kSrcOver_Mode);
 }
 
-void CanvasSkia::DrawRect(const gfx::Rect& rect,
-                          const SkColor& color,
-                          SkXfermode::Mode mode) {
+void CanvasSkia::DrawRectInt(const SkColor& color,
+                             int x, int y, int w, int h,
+                             SkXfermode::Mode mode) {
   SkPaint paint;
   paint.setColor(color);
   paint.setStyle(SkPaint::kStroke_Style);
   // Set a stroke width of 0, which will put us down the stroke rect path.  If
   // we set a stroke width of 1, for example, this will internally create a
   // path and fill it, which causes problems near the edge of the canvas.
   paint.setStrokeWidth(SkIntToScalar(0));
   paint.setXfermodeMode(mode);
 
-  DrawRect(rect, paint);
+  DrawRectInt(x, y, w, h, paint);
 }
 
-void CanvasSkia::DrawRect(const gfx::Rect& rect, const SkPaint& paint) {
-  canvas_->drawIRect(RectToSkIRect(rect), paint);
+void CanvasSkia::DrawRectInt(int x, int y, int w, int h, const SkPaint& paint) {
+  SkIRect rc = { x, y, x + w, y + h };
+  canvas_->drawIRect(rc, paint);
 }
 
 void CanvasSkia::DrawLineInt(const SkColor& color,
                              int x1, int y1,
                              int x2, int y2) {
   SkPaint paint;
   paint.setColor(color);
   paint.setStrokeWidth(SkIntToScalar(1));
   canvas_->drawLine(SkIntToScalar(x1), SkIntToScalar(y1), SkIntToScalar(x2),
                     SkIntToScalar(y2), paint);
@@ skipping 28 matching lines @@
   // shader is refcounted and will have an initial refcount of 1.
   SkShader* shader = SkShader::CreateBitmapShader(
       *dots, SkShader::kRepeat_TileMode, SkShader::kRepeat_TileMode);
   // Assign the shader to the paint & release our reference. The paint will
   // now own the shader and the shader will be destroyed when the paint goes
   // out of scope.
   SkPaint paint;
   paint.setShader(shader);
   shader->unref();
 
-  DrawRect(gfx::Rect(rect.x(), rect.y(), rect.width(), 1), paint);
-  DrawRect(gfx::Rect(rect.x(), rect.y() + rect.height() - 1, rect.width(), 1),
-           paint);
-  DrawRect(gfx::Rect(rect.x(), rect.y(), 1, rect.height()), paint);
-  DrawRect(gfx::Rect(rect.x() + rect.width() - 1, rect.y(), 1, rect.height()),
-           paint);
+  DrawRectInt(rect.x(), rect.y(), rect.width(), 1, paint);
+  DrawRectInt(rect.x(), rect.y() + rect.height() - 1, rect.width(), 1, paint);
+  DrawRectInt(rect.x(), rect.y(), 1, rect.height(), paint);
+  DrawRectInt(rect.x() + rect.width() - 1, rect.y(), 1, rect.height(), paint);
 }
 
 void CanvasSkia::DrawBitmapInt(const SkBitmap& bitmap, int x, int y) {
   canvas_->drawBitmap(bitmap, SkIntToScalar(x), SkIntToScalar(y));
 }
 
 void CanvasSkia::DrawBitmapInt(const SkBitmap& bitmap,
                                int x, int y,
                                const SkPaint& paint) {
   canvas_->drawBitmap(bitmap, SkIntToScalar(x), SkIntToScalar(y), &paint);
@@ skipping 181 matching lines @@
 
 CanvasPaint* CanvasPaint::CreateCanvasPaint(gfx::NativeView view) {
 #if defined(OS_WIN) && !defined(USE_AURA)
   return new CanvasPaintWin(view);
 #else
   return NULL;
 #endif
 }
 
 }  // namespace gfx