diff options
Diffstat (limited to 'include/gpu')
| -rw-r--r-- | include/gpu/GrContext.h | 4 | ||||
| -rw-r--r-- | include/gpu/GrDrawContext.h | 5 |
2 files changed, 6 insertions, 3 deletions
diff --git a/include/gpu/GrContext.h b/include/gpu/GrContext.h index a49d141810..54db1953d5 100644 --- a/include/gpu/GrContext.h +++ b/include/gpu/GrContext.h @@ -395,7 +395,9 @@ private: SkMutex fTestPMConversionsMutex; // In debug builds we guard against improper thread handling - SkDEBUGCODE(mutable GrSingleOwner fSingleOwner;) + // This guard is passed to the GrDrawingManager and, from there to all the + // GrDrawContexts. It is also passed to the GrTextureProvider and SkGpuDevice. + mutable GrSingleOwner fSingleOwner; struct CleanUpData { PFCleanUpFunc fFunc; diff --git a/include/gpu/GrDrawContext.h b/include/gpu/GrDrawContext.h index 21977bed74..7ae6f5e682 100644 --- a/include/gpu/GrDrawContext.h +++ b/include/gpu/GrDrawContext.h @@ -283,7 +283,8 @@ private: SkDEBUGCODE(void validate() const;) - GrDrawContext(GrDrawingManager*, GrRenderTarget*, const SkSurfaceProps* surfaceProps); + GrDrawContext(GrDrawingManager*, GrRenderTarget*, const SkSurfaceProps* surfaceProps, + GrSingleOwner*); void internalDrawPath(GrPipelineBuilder*, const SkMatrix& viewMatrix, @@ -309,7 +310,7 @@ private: SkSurfaceProps fSurfaceProps; // In debug builds we guard against improper thread handling - SkDEBUGCODE(mutable GrSingleOwner fSingleOwner;) + mutable GrSingleOwner* fSingleOwner; }; #endif |