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/gpu/SkGpuDevice_drawTexture.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/gpu/SkGpuDevice_drawTexture.cpp')
| -rw-r--r-- | src/gpu/SkGpuDevice_drawTexture.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/gpu/SkGpuDevice_drawTexture.cpp b/src/gpu/SkGpuDevice_drawTexture.cpp index 596f50445c..c861cc919e 100644 --- a/src/gpu/SkGpuDevice_drawTexture.cpp +++ b/src/gpu/SkGpuDevice_drawTexture.cpp @@ -145,8 +145,9 @@ void SkGpuDevice::drawPinnedTextureProxy(sk_sp<GrTextureProxy> proxy, uint32_t p this->clip(), fRenderTargetContext.get()); return; } - GrTextureAdjuster adjuster(this->context(), std::move(proxy), alphaType, pinnedUniqueID, - colorSpace); + auto contentRect = SkIRect::MakeWH(proxy->width(), proxy->height()); + GrTextureAdjuster adjuster(this->context(), std::move(proxy), alphaType, contentRect, + pinnedUniqueID, colorSpace); this->drawTextureProducer(&adjuster, srcRect, dstRect, constraint, viewMatrix, paint); } |