Index: include/gpu/GrDrawContext.h |
diff --git a/include/gpu/GrDrawContext.h b/include/gpu/GrDrawContext.h |
index 5825b9238c66beb26fa2cb736948d610246b2e0f..29a70f9b14c19f50676e9952cce62092241e2522 100644 |
--- a/include/gpu/GrDrawContext.h |
+++ b/include/gpu/GrDrawContext.h |
@@ -33,7 +33,6 @@ |
class GrStyle; |
class GrSurface; |
struct GrUserStencilSettings; |
-class SkColorSpaceXform; |
class SkDrawFilter; |
struct SkIPoint; |
struct SkIRect; |
@@ -336,7 +335,7 @@ |
} |
const SkSurfaceProps& surfaceProps() const { return fSurfaceProps; } |
SkColorSpace* getColorSpace() const { return fColorSpace.get(); } |
- SkColorSpaceXform* getColorXformFromSRGB() const { return fColorXformFromSRGB.get(); } |
+ GrColorSpaceXform* getColorXformFromSRGB() const { return fColorXformFromSRGB.get(); } |
GrSurfaceOrigin origin() const { return fRenderTarget->origin(); } |
bool wasAbandoned() const; |
@@ -417,22 +416,22 @@ |
GrDrawTarget* getDrawTarget(); |
- GrDrawingManager* fDrawingManager; |
- sk_sp<GrRenderTarget> fRenderTarget; |
+ GrDrawingManager* fDrawingManager; |
+ sk_sp<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; |
- GrContext* fContext; |
- GrInstancedPipelineInfo fInstancedPipelineInfo; |
- |
- sk_sp<SkColorSpace> fColorSpace; |
- std::unique_ptr<SkColorSpaceXform> fColorXformFromSRGB; |
- SkSurfaceProps fSurfaceProps; |
- GrAuditTrail* fAuditTrail; |
+ GrDrawTarget* fDrawTarget; |
+ GrContext* fContext; |
+ GrInstancedPipelineInfo fInstancedPipelineInfo; |
+ |
+ sk_sp<SkColorSpace> fColorSpace; |
+ sk_sp<GrColorSpaceXform> fColorXformFromSRGB; |
+ SkSurfaceProps fSurfaceProps; |
+ GrAuditTrail* fAuditTrail; |
// In debug builds we guard against improper thread handling |
- SkDEBUGCODE(mutable GrSingleOwner* fSingleOwner;) |
+ SkDEBUGCODE(mutable GrSingleOwner* fSingleOwner;) |
}; |
#endif |