Revert of Update testing frameworks/tests for MDB (patchset #4 id:60001 of https://codereview.chromium.org/1441533003/ )
Reason for revert:
Speculative revert for leaks based on ASAN bot (and some local valgrind testing)
Original issue's description:
> Update testing frameworks/tests for MDB
>
> This CL:
>
> Fixes an ordering problem w.r.t. drawTarget clean up in GrContext::abandonContext (for text test that abandons context)
> Fixes when the lastDrawTarget field is set on a RenderTarget (now in GrDrawTarget ctor) due to GrTestTarget use case
> Updates the ProgramUnitTest to use multiple drawTargets
> Adds renderTarget creation to GrTestTargets (in MDB drawTargets require them)
>
> BUG=skia:4094
>
> Committed: https://skia.googlesource.com/skia/+/9c8605144a0f15e3e69a4e1dcd5d3e63f339380e
TBR=joshualitt@chromium.org,joshualitt@google.com,robertphillips@google.com
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=skia:4094
Review URL: https://codereview.chromium.org/1450513002
diff --git a/src/gpu/GrTest.h b/src/gpu/GrTest.h
index 297f51c..92bfb13 100644
--- a/src/gpu/GrTest.h
+++ b/src/gpu/GrTest.h
@@ -28,15 +28,14 @@
public:
GrTestTarget() {};
- void init(GrContext*, GrDrawTarget*, GrRenderTarget*);
+ void init(GrContext*, GrDrawTarget*);
GrDrawTarget* target() { return fDrawTarget.get(); }
GrResourceProvider* resourceProvider() { return fContext->resourceProvider(); }
private:
- SkAutoTUnref<GrContext> fContext;
SkAutoTUnref<GrDrawTarget> fDrawTarget;
- SkAutoTUnref<GrRenderTarget> fRenderTarget;
+ SkAutoTUnref<GrContext> fContext;
};
#endif