From 2d9cb57c83553be3434c04f860d5e9fec30cb453 Mon Sep 17 00:00:00 2001 From: Robert Phillips Date: Mon, 13 Nov 2017 13:38:05 +0000 Subject: 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 > Commit-Queue: Robert Phillips 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 Commit-Queue: Robert Phillips --- include/private/GrSurfaceProxy.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'include/private/GrSurfaceProxy.h') diff --git a/include/private/GrSurfaceProxy.h b/include/private/GrSurfaceProxy.h index f99e199dee..23f62195c2 100644 --- a/include/private/GrSurfaceProxy.h +++ b/include/private/GrSurfaceProxy.h @@ -131,7 +131,7 @@ protected: SkASSERT(fTarget); SkASSERT(fTarget->fRefCnt > 0); - fTarget->fRefCnt += SkTMax(0, fRefCnt-1); // don't xfer the proxy's creation ref + fTarget->fRefCnt += (fRefCnt-1); // don't xfer the proxy's creation ref fTarget->fPendingReads += fPendingReads; fTarget->fPendingWrites += fPendingWrites; } -- cgit v1.2.3