AuroraMiddleware/skia2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

one more tsan fix

Browse Source 
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@14382 2bbb7eff-a529-9590-31e7-b0007b416f81
This commit is contained in:
commit-bot@chromium.org 2014-04-25 14:03:52 +00:00
parent 830628e7ce
commit fe41b8ffff
2 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/pathops/SkOpEdgeBuilder.cpp
View File

@ -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();
}

4
src/pathops/SkPathOpsDebug.cpp
View File

@ -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