diff options
| author |  Robert Phillips <robertphillips@google.com> | 2017-01-25 17:31:35 -0500 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2017-01-26 13:15:14 +0000 |
| commit | 72152831a01f7b5d334eb0e6f4cd6d2422e3f6e6 (patch) | |
| tree | fe6d4949b1625e3f39791feb2931bc654c7e1693 /include | |
| parent | 98829b979119297bd9dbbe9313ba98ea0b3289af (diff) | |
Move GrDrawingManager pointer to GrSurfaceContext
Change-Id: Ic285b24b384bbf284cc680fe770433dd4d643833
Reviewed-on: https://skia-review.googlesource.com/7561
Reviewed-by: Robert Phillips <robertphillips@google.com>
Reviewed-by: Brian Osman <brianosman@google.com>
Commit-Queue: Robert Phillips <robertphillips@google.com>
Diffstat (limited to 'include')
| -rw-r--r-- | include/gpu/GrRenderTargetContext.h | 3 | ||||
| -rw-r--r-- | include/gpu/GrSurfaceContext.h | 9 | ||||
| -rw-r--r-- | include/gpu/GrTextureContext.h | 3 |
3 files changed, 8 insertions, 7 deletions
diff --git a/include/gpu/GrRenderTargetContext.h b/include/gpu/GrRenderTargetContext.h index b3f15bef47..3056449233 100644 --- a/include/gpu/GrRenderTargetContext.h +++ b/include/gpu/GrRenderTargetContext.h @@ -371,8 +371,6 @@ protected: sk_sp<SkColorSpace>, const SkSurfaceProps*, GrAuditTrail*, GrSingleOwner*); - GrDrawingManager* drawingManager() { return fDrawingManager; } - SkDEBUGCODE(void validate() const;) private: @@ -450,7 +448,6 @@ private: GrRenderTargetOpList* getOpList(); - GrDrawingManager* fDrawingManager; sk_sp<GrRenderTargetProxy> fRenderTargetProxy; // In MDB-mode the GrOpList can be closed by some other renderTargetContext that has picked diff --git a/include/gpu/GrSurfaceContext.h b/include/gpu/GrSurfaceContext.h index 75ee95276e..43d6a10b62 100644 --- a/include/gpu/GrSurfaceContext.h +++ b/include/gpu/GrSurfaceContext.h @@ -14,6 +14,7 @@ class GrAuditTrail; class GrContext; +class GrDrawingManager; class GrRenderTargetContext; class GrRenderTargetProxy; class GrSingleOwner; @@ -111,7 +112,11 @@ public: protected: friend class GrSurfaceContextPriv; - GrSurfaceContext(GrContext*, sk_sp<SkColorSpace>, GrAuditTrail*, GrSingleOwner*); + GrSurfaceContext(GrContext*, GrDrawingManager*, + sk_sp<SkColorSpace>, GrAuditTrail*, GrSingleOwner*); + + GrDrawingManager* drawingManager() { return fDrawingManager; } + const GrDrawingManager* drawingManager() const { return fDrawingManager; } SkDEBUGCODE(GrSingleOwner* singleOwner() { return fSingleOwner; }) @@ -131,6 +136,8 @@ private: virtual bool onWritePixels(const SkImageInfo& srcInfo, const void* srcBuffer, size_t srcRowBytes, int x, int y) = 0; + GrDrawingManager* fDrawingManager; + typedef SkRefCnt INHERITED; }; diff --git a/include/gpu/GrTextureContext.h b/include/gpu/GrTextureContext.h index 79a1719ac2..2ec8b4b78f 100644 --- a/include/gpu/GrTextureContext.h +++ b/include/gpu/GrTextureContext.h @@ -36,8 +36,6 @@ protected: GrTextureContext(GrContext*, GrDrawingManager*, sk_sp<GrTextureProxy>, sk_sp<SkColorSpace>, GrAuditTrail*, GrSingleOwner*); - GrDrawingManager* drawingManager() { return fDrawingManager; } - SkDEBUGCODE(void validate() const;) private: @@ -51,7 +49,6 @@ private: GrTextureOpList* getOpList(); - GrDrawingManager* fDrawingManager; sk_sp<GrTextureProxy> fTextureProxy; // In MDB-mode the GrOpList can be closed by some other renderTargetContext that has picked |