aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/core
diff options
context:
space:
mode:
authorGravatar Robert Phillips <robertphillips@google.com>2017-02-18 15:15:51 -0500
committerGravatar Skia Commit-Bot <skia-commit-bot@chromium.org>2017-02-18 20:55:51 +0000
commit6f9f7ebb74f49a3b641421fd368d8101e81dd05e (patch)
treeff4f60366fb41ff6a6569c97c3897ed9bf5ee96b /src/core
parent7f302c4682f5d6eb9dc61f1fb1d12e1079024f70 (diff)
Expand use of GrMakeCachedBitmapProxy (take 2)
Reland of https://skia-review.googlesource.com/c/8666/ (Expand use of GrMakeCachedBitmapProxy) with a fix for the non-GPU build Change-Id: I91d1658139b895b94e04d3f486e56b76bc6d184a Reviewed-on: https://skia-review.googlesource.com/8700 Reviewed-by: Robert Phillips <robertphillips@google.com> Commit-Queue: Robert Phillips <robertphillips@google.com>
Diffstat (limited to 'src/core')
-rw-r--r--src/core/SkSpecialImage.cpp4
1 files changed, 1 insertions, 3 deletions
diff --git a/src/core/SkSpecialImage.cpp b/src/core/SkSpecialImage.cpp
index cef87b75be..0ae84d305b 100644
--- a/src/core/SkSpecialImage.cpp
+++ b/src/core/SkSpecialImage.cpp
@@ -261,9 +261,7 @@ public:
sk_sp<GrTextureProxy> onAsTextureProxy(GrContext* context) const override {
if (context) {
- sk_sp<GrTexture> tex(sk_ref_sp(GrRefCachedBitmapTexture(
- context, fBitmap, GrSamplerParams::ClampNoFilter(), nullptr)));
- return GrSurfaceProxy::MakeWrapped(std::move(tex));
+ return GrMakeCachedBitmapProxy(context, fBitmap);
}
return nullptr;