diff options
| author |  Jim Van Verth <jvanverth@google.com> | 2017-09-20 12:53:00 -0400 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2017-09-20 17:46:59 +0000 |
| commit | 32bbf377e67398705dd33e097d94b0e23d9e84db (patch) | |
| tree | 3b5109688bf67aedef35ddf963accf13a47c2607 /src/gpu/GrDrawOpAtlas.cpp | |
| parent | f20e77bcb6d3d5aae693bcefa0a5270d5f39890e (diff) | |
Fix TSAN issue with atlas expansion.
Removes SkString-related malloc from DM crash handler, and adds null check in ProxyRefTest.
Bug: skia:3550
Change-Id: I143c532b5d231a426b1a96b854e1effd6379b673
Reviewed-on: https://skia-review.googlesource.com/48440
Reviewed-by: Mike Klein <mtklein@google.com>
Reviewed-by: Robert Phillips <robertphillips@google.com>
Commit-Queue: Jim Van Verth <jvanverth@google.com>
Diffstat (limited to 'src/gpu/GrDrawOpAtlas.cpp')
| -rw-r--r-- | src/gpu/GrDrawOpAtlas.cpp | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/src/gpu/GrDrawOpAtlas.cpp b/src/gpu/GrDrawOpAtlas.cpp index 17562c9402..22def06212 100644 --- a/src/gpu/GrDrawOpAtlas.cpp +++ b/src/gpu/GrDrawOpAtlas.cpp @@ -238,7 +238,6 @@ bool GrDrawOpAtlas::addToAtlas(AtlasID* id, GrDrawOp::Target* target, int width, } } -#ifdef SK_GROW_ATLAS // If the simple cases fail, try to create a new page and add to it if (this->createNewPage()) { unsigned int pageIdx = fNumPages-1; @@ -253,7 +252,6 @@ bool GrDrawOpAtlas::addToAtlas(AtlasID* id, GrDrawOp::Target* target, int width, SkASSERT(false); return false; } -#endif // Try to find a plot that we can perform an inline upload to. // We prioritize this upload in reverse order of pages to counterbalance the order above. |