Make subset param to texture generation API non-optional

We were always already supplying this, makes it simpler

BUG=skia:

Change-Id: I36ac35205df5ab2a0fb7ec26e83ddb1547154816
Reviewed-on: https://skia-review.googlesource.com/5778
Reviewed-by: Brian Salomon <bsalomon@google.com>
Commit-Queue: Brian Osman <brianosman@google.com>

1 files changed, 4 insertions, 6 deletions

diff --git a/src/core/SkPictureImageGenerator.cpp b/src/core/SkPictureImageGenerator.cpp
index b15fadd818..bf6d53feec 100644
--- a/src/core/SkPictureImageGenerator.cpp
+++ b/src/core/SkPictureImageGenerator.cpp
@@ -26,7 +26,7 @@ protected:
     bool onGenerateScaledPixels(const SkISize&, const SkIPoint&, const SkPixmap&) override;
 
 #if SK_SUPPORT_GPU
-    GrTexture* onGenerateTexture(GrContext*, const SkIRect*) override;
+    GrTexture* onGenerateTexture(GrContext*, const SkIRect&) override;
 #endif
 
 private:
@@ -132,9 +132,9 @@ SkImageGenerator* SkImageGenerator::NewFromPicture(const SkISize& size, const Sk
 #if SK_SUPPORT_GPU
 #include "GrTexture.h"
 
-GrTexture* SkPictureImageGenerator::onGenerateTexture(GrContext* ctx, const SkIRect* subset) {
+GrTexture* SkPictureImageGenerator::onGenerateTexture(GrContext* ctx, const SkIRect& subset) {
     const SkImageInfo& info = this->getInfo();
-    SkImageInfo surfaceInfo = subset ? info.makeWH(subset->width(), subset->height()) : info;
+    SkImageInfo surfaceInfo = info.makeWH(subset.width(), subset.height());
 
     //
     // TODO: respect the usage, by possibly creating a different (pow2) surface
@@ -145,9 +145,7 @@ GrTexture* SkPictureImageGenerator::onGenerateTexture(GrContext* ctx, const SkIR
     }
 
     SkMatrix matrix = fMatrix;
-    if (subset) {
-        matrix.postTranslate(-subset->x(), -subset->y());
-    }
+    matrix.postTranslate(-subset.x(), -subset.y());
     surface->getCanvas()->clear(0); // does NewRenderTarget promise to do this for us?
     surface->getCanvas()->drawPicture(fPicture.get(), &matrix, fPaint.getMaybeNull());
     sk_sp<SkImage> image(surface->makeImageSnapshot());