Fix a problem with DrawRectInt at the edges of a ChromeCanvas.

chrome/common/gfx/chrome_canvas.cc

 // 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.
 
 #include "chrome/common/gfx/chrome_canvas.h"
 
 #include <limits>
 
 #include "base/gfx/rect.h"
 #include "base/logging.h"
@@ skipping 40 matching lines @@
                                int x, int y, int w, int h) {
   SkPaint paint;
   paint.setColor(color);
   paint.setStyle(SkPaint::kFill_Style);
   paint.setPorterDuffXfermode(SkPorterDuff::kSrcOver_Mode);
   FillRectInt(x, y, w, h, paint);
 }
 
 void ChromeCanvas::FillRectInt(int x, int y, int w, int h,
                                const SkPaint& paint) {
-  SkRect rc = {SkIntToScalar(x), SkIntToScalar(y),
-               SkIntToScalar(x + w), SkIntToScalar(y + h) };
-  drawRect(rc, paint);
+  SkIRect rc = {x, y, x + w, y + h};
+  drawIRect(rc, paint);
 }
 
 void ChromeCanvas::DrawRectInt(const SkColor& color,
                                int x, int y, int w, int h) {
   DrawRectInt(color, x, y, w, h, SkPorterDuff::kSrcOver_Mode);
 }
 
-void ChromeCanvas::DrawRectInt(const SkColor& color, int x, int y, int w, int h,
+void ChromeCanvas::DrawRectInt(const SkColor& color,
+                               int x, int y, int w, int h,
                                SkPorterDuff::Mode mode) {
   SkPaint paint;
   paint.setColor(color);
   paint.setStyle(SkPaint::kStroke_Style);
-  // Contrary to the docs, a width of 0 results in nothing.
-  paint.setStrokeWidth(SkIntToScalar(1));
+  // 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.setPorterDuffXfermode(mode);
 
-  SkRect rc = {SkIntToScalar(x), SkIntToScalar(y),
-               SkIntToScalar(x + w), SkIntToScalar(y + h) };
-  drawRect(rc, paint);
+  SkIRect rc = {x, y, x + w, y + h};
+  drawIRect(rc, paint);
 }
 
 void ChromeCanvas::DrawFocusRect(int x, int y, int width, int height) {
   // Create a 2D bitmap containing alternating on/off pixels - we do this
   // so that you never get two pixels of the same color around the edges
   // of the focus rect (this may mean that opposing edges of the rect may
   // have a dot pattern out of phase to each other).
   static SkBitmap* dots = NULL;
   if (!dots) {
     int col_pixels = 32;
@@ skipping 153 matching lines @@
 SkBitmap ChromeCanvas::ExtractBitmap() {
   const SkBitmap& device_bitmap = getDevice()->accessBitmap(false);
 
   // Make a bitmap to return, and a canvas to draw into it. We don't just want
   // to call extractSubset or the copy constuctor, since we want an actual copy
   // of the bitmap.
   SkBitmap result;
   device_bitmap.copyTo(&result, SkBitmap::kARGB_8888_Config);
   return result;
 }