diff options
author | 2016-01-07 13:22:24 -0800 | |
---|---|---|
committer | 2016-01-07 13:22:24 -0800 | |
commit | 94da292e39db0d41da08b1d6055ca5e0d6b498cc (patch) | |
tree | 97d4fb38e5a80b7c6c1167ffd83a8555d097f4e2 /include/gpu/GrDrawContext.h | |
parent | 9a9515e081c54efdd5a0b0f662c013cbeef6d63f (diff) |
Revert of Make a single GrSingleOwner in GrContext (patchset #3 id:40001 of https://codereview.chromium.org/1563703004/ )
Reason for revert:
breaking asan
Original issue's description:
> Make a single GrSingleOwner in GrContext
>
> TBR=bsalomon@google.com
> BUG=skia:
> GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1563703004
>
> Committed: https://skia.googlesource.com/skia/+/f9bc796e0dbd31674c22b34761913ee6e8fdd66a
TBR=robertphillips@google.com,joshualitt@chromium.org
# Skipping CQ checks because original CL landed less than 1 days ago.
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=skia:
Review URL: https://codereview.chromium.org/1565303003
Diffstat (limited to 'include/gpu/GrDrawContext.h')
-rw-r--r-- | include/gpu/GrDrawContext.h | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/include/gpu/GrDrawContext.h b/include/gpu/GrDrawContext.h index 7ae6f5e682..21977bed74 100644 --- a/include/gpu/GrDrawContext.h +++ b/include/gpu/GrDrawContext.h @@ -283,8 +283,7 @@ private: SkDEBUGCODE(void validate() const;) - GrDrawContext(GrDrawingManager*, GrRenderTarget*, const SkSurfaceProps* surfaceProps, - GrSingleOwner*); + GrDrawContext(GrDrawingManager*, GrRenderTarget*, const SkSurfaceProps* surfaceProps); void internalDrawPath(GrPipelineBuilder*, const SkMatrix& viewMatrix, @@ -310,7 +309,7 @@ private: SkSurfaceProps fSurfaceProps; // In debug builds we guard against improper thread handling - mutable GrSingleOwner* fSingleOwner; + SkDEBUGCODE(mutable GrSingleOwner fSingleOwner;) }; #endif |