diff options
author | Robert Phillips <robertphillips@google.com> | 2017-11-13 13:38:05 +0000 |
---|---|---|
committer | Skia Commit-Bot <skia-commit-bot@chromium.org> | 2017-11-13 13:38:11 +0000 |
commit | 2d9cb57c83553be3434c04f860d5e9fec30cb453 (patch) | |
tree | 321f28bef2ac1bcb66786735ffa095c37fd81805 /tests/GrMipMappedTest.cpp | |
parent | 8d5ce2d9ede0c241b906f1a0df9dac3cf3c3aa55 (diff) |
Revert "Patch up ref counting of proxies"
This reverts commit 8d5ce2d9ede0c241b906f1a0df9dac3cf3c3aa55.
Reason for revert: ASAN failures
Original change's description:
> Patch up ref counting of proxies
>
> Bug: skia:
> Change-Id: If746283d788368bf7aad6d285f181d8531768e61
> Reviewed-on: https://skia-review.googlesource.com/70024
> Reviewed-by: Brian Salomon <bsalomon@google.com>
> Commit-Queue: Robert Phillips <robertphillips@google.com>
TBR=bsalomon@google.com,robertphillips@google.com
Change-Id: Ia2addb2a5dacad9e9c0080d1e53084bc62b780e0
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: skia:
Reviewed-on: https://skia-review.googlesource.com/70540
Reviewed-by: Robert Phillips <robertphillips@google.com>
Commit-Queue: Robert Phillips <robertphillips@google.com>
Diffstat (limited to 'tests/GrMipMappedTest.cpp')
-rw-r--r-- | tests/GrMipMappedTest.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/tests/GrMipMappedTest.cpp b/tests/GrMipMappedTest.cpp index c2a0df2e5d..f023018902 100644 --- a/tests/GrMipMappedTest.cpp +++ b/tests/GrMipMappedTest.cpp @@ -53,7 +53,7 @@ DEF_GPUTEST_FOR_RENDERING_CONTEXTS(GrWrappedMipMappedTest, reporter, ctxInfo) { mipMapped, backendHandle); - sk_sp<GrTextureProxy> proxy; + GrTextureProxy* proxy; sk_sp<SkImage> image; if (isRT) { sk_sp<SkSurface> surface = SkSurface::MakeFromBackendTexture( @@ -65,12 +65,12 @@ DEF_GPUTEST_FOR_RENDERING_CONTEXTS(GrWrappedMipMappedTest, reporter, ctxInfo) { nullptr); SkGpuDevice* device = ((SkSurface_Gpu*)surface.get())->getDevice(); - proxy = device->accessRenderTargetContext()->asTextureProxyRef(); + proxy = device->accessRenderTargetContext()->asTextureProxy(); } else { image = SkImage::MakeFromTexture(context, backendTex, kTopLeft_GrSurfaceOrigin, kPremul_SkAlphaType, nullptr); - proxy = as_IB(image)->asTextureProxyRef(); + proxy = as_IB(image)->peekProxy(); } REPORTER_ASSERT(reporter, proxy); if (!proxy) { |