From 8e84a1ed07ad5d529d381d43302e597f31723076 Mon Sep 17 00:00:00 2001 From: joshualitt Date: Tue, 16 Feb 2016 11:09:25 -0800 Subject: Delete GrTextContext TBR=bsalomon@google.com BUG=skia: GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1699073004 Review URL: https://codereview.chromium.org/1699073004 --- include/gpu/GrDrawContext.h | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'include') diff --git a/include/gpu/GrDrawContext.h b/include/gpu/GrDrawContext.h index bf0de334ab..44d5fe4ec5 100644 --- a/include/gpu/GrDrawContext.h +++ b/include/gpu/GrDrawContext.h @@ -14,6 +14,7 @@ #include "SkSurfaceProps.h" #include "../private/GrSingleOwner.h" +class GrAtlasTextContext; class GrAuditTrail; class GrClip; class GrContext; @@ -27,7 +28,6 @@ class GrPipelineBuilder; class GrRenderTarget; class GrStrokeInfo; class GrSurface; -class GrTextContext; class SkDrawFilter; struct SkIPoint; struct SkIRect; @@ -310,17 +310,17 @@ private: GrDrawTarget* getDrawTarget(); - GrDrawingManager* fDrawingManager; - GrRenderTarget* fRenderTarget; + GrDrawingManager* fDrawingManager; + GrRenderTarget* fRenderTarget; // In MDB-mode the drawTarget can be closed by some other drawContext that has picked // it up. For this reason, the drawTarget should only ever be accessed via 'getDrawTarget'. - GrDrawTarget* fDrawTarget; - GrTextContext* fAtlasTextContext; // lazily gotten from GrContext::DrawingManager - GrContext* fContext; + GrDrawTarget* fDrawTarget; + GrAtlasTextContext* fAtlasTextContext; + GrContext* fContext; - SkSurfaceProps fSurfaceProps; - GrAuditTrail* fAuditTrail; + SkSurfaceProps fSurfaceProps; + GrAuditTrail* fAuditTrail; // In debug builds we guard against improper thread handling SkDEBUGCODE(mutable GrSingleOwner* fSingleOwner;) -- cgit v1.2.3