diff --git a/src/core/SkBBoxHierarchy.cpp b/src/core/SkBBoxHierarchy.cpp
index a99bb9d97c..7d061b5761 100644
--- a/src/core/SkBBoxHierarchy.cpp
+++ b/src/core/SkBBoxHierarchy.cpp
@@ -1,12 +1,12 @@
-
-/*
- * Copyright 2012 Google Inc.
- *
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- */
-
-#include "SkBBoxHierarchy.h"
-
-SK_DEFINE_INST_COUNT(SkBBoxHierarchy)
-
+
+/*
+ * Copyright 2012 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#include "SkBBoxHierarchy.h"
+
+SK_DEFINE_INST_COUNT(SkBBoxHierarchy)
+
diff --git a/src/core/SkBBoxHierarchyRecord.h b/src/core/SkBBoxHierarchyRecord.h
index 6c9e733c96..c0cf365e76 100644
--- a/src/core/SkBBoxHierarchyRecord.h
+++ b/src/core/SkBBoxHierarchyRecord.h
@@ -22,13 +22,13 @@ public:
 
     virtual void handleBBox(const SkRect& bounds) SK_OVERRIDE;
 
-    virtual int save(SaveFlags flags = kMatrixClip_SaveFlag) SK_OVERRIDE; 
+    virtual int save(SaveFlags flags = kMatrixClip_SaveFlag) SK_OVERRIDE;
     virtual int saveLayer(const SkRect* bounds, const SkPaint* paint,
-                          SaveFlags flags = kARGB_ClipLayer_SaveFlag) SK_OVERRIDE; 
-    virtual void restore() SK_OVERRIDE; 
+                          SaveFlags flags = kARGB_ClipLayer_SaveFlag) SK_OVERRIDE;
+    virtual void restore() SK_OVERRIDE;
 
-    virtual bool translate(SkScalar dx, SkScalar dy) SK_OVERRIDE; 
-    virtual bool scale(SkScalar sx, SkScalar sy) SK_OVERRIDE; 
+    virtual bool translate(SkScalar dx, SkScalar dy) SK_OVERRIDE;
+    virtual bool scale(SkScalar sx, SkScalar sy) SK_OVERRIDE;
     virtual bool rotate(SkScalar degrees) SK_OVERRIDE;
     virtual bool skew(SkScalar sx, SkScalar sy) SK_OVERRIDE;
     virtual bool concat(const SkMatrix& matrix) SK_OVERRIDE;
@@ -36,12 +36,12 @@ public:
 
     virtual bool clipRect(const SkRect& rect,
                           SkRegion::Op op = SkRegion::kIntersect_Op,
-                          bool doAntiAlias = false) SK_OVERRIDE; 
+                          bool doAntiAlias = false) SK_OVERRIDE;
     virtual bool clipRegion(const SkRegion& region,
-                            SkRegion::Op op = SkRegion::kIntersect_Op) SK_OVERRIDE; 
+                            SkRegion::Op op = SkRegion::kIntersect_Op) SK_OVERRIDE;
     virtual bool clipPath(const SkPath& path,
                           SkRegion::Op op = SkRegion::kIntersect_Op,
-                          bool doAntiAlias = false) SK_OVERRIDE; 
+                          bool doAntiAlias = false) SK_OVERRIDE;
 
 private:
     typedef SkBBoxRecord INHERITED;
diff --git a/src/core/SkMaskGamma.h b/src/core/SkMaskGamma.h
index d8632df683..961c1b1924 100644
--- a/src/core/SkMaskGamma.h
+++ b/src/core/SkMaskGamma.h
@@ -177,7 +177,7 @@ SK_DEFINE_INST_COUNT_TEMPLATE(
  * SkTMaskPreBlend is a tear-off of SkTMaskGamma. It provides the tables to
  * convert a linear alpha value for a given channel to a gamma correcting alpha
  * value for that channel. This class is immutable.
- * 
+ *
  * If fR, fG, or fB is NULL, all of them will be. This indicates that no mask
  * pre blend should be applied.
  */
diff --git a/src/core/SkPictureStateTree.cpp b/src/core/SkPictureStateTree.cpp
index 31aa00bf7a..fc36e4a22c 100644
--- a/src/core/SkPictureStateTree.cpp
+++ b/src/core/SkPictureStateTree.cpp
@@ -64,7 +64,7 @@ void SkPictureStateTree::appendClip(uint32_t offset) {
     this->appendNode(offset);
 }
 
-SkPictureStateTree::Iterator SkPictureStateTree::getIterator(const SkTDArray<void*>& draws, 
+SkPictureStateTree::Iterator SkPictureStateTree::getIterator(const SkTDArray<void*>& draws,
                                                              SkCanvas* canvas) {
     return Iterator(draws, canvas, fRoot);
 }
diff --git a/src/core/SkPictureStateTree.h b/src/core/SkPictureStateTree.h
index a4fb8871b5..995f3f72ae 100644
--- a/src/core/SkPictureStateTree.h
+++ b/src/core/SkPictureStateTree.h
@@ -44,7 +44,7 @@ public:
     SkPictureStateTree();
     ~SkPictureStateTree();
 
-    /** 
+    /**
      * Creates and returns a struct representing a draw at the given offset.
      */
     Draw* appendDraw(uint32_t offset);
@@ -108,7 +108,7 @@ private:
     // A stack of states for tracking save/restores
     SkDeque fStateStack;
 
-    // Represents a notable piece of state that requires an offset into the command buffer, 
+    // Represents a notable piece of state that requires an offset into the command buffer,
     // corresponding to a clip/saveLayer/etc call, to apply.
     struct Node {
         Node* fParent;