From 4a395049a977d7e04515bad490365fe9ec9ffaab Mon Sep 17 00:00:00 2001 From: Robert Phillips Date: Mon, 24 Apr 2017 16:27:17 +0000 Subject: Revert "Split up opLists (take 2)" This reverts commit df2bf213649e0b2bcb9402548af9976bbdf7a218. Reason for revert: Maybe AndroidOne timing out Original change's description: > Split up opLists (take 2) > > Reland of: https://skia-review.googlesource.com/c/11581/ (Split up opLists) > > https://skia-review.googlesource.com/c/13860/ (Make InstancedRendering more opList-splitting friendly) has landed so this should be good for another attempt. > > Change-Id: Icc9998196587510328e0a9ca1b2ce42013a86c6c > Reviewed-on: https://skia-review.googlesource.com/13802 > Reviewed-by: Brian Salomon > Commit-Queue: Robert Phillips > TBR=bsalomon@google.com,robertphillips@google.com,reviews@skia.org NOPRESUBMIT=true NOTREECHECKS=true NOTRY=true Change-Id: I744f2a3145b294e5911862bb39d57ca33a1b9a5a Reviewed-on: https://skia-review.googlesource.com/14184 Reviewed-by: Robert Phillips Commit-Queue: Robert Phillips --- include/private/GrSurfaceProxy.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'include/private') diff --git a/include/private/GrSurfaceProxy.h b/include/private/GrSurfaceProxy.h index 833f9d157b..eb4f2814e3 100644 --- a/include/private/GrSurfaceProxy.h +++ b/include/private/GrSurfaceProxy.h @@ -379,9 +379,9 @@ private: // This back-pointer is required so that we can add a dependancy between // the opList used to create the current contents of this surface // and the opList of a destination surface to which this one is being drawn or copied. - // This pointer is unreffed. OpLists own a ref on their surface proxies. GrOpList* fLastOpList; + typedef GrIORefProxy INHERITED; }; -- cgit v1.2.3