Avoid converting drawImage/drawImageRect into drawBitmap calls

Change-Id: I1ae551afa93222126852bb9e429a565379a93f24
Reviewed-on: https://skia-review.googlesource.com/33661
Reviewed-by: Brian Osman <brianosman@google.com>
Commit-Queue: Derek Sollenberger <djsollen@google.com>

1 files changed, 5 insertions, 2 deletions

diff --git a/src/gpu/SkGpuDevice.cpp b/src/gpu/SkGpuDevice.cpp
index 76352d0240..2d024b014b 100644
--- a/src/gpu/SkGpuDevice.cpp
+++ b/src/gpu/SkGpuDevice.cpp
@@ -1317,7 +1317,9 @@ void SkGpuDevice::drawImage(const SkImage* image, SkScalar x, SkScalar y,
             this->drawTextureProducer(&maker, nullptr, nullptr, SkCanvas::kFast_SrcRectConstraint,
                                       viewMatrix, this->clip(), paint);
         } else if (as_IB(image)->getROPixels(&bm, fRenderTargetContext->getColorSpace())) {
-            this->drawBitmap(bm, x, y, paint);
+            GrBitmapTextureMaker maker(fContext.get(), bm);
+            this->drawTextureProducer(&maker, nullptr, nullptr, SkCanvas::kFast_SrcRectConstraint,
+                                      viewMatrix, this->clip(), paint);
         }
     }
 }
@@ -1350,7 +1352,8 @@ void SkGpuDevice::drawImageRect(const SkImage* image, const SkRect* src,
         GrImageTextureMaker maker(fContext.get(), image, SkImage::kAllow_CachingHint);
         this->drawTextureProducer(&maker, src, &dst, constraint, this->ctm(), this->clip(), paint);
     } else if (as_IB(image)->getROPixels(&bm, fRenderTargetContext->getColorSpace())) {
-        this->drawBitmapRect(bm, src, dst, paint, constraint);
+        GrBitmapTextureMaker maker(fContext.get(), bm);
+        this->drawTextureProducer(&maker, src, &dst, constraint, this->ctm(), this->clip(), paint);
     }
 }