simplify generatescaledpixels

BUG=skia:

Change-Id: Ia1f975d8ca088a552258fd70d3333683a88bbb5f
Reviewed-on: https://skia-review.googlesource.com/6234
Reviewed-by: Florin Malita <fmalita@chromium.org>
Commit-Queue: Mike Reed <reed@google.com>

1 files changed, 3 insertions, 13 deletions

diff --git a/src/core/SkImageGenerator.cpp b/src/core/SkImageGenerator.cpp
index 550c34b0b5..c941605da8 100644
--- a/src/core/SkImageGenerator.cpp
+++ b/src/core/SkImageGenerator.cpp
@@ -93,21 +93,11 @@ bool SkImageGenerator::computeScaledDimensions(SkScalar scale, SupportedSizes* s
     return false;
 }
 
-bool SkImageGenerator::generateScaledPixels(const SkISize& scaledSize,
-                                            const SkIPoint& subsetOrigin,
-                                            const SkPixmap& subsetPixels) {
-    if (scaledSize.width() <= 0 || scaledSize.height() <= 0) {
+bool SkImageGenerator::generateScaledPixels(const SkPixmap& scaledPixels) {
+    if (scaledPixels.width() <= 0 || scaledPixels.height() <= 0) {
         return false;
     }
-    if (subsetPixels.width() <= 0 || subsetPixels.height() <= 0) {
-        return false;
-    }
-    const SkIRect subset = SkIRect::MakeXYWH(subsetOrigin.x(), subsetOrigin.y(),
-                                             subsetPixels.width(), subsetPixels.height());
-    if (!SkIRect::MakeWH(scaledSize.width(), scaledSize.height()).contains(subset)) {
-        return false;
-    }
-    return this->onGenerateScaledPixels(scaledSize, subsetOrigin, subsetPixels);
+    return this->onGenerateScaledPixels(scaledPixels);
 }
 
 bool SkImageGenerator::accessScaledImage(const SkRect& src, const SkMatrix& matrix,