diff options
author | Brian Salomon <bsalomon@google.com> | 2017-09-07 16:34:11 +0000 |
---|---|---|
committer | Skia Commit-Bot <skia-commit-bot@chromium.org> | 2017-09-07 16:34:22 +0000 |
commit | 4df0092eac6e9bb5afc516773a0c618630193dc6 (patch) | |
tree | 7fd4a8d27fecb048c5d6e0ad00f79414696d2687 /src/image/SkImage_Raster.cpp | |
parent | 1e75f2a1020cde6698420d5d088c5c42e7c037ac (diff) |
Revert "Remove "content" rect from GrTextureAdjuster."
This reverts commit 6e4bbbefe153495cf34ea42aa72691756e6ab40e.
Reason for revert: assertion failure
Original change's description:
> Remove "content" rect from GrTextureAdjuster.
>
> Since we got rid of texture-backed bitmaps this is no longer required.
>
> Change-Id: Id15c745994a3d6a1489e193b5d29916fa0931264
> Reviewed-on: https://skia-review.googlesource.com/36340
> Commit-Queue: Brian Salomon <bsalomon@google.com>
> Reviewed-by: Robert Phillips <robertphillips@google.com>
TBR=bsalomon@google.com,robertphillips@google.com
Change-Id: I2229ec05079368ff196ff351107f88062080e5ec
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Reviewed-on: https://skia-review.googlesource.com/43720
Reviewed-by: Brian Salomon <bsalomon@google.com>
Commit-Queue: Brian Salomon <bsalomon@google.com>
Diffstat (limited to 'src/image/SkImage_Raster.cpp')
-rw-r--r-- | src/image/SkImage_Raster.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/image/SkImage_Raster.cpp b/src/image/SkImage_Raster.cpp index cb4a5b2881..5b7e83f3a7 100644 --- a/src/image/SkImage_Raster.cpp +++ b/src/image/SkImage_Raster.cpp @@ -186,9 +186,10 @@ sk_sp<GrTextureProxy> SkImage_Raster::asTextureProxyRef(GrContext* context, uint32_t uniqueID; sk_sp<GrTextureProxy> tex = this->refPinnedTextureProxy(&uniqueID); if (tex) { - GrTextureAdjuster adjuster(context, fPinnedProxy, fBitmap.alphaType(), fPinnedUniqueID, - fBitmap.colorSpace()); - return adjuster.refTextureProxySafeForParams(params, scaleAdjust); + GrTextureAdjuster adjuster(context, fPinnedProxy, + fBitmap.alphaType(), fBitmap.bounds(), + fPinnedUniqueID, fBitmap.colorSpace()); + return adjuster.refTextureProxySafeForParams(params, nullptr, scaleAdjust); } return GrRefCachedBitmapTextureProxy(context, fBitmap, params, scaleAdjust); |