Rename SkImage::draw(_, SkRect, SkRect) in SkImage::drawRect()

BUG=skia:2947
R=reed@google.com, junov@chromium.org

Author: piotaixr@chromium.org

Review URL: https://codereview.chromium.org/605843002

5 files changed, 8 insertions, 8 deletions

diff --git a/src/core/SkCanvas.cpp b/src/core/SkCanvas.cpp
index 96cd81e39c..065aecdd95 100644
--- a/src/core/SkCanvas.cpp
+++ b/src/core/SkCanvas.cpp
@@ -1894,7 +1894,7 @@ void SkCanvas::drawImage(const SkImage* image, SkScalar left, SkScalar top,
 void SkCanvas::drawImageRect(const SkImage* image, const SkRect* src,
                            const SkRect& dst,
                            const SkPaint* paint) {
-    image->draw(this, src, dst, paint);
+    image->drawRect(this, src, dst, paint);
 }
 
 void SkCanvas::drawBitmap(const SkBitmap& bitmap, SkScalar x, SkScalar y,
diff --git a/src/image/SkImage.cpp b/src/image/SkImage.cpp
index 41ac2165cb..f11900dcaa 100644
--- a/src/image/SkImage.cpp
+++ b/src/image/SkImage.cpp
@@ -33,9 +33,9 @@ void SkImage::draw(SkCanvas* canvas, SkScalar x, SkScalar y, const SkPaint* pain
     as_IB(this)->onDraw(canvas, x, y, paint);
 }
 
-void SkImage::draw(SkCanvas* canvas, const SkRect* src, const SkRect& dst,
+void SkImage::drawRect(SkCanvas* canvas, const SkRect* src, const SkRect& dst,
                    const SkPaint* paint) const {
-    as_IB(this)->onDrawRectToRect(canvas, src, dst, paint);
+    as_IB(this)->onDrawRect(canvas, src, dst, paint);
 }
 
 const void* SkImage::peekPixels(SkImageInfo* info, size_t* rowBytes) const {
diff --git a/src/image/SkImage_Base.h b/src/image/SkImage_Base.h
index 9542ba3b2e..4ff6a25965 100644
--- a/src/image/SkImage_Base.h
+++ b/src/image/SkImage_Base.h
@@ -15,7 +15,7 @@ public:
     SkImage_Base(int width, int height) : INHERITED(width, height) {}
 
     virtual void onDraw(SkCanvas*, SkScalar x, SkScalar y, const SkPaint*) const = 0;
-    virtual void onDrawRectToRect(SkCanvas*, const SkRect* src,
+    virtual void onDrawRect(SkCanvas*, const SkRect* src,
                                   const SkRect& dst, const SkPaint*) const = 0;
 
     // Default impl calls onDraw
diff --git a/src/image/SkImage_Gpu.cpp b/src/image/SkImage_Gpu.cpp
index cf1b493dd6..de49d1e339 100644
--- a/src/image/SkImage_Gpu.cpp
+++ b/src/image/SkImage_Gpu.cpp
@@ -20,7 +20,7 @@ public:
     virtual ~SkImage_Gpu();
 
     virtual void onDraw(SkCanvas*, SkScalar x, SkScalar y, const SkPaint*) const SK_OVERRIDE;
-    virtual void onDrawRectToRect(SkCanvas*, const SkRect* src, const SkRect& dst,
+    virtual void onDrawRect(SkCanvas*, const SkRect* src, const SkRect& dst,
                                   const SkPaint*) const SK_OVERRIDE;
     virtual GrTexture* onGetTexture() const SK_OVERRIDE;
     virtual bool getROPixels(SkBitmap*) const SK_OVERRIDE;
@@ -61,7 +61,7 @@ void SkImage_Gpu::onDraw(SkCanvas* canvas, SkScalar x, SkScalar y, const SkPaint
     canvas->drawBitmap(fBitmap, x, y, paint);
 }
 
-void SkImage_Gpu::onDrawRectToRect(SkCanvas* canvas, const SkRect* src, const SkRect& dst,
+void SkImage_Gpu::onDrawRect(SkCanvas* canvas, const SkRect* src, const SkRect& dst,
                                    const SkPaint* paint) const {
     canvas->drawBitmapRectToRect(fBitmap, src, dst, paint);
 }
diff --git a/src/image/SkImage_Raster.cpp b/src/image/SkImage_Raster.cpp
index 181f194b12..d13141c3c6 100644
--- a/src/image/SkImage_Raster.cpp
+++ b/src/image/SkImage_Raster.cpp
@@ -54,7 +54,7 @@ public:
     virtual ~SkImage_Raster();
 
     virtual void onDraw(SkCanvas*, SkScalar, SkScalar, const SkPaint*) const SK_OVERRIDE;
-    virtual void onDrawRectToRect(SkCanvas*, const SkRect*, const SkRect&,
+    virtual void onDrawRect(SkCanvas*, const SkRect*, const SkRect&,
                                   const SkPaint*) const SK_OVERRIDE;
     virtual bool onReadPixels(SkBitmap*, const SkIRect&) const SK_OVERRIDE;
     virtual const void* onPeekPixels(SkImageInfo*, size_t* /*rowBytes*/) const SK_OVERRIDE;
@@ -131,7 +131,7 @@ void SkImage_Raster::onDraw(SkCanvas* canvas, SkScalar x, SkScalar y, const SkPa
     canvas->drawBitmap(fBitmap, x, y, paint);
 }
 
-void SkImage_Raster::onDrawRectToRect(SkCanvas* canvas, const SkRect* src, const SkRect& dst,
+void SkImage_Raster::onDrawRect(SkCanvas* canvas, const SkRect* src, const SkRect& dst,
                                       const SkPaint* paint) const {
     canvas->drawBitmapRectToRect(fBitmap, src, dst, paint);
 }