diff --git a/experimental/Intersection/CubicIntersection_Test.cpp b/experimental/Intersection/CubicIntersection_Test.cpp
index f866e2523a..a11c1c9467 100644
--- a/experimental/Intersection/CubicIntersection_Test.cpp
+++ b/experimental/Intersection/CubicIntersection_Test.cpp
@@ -747,7 +747,7 @@ void CubicIntersection_SelfTest() {
         cubic_to_quadratics(cubic, calcPrecision(cubic), quads1);
         for (idx2 = 0; idx2 < quads1.count(); ++idx2) {
             const Quadratic& q = quads1[idx2];
-            SkDebugf("  {{%1.9g,%1.9g}, {%1.9g,%1.9g}, {%1.9g,%1.9g}},\n", 
+            SkDebugf("  {{%1.9g,%1.9g}, {%1.9g,%1.9g}, {%1.9g,%1.9g}},\n",
                     q[0].x, q[0].y,  q[1].x, q[1].y,  q[2].x, q[2].y);
         }
         SkDebugf("\n");
diff --git a/experimental/Intersection/CubicSubDivide.cpp b/experimental/Intersection/CubicSubDivide.cpp
index 883973cb90..ddf63cdc2a 100644
--- a/experimental/Intersection/CubicSubDivide.cpp
+++ b/experimental/Intersection/CubicSubDivide.cpp
@@ -70,7 +70,7 @@ void sub_divide(const Cubic& src, double t1, double t2, Cubic& dst) {
         dst[1] = src[1];
         dst[2] = src[2];
         dst[3] = src[3];
-        return;   
+        return;
     }
     double ax = dst[0].x = interp_cubic_coords(&src[0].x, t1);
     double ay = dst[0].y = interp_cubic_coords(&src[0].y, t1);
diff --git a/experimental/Intersection/ShapeOpCubic4x4_Test.cpp b/experimental/Intersection/ShapeOpCubic4x4_Test.cpp
index bfa855abfd..d974a12bbe 100644
--- a/experimental/Intersection/ShapeOpCubic4x4_Test.cpp
+++ b/experimental/Intersection/ShapeOpCubic4x4_Test.cpp
@@ -32,7 +32,7 @@ static void* testShapeOps4x4CubicsMain(void* data)
         for (int d = c + 1 ; d < 7; ++d)           {
         for (int e = SkPath::kWinding_FillType ; e <= SkPath::kEvenOdd_FillType; ++e) {
         for (int f = SkPath::kWinding_FillType ; f <= SkPath::kEvenOdd_FillType; ++f)   {
-        
+
 #if 0
   if (state.a == fail[0] && state.b == fail[1] && state.c == fail[2] && state.d == fail[3]
         && a == fail[4] && b == fail[5] && c == fail[6] && d == fail[7]) {
diff --git a/experimental/Intersection/Simplify.cpp b/experimental/Intersection/Simplify.cpp
index bedee71652..6b2ca98a0a 100644
--- a/experimental/Intersection/Simplify.cpp
+++ b/experimental/Intersection/Simplify.cpp
@@ -1034,7 +1034,7 @@ struct Bounds : public SkRect {
                 || sk_double_isnan(fLeft) || sk_double_isnan(fRight)
                 || sk_double_isnan(fTop) || sk_double_isnan(fBottom);
     }
-    
+
     void setCubicBounds(const SkPoint a[4]) {
         _Rect dRect;
         MAKE_CONST_CUBIC(cubic, a);
@@ -3473,7 +3473,7 @@ the same winding is shared by both.
         }
         return sum <= 0;
     }
-    
+
     bool monotonic_in_y(int tStart, int tEnd) const {
         if (fVerb != SkPath::kCubic_Verb) {
             return false;
@@ -3847,7 +3847,7 @@ the same winding is shared by both.
             }
         }
     }
-    
+
     void subDivideBounds(int start, int end, Bounds& bounds) const {
         SkPoint edge[4];
         subDivide(start, end, edge);
diff --git a/tools/render_pictures_main.cpp b/tools/render_pictures_main.cpp
index 2792c9d3af..b289d39fc7 100644
--- a/tools/render_pictures_main.cpp
+++ b/tools/render_pictures_main.cpp
@@ -189,7 +189,7 @@ static bool render_picture(const SkString& inputPath, const SkString* outputDir,
         SkBitmap* referenceBitmap = NULL;
         sk_tools::PictureRenderer* referenceRenderer;
         // If the renderer uses a BBoxHierarchy, then the reference renderer
-        // will be the same renderer, without the bbh. 
+        // will be the same renderer, without the bbh.
         AutoRestoreBbhType arbbh;
         if (sk_tools::PictureRenderer::kNone_BBoxHierarchyType !=
             renderer.getBBoxHierarchyType()) {