diff options
| author | commit-bot@chromium.org <commit-bot@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2014-04-25 14:03:52 +0000 |
|---|---|---|
| committer | commit-bot@chromium.org <commit-bot@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2014-04-25 14:03:52 +0000 |
| commit | 6051237403edbd110495895a5732685aeb326c50 (patch) | |
| tree | 85df4c304b54dacc8d274ff73e52edbb1aeae195 | |
| parent | ff400cc0bfb2e999e0de5b448f89bb3677f0f4fb (diff) | |
| download | src-6051237403edbd110495895a5732685aeb326c50.tar.gz | |
one more tsan fix
BUG=skia:2460
R=mtklein@google.com
TBR=mtklein
Author: caryclark@google.com
Review URL: https://codereview.chromium.org/255893002
git-svn-id: http://skia.googlecode.com/svn/trunk/src@14382 2bbb7eff-a529-9590-31e7-b0007b416f81
| -rw-r--r-- | pathops/SkOpEdgeBuilder.cpp | 4 | ||||
| -rw-r--r-- | pathops/SkPathOpsDebug.cpp | 4 |
2 files changed, 2 insertions, 6 deletions
diff --git a/pathops/SkOpEdgeBuilder.cpp b/pathops/SkOpEdgeBuilder.cpp index c14af9a9..31a446b3 100644 --- a/pathops/SkOpEdgeBuilder.cpp +++ b/pathops/SkOpEdgeBuilder.cpp @@ -13,10 +13,6 @@ void SkOpEdgeBuilder::init() { fOperand = false; fXorMask[0] = fXorMask[1] = (fPath->getFillType() & 1) ? kEvenOdd_PathOpsMask : kWinding_PathOpsMask; -#if defined(SK_DEBUG) || !FORCE_RELEASE - SkPathOpsDebug::gContourID = 0; - SkPathOpsDebug::gSegmentID = 0; -#endif fUnparseable = false; fSecondHalf = preFetch(); } diff --git a/pathops/SkPathOpsDebug.cpp b/pathops/SkPathOpsDebug.cpp index 3a5153a2..1f2b0133 100644 --- a/pathops/SkPathOpsDebug.cpp +++ b/pathops/SkPathOpsDebug.cpp @@ -13,8 +13,8 @@ const char* SkPathOpsDebug::kLVerbStr[] = {"", "line", "quad", "cubic"}; #if defined(SK_DEBUG) || !FORCE_RELEASE -int SkPathOpsDebug::gContourID; -int SkPathOpsDebug::gSegmentID; +int SkPathOpsDebug::gContourID = 0; +int SkPathOpsDebug::gSegmentID = 0; #endif #if DEBUG_SORT || DEBUG_SWAP_TOP |