diff options
author | skia.committer@gmail.com <skia.committer@gmail.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2014-02-20 03:01:56 +0000 |
---|---|---|
committer | skia.committer@gmail.com <skia.committer@gmail.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2014-02-20 03:01:56 +0000 |
commit | c05d2859e10f4e1fb0c6486eebfbe88801202648 (patch) | |
tree | 5e0c987726d331052e89c9f23fa708ee5b762b3e | |
parent | 32ffe9c40234956af74456f2574a2212fd115349 (diff) |
Sanitizing source files in Housekeeper-Nightly
git-svn-id: http://skia.googlecode.com/svn/trunk@13508 2bbb7eff-a529-9590-31e7-b0007b416f81
-rw-r--r-- | src/core/SkMatrixClipStateMgr.cpp | 12 | ||||
-rw-r--r-- | src/core/SkMatrixClipStateMgr.h | 2 | ||||
-rw-r--r-- | tests/MatrixClipCollapseTest.cpp | 2 |
3 files changed, 8 insertions, 8 deletions
diff --git a/src/core/SkMatrixClipStateMgr.cpp b/src/core/SkMatrixClipStateMgr.cpp index 3f6294cfb6..6d9191364a 100644 --- a/src/core/SkMatrixClipStateMgr.cpp +++ b/src/core/SkMatrixClipStateMgr.cpp @@ -215,8 +215,8 @@ bool SkMatrixClipStateMgr::call(CallType callType) { return false; } - if (kIdentityWideOpenStateID != fCurOpenStateID && - (!fCurMCState->fIsSaveLayer || + if (kIdentityWideOpenStateID != fCurOpenStateID && + (!fCurMCState->fIsSaveLayer || fCurMCState->fSaveLayerBaseStateID != fCurOpenStateID)) { // Don't write a restore if the open state is one in which a saveLayer // is nested. The save after the saveLayer's restore will close it. @@ -248,8 +248,8 @@ bool SkMatrixClipStateMgr::call(CallType callType) { } else { // SkDeque's iterators actually return the previous location so we // need to reverse and go forward one to get back on track. - iter.next(); - SkDEBUGCODE(const MatrixClipState* test = (const MatrixClipState*)) iter.next(); + iter.next(); + SkDEBUGCODE(const MatrixClipState* test = (const MatrixClipState*)) iter.next(); SkASSERT(test == state); } @@ -295,8 +295,8 @@ void SkMatrixClipStateMgr::finish() { #ifdef SK_DEBUG void SkMatrixClipStateMgr::validate() { - if (fCurOpenStateID == fCurMCState->fMCStateID && - (!fCurMCState->fIsSaveLayer || + if (fCurOpenStateID == fCurMCState->fMCStateID && + (!fCurMCState->fIsSaveLayer || fCurOpenStateID != fCurMCState->fSaveLayerBaseStateID)) { // The current state is the active one so it should have a skip // offset for each clip diff --git a/src/core/SkMatrixClipStateMgr.h b/src/core/SkMatrixClipStateMgr.h index ef0a99dbfa..c4beca72f1 100644 --- a/src/core/SkMatrixClipStateMgr.h +++ b/src/core/SkMatrixClipStateMgr.h @@ -352,7 +352,7 @@ protected: // The MCStateID of the state currently in effect in the byte stream. 0 if none. int32_t fCurOpenStateID; - // The skip offsets for the current open state. These are the locations in the + // The skip offsets for the current open state. These are the locations in the // skp that must be filled in when the current open state is closed. These are // here rather then distributed across the MatrixClipState's because saveLayers // can cause MC states to be nested. diff --git a/tests/MatrixClipCollapseTest.cpp b/tests/MatrixClipCollapseTest.cpp index 6981fe25d4..c9940272c0 100644 --- a/tests/MatrixClipCollapseTest.cpp +++ b/tests/MatrixClipCollapseTest.cpp @@ -510,7 +510,7 @@ static void emit_body3(SkCanvas* canvas, PFEmitMC emitMC, MatType mat, if (kNone_MatType != mat || kNone_ClipType != clip) { *expected->append() = SAVE; } - (*emitMC)(canvas, mat, clip, kSaveLayer_DrawOpType, expected, accumulatedClips+1); + (*emitMC)(canvas, mat, clip, kSaveLayer_DrawOpType, expected, accumulatedClips+1); *expected->append() = SAVE_LAYER; // TODO: widen testing to exercise saveLayer's parameters canvas->saveLayer(NULL, NULL); |