diff --git a/src/core/SkMatrixClipStateMgr.cpp b/src/core/SkMatrixClipStateMgr.cpp
index dd485cabb..4cf99bca9 100644
--- a/src/core/SkMatrixClipStateMgr.cpp
+++ b/src/core/SkMatrixClipStateMgr.cpp
@@ -54,7 +54,7 @@ void SkMatrixClipStateMgr::writeDeltaMat(int currentMatID, int desiredMatID) {
 
 // Note: this only writes out the clips for the current save state. To get the
 // entire clip stack requires iterating of the entire matrix/clip stack.
-void SkMatrixClipStateMgr::MatrixClipState::ClipInfo::writeClip(int* curMatID, 
+void SkMatrixClipStateMgr::MatrixClipState::ClipInfo::writeClip(int* curMatID,
                                                                 SkMatrixClipStateMgr* mgr,
                                                                 bool* overrideFirstOp) {
     for (int i = 0; i < fClips.count(); ++i) {
@@ -81,15 +81,15 @@ void SkMatrixClipStateMgr::MatrixClipState::ClipInfo::writeClip(int* curMatID,
 
         switch (curClip.fClipType) {
         case kRect_ClipType:
-            curClip.fOffset = mgr->getPicRecord()->recordClipRect(curClip.fGeom.fRRect.rect(), 
+            curClip.fOffset = mgr->getPicRecord()->recordClipRect(curClip.fGeom.fRRect.rect(),
                                                                   op, curClip.fDoAA);
             break;
         case kRRect_ClipType:
-            curClip.fOffset = mgr->getPicRecord()->recordClipRRect(curClip.fGeom.fRRect, op, 
+            curClip.fOffset = mgr->getPicRecord()->recordClipRRect(curClip.fGeom.fRRect, op,
                                                                    curClip.fDoAA);
             break;
         case kPath_ClipType:
-            curClip.fOffset = mgr->getPicRecord()->recordClipPath(curClip.fGeom.fPathID, op, 
+            curClip.fOffset = mgr->getPicRecord()->recordClipPath(curClip.fGeom.fPathID, op,
                                                                   curClip.fDoAA);
             break;
         case kRegion_ClipType: {
diff --git a/src/core/SkMatrixClipStateMgr.h b/src/core/SkMatrixClipStateMgr.h
index a07aedd35..60f9fa001 100644
--- a/src/core/SkMatrixClipStateMgr.h
+++ b/src/core/SkMatrixClipStateMgr.h
@@ -147,7 +147,7 @@ public:
                             int regionID,
                             SkRegion::Op op,
                             int matrixID);
-            void writeClip(int* curMatID, 
+            void writeClip(int* curMatID,
                            SkMatrixClipStateMgr* mgr,
                            bool* overrideFirstOp);
             void fillInSkips(SkWriter32* writer, int32_t restoreOffset);
@@ -370,8 +370,8 @@ protected:
 
     // This dictionary doesn't actually de-duplicate the matrices (except for the
     // identity matrix). It merely stores the matrices and allows them to be looked
-    // up by ID later. The de-duplication mainly falls upon the matrix/clip stack 
-    // which stores the ID so a revisited clip/matrix (via popping the stack) will 
+    // up by ID later. The de-duplication mainly falls upon the matrix/clip stack
+    // which stores the ID so a revisited clip/matrix (via popping the stack) will
     // use the same ID.
     SkTDArray<SkMatrix> fMatrixDict;
 
@@ -388,7 +388,7 @@ protected:
     int addRegionToDict(const SkRegion& region);
     const SkRegion* lookupRegion(int index) {
         SkASSERT(index >= 0 && index < fRegionDict.count());
-        return fRegionDict[index];        
+        return fRegionDict[index];
     }
 
     // TODO: add stats to check if the dictionary really does