diff options
| author |  Robert Phillips <robertphillips@google.com> | 2018-03-27 09:53:35 -0400 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2018-03-27 14:33:54 +0000 |
| commit | d3b37a1a7cbb91475002530bcfe10cb1aafa4712 (patch) | |
| tree | aeb435acdf5b24ed77e1f6d32a5d1668bbd93a04 /src/gpu/SkGr.cpp | |
| parent | 7a11abd4f042cf1996aae7f49c4e42747b2ac6ce (diff) | |
Fix TSAN race in SkPaintToGrPaintNoShader
Change-Id: Id906e139db80e0c3b426a0e2318e77477989cf8d
Reviewed-on: https://skia-review.googlesource.com/116545
Reviewed-by: Mike Klein <mtklein@google.com>
Commit-Queue: Robert Phillips <robertphillips@google.com>
Diffstat (limited to 'src/gpu/SkGr.cpp')
| -rw-r--r-- | src/gpu/SkGr.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/gpu/SkGr.cpp b/src/gpu/SkGr.cpp index 09155a05b3..ec06561efc 100644 --- a/src/gpu/SkGr.cpp +++ b/src/gpu/SkGr.cpp @@ -486,9 +486,8 @@ bool SkPaintToGrPaintNoShader(GrContext* context, const SkPaint& skPaint, GrPaint* grPaint) { // Use a ptr to a nullptr to to indicate that the SkShader is ignored and not replaced. - static std::unique_ptr<GrFragmentProcessor> kNullShaderFP(nullptr); - static std::unique_ptr<GrFragmentProcessor>* kIgnoreShader = &kNullShaderFP; - return skpaint_to_grpaint_impl(context, colorSpaceInfo, skPaint, SkMatrix::I(), kIgnoreShader, + std::unique_ptr<GrFragmentProcessor> nullShaderFP(nullptr); + return skpaint_to_grpaint_impl(context, colorSpaceInfo, skPaint, SkMatrix::I(), &nullShaderFP, nullptr, grPaint); } |