API changes to GrTextureAdjuster.

src/gpu/SkGpuDevice_drawTexture.cpp

 /*
  * Copyright 2015 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "SkGpuDevice.h"
 
 #include "GrBlurUtils.h"
@@ skipping 47 matching lines @@
                                       const SkRect* dstRect,
                                       SkCanvas::SrcRectConstraint constraint,
                                       const SkMatrix& viewMatrix,
                                       const GrClip& clip,
                                       const SkPaint& paint) {
     // Figure out the actual dst and src rect by clipping the src rect to the bounds of the
     // adjuster. If the src rect is clipped then the dst rect must be recomputed. Also determine
     // the matrix that maps the src rect to the dst rect.
     SkRect clippedSrcRect;
     SkRect clippedDstRect;
-    SkIRect contentIBounds;
-    adjuster->getContentArea(&contentIBounds);
-    const SkRect contentBounds = SkRect::Make(contentIBounds);
+    const SkRect srcBounds = SkRect::MakeIWH(adjuster->width(), adjuster->height());
     SkMatrix srcToDstMatrix;
     if (srcRect) {
         if (!dstRect) {
-            dstRect = &contentBounds;
+            dstRect = &srcBounds;
         }
-        if (!contentBounds.contains(*srcRect)) {
+        if (!srcBounds.contains(*srcRect)) {
             clippedSrcRect = *srcRect;
-            if (!clippedSrcRect.intersect(contentBounds)) {
+            if (!clippedSrcRect.intersect(srcBounds)) {
                 return;
             }
             if (!srcToDstMatrix.setRectToRect(*srcRect, *dstRect, SkMatrix::kFill_ScaleToFit)) {
                 return;
             }
             srcToDstMatrix.mapRect(&clippedDstRect, clippedSrcRect);
         } else {
             clippedSrcRect = *srcRect;
             clippedDstRect = *dstRect;
             if (!srcToDstMatrix.setRectToRect(*srcRect, *dstRect, SkMatrix::kFill_ScaleToFit)) {
                 return;
             }
         }
     } else {
-        clippedSrcRect = contentBounds;
+        clippedSrcRect = srcBounds;
         if (dstRect) {
             clippedDstRect = *dstRect;
-            if (!srcToDstMatrix.setRectToRect(contentBounds, *dstRect,
-                                              SkMatrix::kFill_ScaleToFit)) {
+            if (!srcToDstMatrix.setRectToRect(srcBounds, *dstRect, SkMatrix::kFill_ScaleToFit)) {
                 return;
             }
         } else {
-            clippedDstRect = contentBounds;
+            clippedDstRect = srcBounds;
             srcToDstMatrix.reset();
         }
     }
 
     this->drawTextureAdjusterImpl(adjuster, alphaOnly, clippedSrcRect, clippedDstRect, constraint,
                                   viewMatrix, srcToDstMatrix, clip, paint);
 }
 
 void SkGpuDevice::drawTextureAdjusterImpl(GrTextureAdjuster* adjuster,
                                           bool alphaTexture,
                                           const SkRect& clippedSrcRect,
                                           const SkRect& clippedDstRect,
                                           SkCanvas::SrcRectConstraint constraint,
                                           const SkMatrix& viewMatrix,
                                           const SkMatrix& srcToDstMatrix,
                                           const GrClip& clip,
                                           const SkPaint& paint) {
     // Specifying the texture coords as local coordinates is an attempt to enable more batching
     // by not baking anything about the srcRect, dstRect, or viewMatrix, into the texture FP. In
     // the future this should be an opaque optimization enabled by the combination of batch/GP and
     // FP.
-    SkMatrix textureFPMatrix;
     const SkMaskFilter* mf = paint.getMaskFilter();
-    GrTexture* texture = adjuster->originalTexture();
     // The shader expects proper local coords, so we can't replace local coords with texture coords
     // if the shader will be used. If we have a mask filter we will change the underlying geometry
     // that is rendered.
     bool canUseTextureCoordsAsLocalCoords = !use_shader(alphaTexture, paint) && !mf;
-    if (canUseTextureCoordsAsLocalCoords) {
-        textureFPMatrix.setIDiv(texture->width(), texture->height());
-    } else {
-        if (!srcToDstMatrix.invert(&textureFPMatrix)) {
-            return;
-        }
-        textureFPMatrix.postIDiv(texture->width(), texture->height());
-    }
 
     bool doBicubic;
     GrTextureParams::FilterMode fm =
         GrSkFilterQualityToGrFilterMode(paint.getFilterQuality(), viewMatrix, srcToDstMatrix,
                                         &doBicubic);
     const GrTextureParams::FilterMode* filterMode = doBicubic ? nullptr : &fm;
 
     GrTextureAdjuster::FilterConstraint constraintMode;
     if (SkCanvas::kFast_SrcRectConstraint == constraint) {
         constraintMode = GrTextureAdjuster::kNo_FilterConstraint;
     } else {
         constraintMode = GrTextureAdjuster::kYes_FilterConstraint;
     }
     
     // If we have to outset for AA then we will generate texture coords outside the src rect. The
     // same happens for any mask filter that extends the bounds rendered in the dst.
     // This is conservative as a mask filter does not have to expand the bounds rendered.
     bool coordsAllInsideSrcRect = !paint.isAntiAlias() && !mf;
 
+    const SkMatrix* textureMatrix;
+    SkMatrix tempMatrix;
+    if (canUseTextureCoordsAsLocalCoords) {
+        textureMatrix = &SkMatrix::I();
+    } else {
+        if (!srcToDstMatrix.invert(&tempMatrix)) {
+            return;
+        }
+        textureMatrix = &tempMatrix;
+    }
     SkAutoTUnref<const GrFragmentProcessor> fp(adjuster->createFragmentProcessor(
-        textureFPMatrix, clippedSrcRect, constraintMode, coordsAllInsideSrcRect, filterMode));
+        *textureMatrix, clippedSrcRect, constraintMode, coordsAllInsideSrcRect, filterMode));
     if (!fp) {
         return;
     }
     fp.reset(mix_texture_fp_with_paint_color_and_shader(fp, alphaTexture, this->context(),
                                                         viewMatrix, paint));
     GrPaint grPaint;
     if (!SkPaintToGrPaintReplaceShader(fContext, paint, fp, &grPaint)) {
         return;
     }
 
@@ skipping 19 matching lines @@
                                       rec,
                                       rrect)) {
         return;
     }
     SkPath rectPath;
     rectPath.addRect(clippedDstRect);
     GrBlurUtils::drawPathWithMaskFilter(this->context(), fDrawContext, fRenderTarget, fClip,
                                         rectPath, &grPaint, viewMatrix, mf, paint.getPathEffect(),
                                         GrStrokeInfo::FillInfo());
 }