Index: include/gpu/GrDrawContext.h |
diff --git a/include/gpu/GrDrawContext.h b/include/gpu/GrDrawContext.h |
index 09b0d3b3b24a7fbd6e72a8e14dd624b05b01be8e..417e0f913eade676489e6c321bf8814ea022f396 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* fTextContext; // lazily gotten from GrContext::DrawingManager |
- GrContext* fContext; |
+ GrDrawTarget* fDrawTarget; |
+ GrAtlasTextContext* fTextContext; |
+ GrContext* fContext; |
- SkSurfaceProps fSurfaceProps; |
- GrAuditTrail* fAuditTrail; |
+ SkSurfaceProps fSurfaceProps; |
+ GrAuditTrail* fAuditTrail; |
// In debug builds we guard against improper thread handling |
SkDEBUGCODE(mutable GrSingleOwner* fSingleOwner;) |