Sanitizing source files in Housekeeper-Nightly
git-svn-id: http://skia.googlecode.com/svn/trunk@13508 2bbb7eff-a529-9590-31e7-b0007b416f81
diff --git a/src/core/SkMatrixClipStateMgr.cpp b/src/core/SkMatrixClipStateMgr.cpp
index 3f6294c..6d91913 100644
--- a/src/core/SkMatrixClipStateMgr.cpp
+++ b/src/core/SkMatrixClipStateMgr.cpp
@@ -215,8 +215,8 @@
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 @@
} 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 @@
#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 ef0a99d..c4beca7 100644
--- a/src/core/SkMatrixClipStateMgr.h
+++ b/src/core/SkMatrixClipStateMgr.h
@@ -352,7 +352,7 @@
// 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 6981fe2..c994027 100644
--- a/tests/MatrixClipCollapseTest.cpp
+++ b/tests/MatrixClipCollapseTest.cpp
@@ -510,7 +510,7 @@
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);