OpaqueNonClientView cleanup

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 189 matching lines @@
   SkPaint p(paint);
   p.setFilterBitmap(filter);
   p.setShader(shader);
   shader->unref();
 
   // The rect will be filled by the bitmap.
   drawRect(dest_rect, p);
 }
 
 void ChromeCanvas::TileImageInt(const SkBitmap& bitmap,
-                                int x, int y, int w, int h,
-                                SkPorterDuff::Mode mode) {
-  if (!IntersectsClipRectInt(x, y, w, h))
+                                int x, int y, int w, int h) {
+  TileImageInt(bitmap, 0, 0, x, y, w, h);
+}
+
+void ChromeCanvas::TileImageInt(const SkBitmap& bitmap, int src_x, int src_y,
+                                int dest_x, int dest_y, int w, int h) {
+  if (!IntersectsClipRectInt(dest_x, dest_y, w, h))
     return;
 
   SkPaint paint;
 
   SkShader* shader = SkShader::CreateBitmapShader(bitmap,
                                                   SkShader::kRepeat_TileMode,
                                                   SkShader::kRepeat_TileMode);
   paint.setShader(shader);
-  paint.setPorterDuffXfermode(mode);
+  paint.setPorterDuffXfermode(SkPorterDuff::kSrcOver_Mode);
 
   // CreateBitmapShader returns a Shader with a reference count of one, we
   // need to unref after paint takes ownership of the shader.
   shader->unref();
   save();
-  translate(SkIntToScalar(x), SkIntToScalar(y));
-  ClipRectInt(0, 0, w, h);
+  translate(SkIntToScalar(dest_x - src_x), SkIntToScalar(dest_y - src_y));
+  ClipRectInt(src_x, src_y, w, h);
   drawPaint(paint);
   restore();
 }
 
-void ChromeCanvas::TileImageInt(const SkBitmap& bitmap,
-                                int x, int y, int w, int h) {
-  TileImageInt(bitmap, x, y, w, h, SkPorterDuff::kSrcOver_Mode);
-}
-
 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;
 }