aboutsummaryrefslogtreecommitdiffhomepage
path: root/include
diff options
context:
space:
mode:
authorGravatar joshualitt <joshualitt@chromium.org>2016-02-16 11:09:25 -0800
committerGravatar Commit bot <commit-bot@chromium.org>2016-02-16 11:09:25 -0800
commit8e84a1ed07ad5d529d381d43302e597f31723076 (patch)
tree7ec66370a27dc047a86fb5501ef0c81d8718ac82 /include
parent546d66544bcfac4bc9e77626ba549c4b3a79a654 (diff)
Delete GrTextContext
Diffstat (limited to 'include')
-rw-r--r--include/gpu/GrDrawContext.h16
1 files changed, 8 insertions, 8 deletions
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;)