Sanitizing source files in Skia_Periodic_House_Keeping

git-svn-id: http://skia.googlecode.com/svn/trunk@7406 2bbb7eff-a529-9590-31e7-b0007b416f81

623 files changed, 0 insertions, 726 deletions

diff --git a/bench/BenchSysTimer_posix.h b/bench/BenchSysTimer_posix.h
index de793f35a7..8fd97061b6 100644
--- a/bench/BenchSysTimer_posix.h
+++ b/bench/BenchSysTimer_posix.h
@@ -23,4 +23,3 @@ private:
 };
 
 #endif
-
diff --git a/bench/BitmapBench.cpp b/bench/BitmapBench.cpp
index 5f06f884a8..0efdde3840 100644
--- a/bench/BitmapBench.cpp
+++ b/bench/BitmapBench.cpp
@@ -282,4 +282,3 @@ static BenchRegistry gReg13(Fact13);
 static BenchRegistry gReg14(Fact14);
 static BenchRegistry gReg15(Fact15);
 static BenchRegistry gReg16(Fact16);
-
diff --git a/bench/BitmapRectBench.cpp b/bench/BitmapRectBench.cpp
index 0b2154dc1f..f9f46b817c 100644
--- a/bench/BitmapRectBench.cpp
+++ b/bench/BitmapRectBench.cpp
@@ -106,4 +106,3 @@ DEF_BENCH(return new BitmapRectBench(p, 0x80, true, false))
 
 DEF_BENCH(return new BitmapRectBench(p, 0xFF, false, true))
 DEF_BENCH(return new BitmapRectBench(p, 0xFF, true, true))
-
diff --git a/bench/BlurBench.cpp b/bench/BlurBench.cpp
index ab77d2b011..5f2f425fbe 100644
--- a/bench/BlurBench.cpp
+++ b/bench/BlurBench.cpp
@@ -103,4 +103,3 @@ DEF_BENCH(return new BlurBench(p, REALBIG, SkBlurMaskFilter::kNormal_BlurStyle,
 DEF_BENCH(return new BlurBench(p, REAL, SkBlurMaskFilter::kNormal_BlurStyle, SkBlurMaskFilter::kHighQuality_BlurFlag);)
 
 DEF_BENCH(return new BlurBench(p, 0, SkBlurMaskFilter::kNormal_BlurStyle);)
-
diff --git a/bench/ChromeBench.cpp b/bench/ChromeBench.cpp
index ea5cb00878..8021f92999 100644
--- a/bench/ChromeBench.cpp
+++ b/bench/ChromeBench.cpp
@@ -498,4 +498,3 @@ static inline SkBenchmark* ScrollGmailFactory(void* p) {
 // Disabled this benchmark: it takes 15x longer than any other benchmark
 // and is probably not giving us important information.
 //static BenchRegistry gScrollGmailReg(ScrollGmailFactory);
-
diff --git a/bench/GradientBench.cpp b/bench/GradientBench.cpp
index d7ce74dc8e..2f1b825c67 100644
--- a/bench/GradientBench.cpp
+++ b/bench/GradientBench.cpp
@@ -287,4 +287,3 @@ static BenchRegistry gReg31(Fact31);
 static BenchRegistry gReg5(Fact5);
 
 static BenchRegistry gReg4(Fact4);
-
diff --git a/bench/InterpBench.cpp b/bench/InterpBench.cpp
index b689c72fd9..086cc3bc99 100644
--- a/bench/InterpBench.cpp
+++ b/bench/InterpBench.cpp
@@ -164,4 +164,3 @@ static BenchRegistry gReg1(M1);
 static BenchRegistry gReg2(M2);
 static BenchRegistry gReg3(M3);
 static BenchRegistry gReg4(M4);
-
diff --git a/bench/Matrix44Bench.cpp b/bench/Matrix44Bench.cpp
index ce5d99de7b..0d9d57293c 100644
--- a/bench/Matrix44Bench.cpp
+++ b/bench/Matrix44Bench.cpp
@@ -169,4 +169,3 @@ DEF_BENCH( return new PostScaleMatrix44Bench(p); )
 DEF_BENCH( return new InvertMatrix44Bench(p); )
 DEF_BENCH( return new SetConcatMatrix44Bench(p); )
 DEF_BENCH( return new GetTypeMatrix44Bench(p); )
-
diff --git a/bench/MemoryBench.cpp b/bench/MemoryBench.cpp
index 30b9ea3668..ab9c07dd06 100644
--- a/bench/MemoryBench.cpp
+++ b/bench/MemoryBench.cpp
@@ -59,4 +59,3 @@ static SkBenchmark* F1(void* p) { return new ChunkAllocBench(p, 8*1024); }
 
 static BenchRegistry gR0(F0);
 static BenchRegistry gR1(F1);
-
diff --git a/bench/MorphologyBench.cpp b/bench/MorphologyBench.cpp
index b6e9c92287..f9657bafd2 100644
--- a/bench/MorphologyBench.cpp
+++ b/bench/MorphologyBench.cpp
@@ -114,4 +114,3 @@ static BenchRegistry gReg21(Fact21);
 static BenchRegistry gRegNone(FactNone);
 
 #endif
-
diff --git a/bench/MutexBench.cpp b/bench/MutexBench.cpp
index dfdb792748..6c152a0dc0 100644
--- a/bench/MutexBench.cpp
+++ b/bench/MutexBench.cpp
@@ -40,4 +40,3 @@ private:
 static SkBenchmark* Fact(void* p) { return new MutexBench(p); }
 
 static BenchRegistry gReg01(Fact);
-
diff --git a/bench/PicturePlaybackBench.cpp b/bench/PicturePlaybackBench.cpp
index 7cdbccfdca..bd84baf6b7 100644
--- a/bench/PicturePlaybackBench.cpp
+++ b/bench/PicturePlaybackBench.cpp
@@ -144,4 +144,3 @@ static SkBenchmark* Fact2(void* p) { return new PosTextPlaybackBench(p, false);
 static BenchRegistry gReg0(Fact0);
 static BenchRegistry gReg1(Fact1);
 static BenchRegistry gReg2(Fact2);
-
diff --git a/bench/RTreeBench.cpp b/bench/RTreeBench.cpp
index 06853bbd2c..53dbe28982 100644
--- a/bench/RTreeBench.cpp
+++ b/bench/RTreeBench.cpp
@@ -215,4 +215,3 @@ static BenchRegistry gReg1(Fact1);
 static BenchRegistry gReg2(Fact2);
 static BenchRegistry gReg3(Fact3);
 static BenchRegistry gReg4(Fact4);
-
diff --git a/bench/RectBench.cpp b/bench/RectBench.cpp
index 4a2d3c57bd..645f8a8480 100644
--- a/bench/RectBench.cpp
+++ b/bench/RectBench.cpp
@@ -308,4 +308,3 @@ DEF_BENCH( return SkNEW_ARGS(BlitMaskBench,
                      (p, SkCanvas::kPoints_PointMode,
                      BlitMaskBench::KMaskShader, "maskshader")
                      ); )
-
diff --git a/bench/RepeatTileBench.cpp b/bench/RepeatTileBench.cpp
index fe39da4185..5235696abc 100644
--- a/bench/RepeatTileBench.cpp
+++ b/bench/RepeatTileBench.cpp
@@ -140,4 +140,3 @@ DEF_BENCH(return new RepeatTileBench(p, SkBitmap::kARGB_8888_Config, false))
 DEF_BENCH(return new RepeatTileBench(p, SkBitmap::kRGB_565_Config))
 DEF_BENCH(return new RepeatTileBench(p, SkBitmap::kARGB_4444_Config))
 DEF_BENCH(return new RepeatTileBench(p, SkBitmap::kIndex8_Config))
-
diff --git a/bench/ShaderMaskBench.cpp b/bench/ShaderMaskBench.cpp
index ad27fcbb8b..0e8e4bbee9 100644
--- a/bench/ShaderMaskBench.cpp
+++ b/bench/ShaderMaskBench.cpp
@@ -105,4 +105,3 @@ static BenchRegistry gReg10(Fact10);
 static BenchRegistry gReg11(Fact11);
 static BenchRegistry gReg20(Fact20);
 static BenchRegistry gReg21(Fact21);
-
diff --git a/bench/SortBench.cpp b/bench/SortBench.cpp
index 4b79251045..8d6a7167ee 100644
--- a/bench/SortBench.cpp
+++ b/bench/SortBench.cpp
@@ -176,4 +176,3 @@ DEF_BENCH( return NewQSort(p, kBack); )
 DEF_BENCH( return NewSkQSort(p, kSame); )
 DEF_BENCH( return NewSkHeap(p, kSame); )
 DEF_BENCH( return NewQSort(p, kSame); )
-
diff --git a/bench/benchmain.cpp b/bench/benchmain.cpp
index cda43664d7..370530df14 100644
--- a/bench/benchmain.cpp
+++ b/bench/benchmain.cpp
@@ -918,4 +918,3 @@ int main(int argc, char * const argv[]) {
     return tool_main(argc, (char**) argv);
 }
 #endif
-
diff --git a/debugger/QT/qrc_SkIcons.cpp b/debugger/QT/qrc_SkIcons.cpp
index 0f33e52ea4..bf43dbe80e 100644
--- a/debugger/QT/qrc_SkIcons.cpp
+++ b/debugger/QT/qrc_SkIcons.cpp
@@ -1148,4 +1148,3 @@ int QT_MANGLE_NAMESPACE(qCleanupResources)()
 }
 
 Q_DESTRUCTOR_FUNCTION(QT_MANGLE_NAMESPACE(qCleanupResources))
-
diff --git a/experimental/DrawingBoard/SampleDrawingClient.cpp b/experimental/DrawingBoard/SampleDrawingClient.cpp
index fbefbc8f12..b86c8c1473 100644
--- a/experimental/DrawingBoard/SampleDrawingClient.cpp
+++ b/experimental/DrawingBoard/SampleDrawingClient.cpp
@@ -276,4 +276,3 @@ private:
 
 static SkView* MyFactory() { return new DrawingClientView; }
 static SkViewRegister reg(MyFactory);
-
diff --git a/experimental/DrawingBoard/SkColorPalette.cpp b/experimental/DrawingBoard/SkColorPalette.cpp
index 566c134c0f..f2776af4ff 100644
--- a/experimental/DrawingBoard/SkColorPalette.cpp
+++ b/experimental/DrawingBoard/SkColorPalette.cpp
@@ -193,4 +193,3 @@ SkColor SkColorPalette::selectColorFromGradient(SkPoint& cursorPosition) {
     retval += (int)(b * 255);
     return retval;
 }
-
diff --git a/experimental/DrawingBoard/SkColorPalette.h b/experimental/DrawingBoard/SkColorPalette.h
index b8e4c9f56d..0ee1dd592e 100644
--- a/experimental/DrawingBoard/SkColorPalette.h
+++ b/experimental/DrawingBoard/SkColorPalette.h
@@ -32,4 +32,3 @@ private:
 };
 
 #endif
-
diff --git a/experimental/DrawingBoard/SkNetPipeController.cpp b/experimental/DrawingBoard/SkNetPipeController.cpp
index a61ca64478..3e4ded5cf7 100644
--- a/experimental/DrawingBoard/SkNetPipeController.cpp
+++ b/experimental/DrawingBoard/SkNetPipeController.cpp
@@ -48,4 +48,3 @@ void SkNetPipeController::notifyWritten(size_t bytes) {
 
     fAtomsWritten += 1;
 }
-
diff --git a/experimental/DrawingBoard/SkNetPipeController.h b/experimental/DrawingBoard/SkNetPipeController.h
index 081239bad5..84b1714057 100644
--- a/experimental/DrawingBoard/SkNetPipeController.h
+++ b/experimental/DrawingBoard/SkNetPipeController.h
@@ -34,4 +34,3 @@ private:
     SkGPipeReader::Status   fStatus;
 };
 #endif
-
diff --git a/experimental/FileReaderApp/FileReaderWindow.h b/experimental/FileReaderApp/FileReaderWindow.h
index f83f918724..e18a31c6bb 100644
--- a/experimental/FileReaderApp/FileReaderWindow.h
+++ b/experimental/FileReaderApp/FileReaderWindow.h
@@ -12,4 +12,3 @@
     ReaderView* fReaderView;
 }
 @end
-
diff --git a/experimental/FileReaderApp/ReaderView.cpp b/experimental/FileReaderApp/ReaderView.cpp
index 78a7a21e28..d0792d26c5 100644
--- a/experimental/FileReaderApp/ReaderView.cpp
+++ b/experimental/FileReaderApp/ReaderView.cpp
@@ -73,4 +73,3 @@ void ReaderView::draw(SkCanvas* canvas) {
     canvas->drawBitmap(fBufferBitmaps[fFront], 0, 0, NULL);
     this->inval(NULL);
 }
-
diff --git a/experimental/FileReaderApp/ReaderView.h b/experimental/FileReaderApp/ReaderView.h
index e3032d3a68..3f61eb8087 100644
--- a/experimental/FileReaderApp/ReaderView.h
+++ b/experimental/FileReaderApp/ReaderView.h
@@ -27,4 +27,3 @@ private:
     SkBitmap fBufferBitmaps[2];
     typedef SkView INHERITED;
 };
-
diff --git a/experimental/Intersection/ActiveEdge_Test.cpp b/experimental/Intersection/ActiveEdge_Test.cpp
index 1ac340e4e0..1c82f1cb69 100755
--- a/experimental/Intersection/ActiveEdge_Test.cpp
+++ b/experimental/Intersection/ActiveEdge_Test.cpp
@@ -81,7 +81,3 @@ void ActiveEdge_Test() {
         SkASSERT(!operator_less_than(right, left));
     }
 }
-
-
-
-
diff --git a/experimental/Intersection/ConvexHull.cpp b/experimental/Intersection/ConvexHull.cpp
index ad932e3550..e9a08c299a 100644
--- a/experimental/Intersection/ConvexHull.cpp
+++ b/experimental/Intersection/ConvexHull.cpp
@@ -141,4 +141,3 @@ bool convex_x_hull(const Cubic& cubic, char connectTo0[2], char connectTo3[2]) {
     return (1 << lower0Index | 1 << upper0Index
             | 1 << lower3Index | 1 << upper3Index) == 0x0F;
 }
-
diff --git a/experimental/Intersection/ConvexHull_Test.cpp b/experimental/Intersection/ConvexHull_Test.cpp
index bd83840dda..3e53b17f52 100644
--- a/experimental/Intersection/ConvexHull_Test.cpp
+++ b/experimental/Intersection/ConvexHull_Test.cpp
@@ -466,6 +466,3 @@ nextTest:
         ;
     }
 }
-
-
-
diff --git a/experimental/Intersection/CubicParameterization.cpp b/experimental/Intersection/CubicParameterization.cpp
index e44b121ddb..caa7c24dd8 100644
--- a/experimental/Intersection/CubicParameterization.cpp
+++ b/experimental/Intersection/CubicParameterization.cpp
@@ -516,5 +516,3 @@ void tangent(const Cubic& cubic, double t, _Point& result) {
 
 // unit test to return and validate parametric coefficients
 #include "CubicParameterization_TestUtility.cpp"
-
-
diff --git a/experimental/Intersection/EdgeWalkerPolygon4x4_Test.cpp b/experimental/Intersection/EdgeWalkerPolygon4x4_Test.cpp
index 44e6b9da3c..9a5c1d01e3 100755
--- a/experimental/Intersection/EdgeWalkerPolygon4x4_Test.cpp
+++ b/experimental/Intersection/EdgeWalkerPolygon4x4_Test.cpp
@@ -288,4 +288,3 @@ void SimplifyDegenerate4x4TrianglesThreaded_Test(int& testsRun) {
     testsRun += waitForCompletion();
     SkDebugf("%s tests=%d total=%d\n", __FUNCTION__, testsRun - testsStart, testsRun);
 }
-
diff --git a/experimental/Intersection/EdgeWalkerPolygons_Test.cpp b/experimental/Intersection/EdgeWalkerPolygons_Test.cpp
index 5c7f2500b0..8cda8e6b56 100644
--- a/experimental/Intersection/EdgeWalkerPolygons_Test.cpp
+++ b/experimental/Intersection/EdgeWalkerPolygons_Test.cpp
@@ -788,4 +788,3 @@ void SimplifyPolygonPaths_Test() {
         firstTestComplete = true;
     }
 }
-
diff --git a/experimental/Intersection/EdgeWalkerRectangles_Test.cpp b/experimental/Intersection/EdgeWalkerRectangles_Test.cpp
index 31edd74d21..5f1b7f876b 100644
--- a/experimental/Intersection/EdgeWalkerRectangles_Test.cpp
+++ b/experimental/Intersection/EdgeWalkerRectangles_Test.cpp
@@ -467,4 +467,3 @@ void SimplifyRectangularPaths_Test() {
         (*simplifyTests[index])();
     }
 }
-
diff --git a/experimental/Intersection/LineUtilities.h b/experimental/Intersection/LineUtilities.h
index 498b925581..9d538122c0 100644
--- a/experimental/Intersection/LineUtilities.h
+++ b/experimental/Intersection/LineUtilities.h
@@ -21,4 +21,3 @@ enum x_at_flags {
 
 void x_at(const _Point& p1, const _Point& p2, double minY, double maxY,
         int flags, double& tMin, double& tMax);
-
diff --git a/experimental/Intersection/Simplify.h b/experimental/Intersection/Simplify.h
index a0b936abf0..111daf0365 100644
--- a/experimental/Intersection/Simplify.h
+++ b/experimental/Intersection/Simplify.h
@@ -16,4 +16,3 @@
 #include "ShapeOps.h"
 #include "TSearch.h"
 #include <algorithm> // used for std::min
-
diff --git a/experimental/Intersection/SimplifyAddIntersectingTs_Test.cpp b/experimental/Intersection/SimplifyAddIntersectingTs_Test.cpp
index ca96ea68df..89046a86b1 100644
--- a/experimental/Intersection/SimplifyAddIntersectingTs_Test.cpp
+++ b/experimental/Intersection/SimplifyAddIntersectingTs_Test.cpp
@@ -133,4 +133,3 @@ void SimplifyAddIntersectingTs_Test() {
         }
     }
 }
-
diff --git a/experimental/Intersection/SimplifyRect4x4_Test.cpp b/experimental/Intersection/SimplifyRect4x4_Test.cpp
index add48d8df8..caa4597e20 100644
--- a/experimental/Intersection/SimplifyRect4x4_Test.cpp
+++ b/experimental/Intersection/SimplifyRect4x4_Test.cpp
@@ -198,4 +198,3 @@ void Simplify4x4RectsThreaded_Test(int& testsRun)
     testsRun += waitForCompletion();
     SkDebugf("%s tests=%d total=%d\n", __FUNCTION__, testsRun - testsStart, testsRun);
 }
-
diff --git a/experimental/Intersection/SkAntiEdge.cpp b/experimental/Intersection/SkAntiEdge.cpp
index 41887fe3c1..9a61aa461c 100644
--- a/experimental/Intersection/SkAntiEdge.cpp
+++ b/experimental/Intersection/SkAntiEdge.cpp
@@ -1079,4 +1079,3 @@ void SkAntiEdge_Test() {
     test_horz();
     test_vert();
 }
-
diff --git a/experimental/Networking/SampleNetPipeReader.cpp b/experimental/Networking/SampleNetPipeReader.cpp
index 4332cbd287..aef5653594 100644
--- a/experimental/Networking/SampleNetPipeReader.cpp
+++ b/experimental/Networking/SampleNetPipeReader.cpp
@@ -127,4 +127,3 @@ private:
 
 static SkView* MyFactory() { return new NetPipeReaderView; }
 static SkViewRegister reg(MyFactory);
-
diff --git a/experimental/SimpleCocoaApp/SimpleApp.h b/experimental/SimpleCocoaApp/SimpleApp.h
index c36007cad2..fe47a4a066 100644
--- a/experimental/SimpleCocoaApp/SimpleApp.h
+++ b/experimental/SimpleCocoaApp/SimpleApp.h
@@ -14,4 +14,3 @@
 @interface SimpleNSView : SkNSView
 - (id)initWithDefaults;
 @end
-
diff --git a/experimental/SimpleiOSApp/iPad/AppDelegate_iPad.h b/experimental/SimpleiOSApp/iPad/AppDelegate_iPad.h
index 7783a671d3..844d953121 100644
--- a/experimental/SimpleiOSApp/iPad/AppDelegate_iPad.h
+++ b/experimental/SimpleiOSApp/iPad/AppDelegate_iPad.h
@@ -15,4 +15,3 @@
 @property (nonatomic, retain) IBOutlet UIWindow *window;
 
 @end
-
diff --git a/experimental/SimpleiOSApp/iPhone/AppDelegate_iPhone.h b/experimental/SimpleiOSApp/iPhone/AppDelegate_iPhone.h
index d4f8e4e205..e7e7b84dbb 100644
--- a/experimental/SimpleiOSApp/iPhone/AppDelegate_iPhone.h
+++ b/experimental/SimpleiOSApp/iPhone/AppDelegate_iPhone.h
@@ -15,4 +15,3 @@
 @property (nonatomic, retain) IBOutlet UIWindow *window;
 
 @end
-
diff --git a/experimental/SkSetPoly3To3.cpp b/experimental/SkSetPoly3To3.cpp
index cf94eb5f54..750db3074f 100644
--- a/experimental/SkSetPoly3To3.cpp
+++ b/experimental/SkSetPoly3To3.cpp
@@ -67,4 +67,3 @@ bool SkSetPoly3To3(SkMatrix* matrix, const SkPoint src[3], const SkPoint dst[3])
                                     matrix->getSkewY(), matrix->getScaleY()));
     return true;
 }
-
diff --git a/experimental/SkSetPoly3To3_A.cpp b/experimental/SkSetPoly3To3_A.cpp
index c85814568c..9eb6b33c0d 100644
--- a/experimental/SkSetPoly3To3_A.cpp
+++ b/experimental/SkSetPoly3To3_A.cpp
@@ -97,4 +97,3 @@ bool SkSetPoly3To3_A(SkMatrix* matrix, const SkPoint src[3], const SkPoint dst[3
                                     matrix->getSkewY(), matrix->getScaleY()));
     return true;
 }
-
diff --git a/experimental/SkSetPoly3To3_D.cpp b/experimental/SkSetPoly3To3_D.cpp
index 283b4e5144..2fb99d8751 100644
--- a/experimental/SkSetPoly3To3_D.cpp
+++ b/experimental/SkSetPoly3To3_D.cpp
@@ -72,4 +72,3 @@ bool SkSetPoly3To3_D(SkMatrix* matrix, const SkPoint src[3], const SkPoint dst[3
                                     matrix->getSkewY(), matrix->getScaleY()));
     return true;
 }
-
diff --git a/experimental/StrokePathRenderer/GrStrokePathRenderer.cpp b/experimental/StrokePathRenderer/GrStrokePathRenderer.cpp
index 4d2c8a8862..03c135df60 100644
--- a/experimental/StrokePathRenderer/GrStrokePathRenderer.cpp
+++ b/experimental/StrokePathRenderer/GrStrokePathRenderer.cpp
@@ -302,4 +302,3 @@ bool GrStrokePathRenderer::onDrawPath(const SkPath& origPath,
 
     return true;
 }
-
diff --git a/experimental/iOSSampleApp/Shared/SkUIView.h b/experimental/iOSSampleApp/Shared/SkUIView.h
index a0640d4dce..a3d05e37db 100644
--- a/experimental/iOSSampleApp/Shared/SkUIView.h
+++ b/experimental/iOSSampleApp/Shared/SkUIView.h
@@ -44,4 +44,3 @@ class SkEvent;
 - (void)postInvalWithRect:(const SkIRect*)rectOrNil;
 - (BOOL)onHandleEvent:(const SkEvent&)event;
 @end
-
diff --git a/experimental/iOSSampleApp/SkSampleUIView.h b/experimental/iOSSampleApp/SkSampleUIView.h
index 6797706636..9bb195621d 100644
--- a/experimental/iOSSampleApp/SkSampleUIView.h
+++ b/experimental/iOSSampleApp/SkSampleUIView.h
@@ -44,4 +44,3 @@ struct FPSState;
 - (void)setSkTitle:(const char*)title;
 - (void)postInvalWithRect:(const SkIRect*)rectOrNil;
 @end
-
diff --git a/experimental/iOSSampleApp/iPad/AppDelegate_iPad.h b/experimental/iOSSampleApp/iPad/AppDelegate_iPad.h
index fbc3eacfb9..eb54c690dc 100644
--- a/experimental/iOSSampleApp/iPad/AppDelegate_iPad.h
+++ b/experimental/iOSSampleApp/iPad/AppDelegate_iPad.h
@@ -17,4 +17,3 @@
 @property (nonatomic, retain) IBOutlet SkUISplitViewController* splitViewController;
 
 @end
-
diff --git a/experimental/iOSSampleApp/iPhone/AppDelegate_iPhone.h b/experimental/iOSSampleApp/iPhone/AppDelegate_iPhone.h
index b5829b2766..e19b0bc15c 100644
--- a/experimental/iOSSampleApp/iPhone/AppDelegate_iPhone.h
+++ b/experimental/iOSSampleApp/iPhone/AppDelegate_iPhone.h
@@ -17,4 +17,3 @@
 @property (nonatomic, retain) IBOutlet SkUINavigationController* fRoot;
 
 @end
-
diff --git a/forth/Forth.cpp b/forth/Forth.cpp
index be240e3285..1dd4c73e4a 100644
--- a/forth/Forth.cpp
+++ b/forth/Forth.cpp
@@ -499,4 +499,3 @@ void ForthEnv::run(const char text[], ForthOutput* output) {
     }
 }
 #endif
-
diff --git a/forth/Forth.h b/forth/Forth.h
index 5e8ca8d8a7..f6df06e1eb 100644
--- a/forth/Forth.h
+++ b/forth/Forth.h
@@ -103,4 +103,3 @@ private:
 };
 
 #endif
-
diff --git a/forth/ForthTests.cpp b/forth/ForthTests.cpp
index 08ab7f30ba..8dc06c05be 100644
--- a/forth/ForthTests.cpp
+++ b/forth/ForthTests.cpp
@@ -405,4 +405,3 @@ void Forth_test_stdwords(bool verbose) {
         SkDebugf("--- %d failures\n", reporter.fFailureCount);
     }
 }
-
diff --git a/forth/StdWords.cpp b/forth/StdWords.cpp
index 8a781f8d4f..bae00dc9e5 100644
--- a/forth/StdWords.cpp
+++ b/forth/StdWords.cpp
@@ -459,4 +459,3 @@ void ForthParser::addStdWords() {
     this->add("f>", 2, new fgt_ForthWord);
     this->add("f>=", 3, new fge_ForthWord);
 }
-
diff --git a/gm/aarectmodes.cpp b/gm/aarectmodes.cpp
index 56343240d6..704ddcbb6d 100644
--- a/gm/aarectmodes.cpp
+++ b/gm/aarectmodes.cpp
@@ -187,4 +187,3 @@ namespace skiagm {
     static GMRegistry reg(MyFactory);
 
 }
-
diff --git a/gm/bigmatrix.cpp b/gm/bigmatrix.cpp
index deaf4480f8..d4144862b8 100644
--- a/gm/bigmatrix.cpp
+++ b/gm/bigmatrix.cpp
@@ -96,4 +96,3 @@ static GM* MyFactory(void*) { return new BigMatrixGM; }
 static GMRegistry reg(MyFactory);
 
 }
-
diff --git a/gm/bitmapfilters.cpp b/gm/bitmapfilters.cpp
index 64192966e6..d74dbf509c 100644
--- a/gm/bitmapfilters.cpp
+++ b/gm/bitmapfilters.cpp
@@ -131,6 +131,3 @@ static GM* MyFactory(void*) { return new FilterGM; }
 static GMRegistry reg(MyFactory);
 
 }
-
-
-
diff --git a/gm/blurs.cpp b/gm/blurs.cpp
index bb688b9c1b..22804c7fa1 100644
--- a/gm/blurs.cpp
+++ b/gm/blurs.cpp
@@ -107,4 +107,3 @@ static GM* MyFactory(void*) { return new BlursGM; }
 static GMRegistry reg(MyFactory);
 
 }
-
diff --git a/gm/colorfilterimagefilter.cpp b/gm/colorfilterimagefilter.cpp
index 60148b36f9..6323d33f6d 100644
--- a/gm/colorfilterimagefilter.cpp
+++ b/gm/colorfilterimagefilter.cpp
@@ -130,5 +130,3 @@ private:
 
 static skiagm::GM* MyFactory(void*) { return new ColorFilterImageFilterGM; }
 static skiagm::GMRegistry reg(MyFactory);
-
-
diff --git a/gm/composeshader.cpp b/gm/composeshader.cpp
index f74a19e0a3..a6643a688f 100644
--- a/gm/composeshader.cpp
+++ b/gm/composeshader.cpp
@@ -80,4 +80,3 @@ static GM* MyFactory(void*) { return new ShaderGM; }
 static GMRegistry reg(MyFactory);
 
 } // namespace
-
diff --git a/gm/convexpaths.cpp b/gm/convexpaths.cpp
index 5af843f016..2c4753d95a 100644
--- a/gm/convexpaths.cpp
+++ b/gm/convexpaths.cpp
@@ -263,4 +263,3 @@ static GM* MyFactory(void*) { return new ConvexPathsGM; }
 static GMRegistry reg(MyFactory);
 
 }
-
diff --git a/gm/dashcubics.cpp b/gm/dashcubics.cpp
index bbce9be66e..5d874d4dc6 100644
--- a/gm/dashcubics.cpp
+++ b/gm/dashcubics.cpp
@@ -71,4 +71,3 @@ private:
 
 static skiagm::GM* MyFactory(void*) { return new DashCubicsGM; }
 static skiagm::GMRegistry reg(MyFactory);
-
diff --git a/gm/dashing.cpp b/gm/dashing.cpp
index 37ea285024..7fe3029ca2 100644
--- a/gm/dashing.cpp
+++ b/gm/dashing.cpp
@@ -308,4 +308,3 @@ static skiagm::GM* F2(void*) { return new Dashing3GM; }
 static skiagm::GMRegistry gR0(F0);
 static skiagm::GMRegistry gR1(F1);
 static skiagm::GMRegistry gR2(F2);
-
diff --git a/gm/drawbitmaprect.cpp b/gm/drawbitmaprect.cpp
index 24c34318a1..16cd6e48cb 100644
--- a/gm/drawbitmaprect.cpp
+++ b/gm/drawbitmaprect.cpp
@@ -189,4 +189,3 @@ static GM* MyFactory(void*) { return new DrawBitmapRectGM; }
 static GMRegistry reg(MyFactory);
 #endif
 }
-
diff --git a/gm/drawlooper.cpp b/gm/drawlooper.cpp
index fa92393213..58c691c311 100644
--- a/gm/drawlooper.cpp
+++ b/gm/drawlooper.cpp
@@ -99,4 +99,3 @@ private:
 
 static skiagm::GM* MyFactory(void*) { return new DrawLooperGM; }
 static skiagm::GMRegistry reg(MyFactory);
-
diff --git a/gm/fatpathfill.cpp b/gm/fatpathfill.cpp
index 4c30949f52..44988795b4 100644
--- a/gm/fatpathfill.cpp
+++ b/gm/fatpathfill.cpp
@@ -97,4 +97,3 @@ private:
 ///////////////////////////////////////////////////////////////////////////////
 
 DEF_GM(return new FatPathFillGM;)
-
diff --git a/gm/filltypes.cpp b/gm/filltypes.cpp
index 86f1fbc9e1..7df02ae5c9 100644
--- a/gm/filltypes.cpp
+++ b/gm/filltypes.cpp
@@ -93,4 +93,3 @@ static GM* MyFactory(void*) { return new FillTypeGM; }
 static GMRegistry reg(MyFactory);
 
 }
-
diff --git a/gm/filltypespersp.cpp b/gm/filltypespersp.cpp
index bdd14a73aa..cbd966cb2d 100644
--- a/gm/filltypespersp.cpp
+++ b/gm/filltypespersp.cpp
@@ -131,4 +131,3 @@ static GM* MyFactory(void*) { return new FillTypePerspGM; }
 static GMRegistry reg(MyFactory);
 
 }
-
diff --git a/gm/fontscaler.cpp b/gm/fontscaler.cpp
index b331bde830..59b1a4322b 100644
--- a/gm/fontscaler.cpp
+++ b/gm/fontscaler.cpp
@@ -90,4 +90,3 @@ static GM* MyFactory(void*) { return new FontScalerGM; }
 static GMRegistry reg(MyFactory);
 
 }
-
diff --git a/gm/getpostextpath.cpp b/gm/getpostextpath.cpp
index aa65173512..39a3fc160f 100644
--- a/gm/getpostextpath.cpp
+++ b/gm/getpostextpath.cpp
@@ -71,4 +71,3 @@ protected:
 
 static skiagm::GM* F(void*) { return new GetPosTextPathGM; }
 static skiagm::GMRegistry gR(F);
-
diff --git a/gm/giantbitmap.cpp b/gm/giantbitmap.cpp
index 1857a1f84b..0d342b8ff7 100644
--- a/gm/giantbitmap.cpp
+++ b/gm/giantbitmap.cpp
@@ -152,4 +152,3 @@ static skiagm::GMRegistry reg201(G201);
 static skiagm::GMRegistry reg011(G011);
 static skiagm::GMRegistry reg111(G111);
 static skiagm::GMRegistry reg211(G211);
-
diff --git a/gm/gradients.cpp b/gm/gradients.cpp
index a2d1de24d7..004d99109c 100644
--- a/gm/gradients.cpp
+++ b/gm/gradients.cpp
@@ -367,5 +367,3 @@ static GMRegistry reg5(MyFactory5);
 static GM* MyFactory6(void*) { return new GradientsViewPerspectiveGM; }
 static GMRegistry reg6(MyFactory6);
 }
-
-
diff --git a/gm/gradtext.cpp b/gm/gradtext.cpp
index 67dd11ed48..d782338823 100644
--- a/gm/gradtext.cpp
+++ b/gm/gradtext.cpp
@@ -164,4 +164,3 @@ static GMRegistry reg(MyFactory);
 static GMRegistry Creg(CMyFactory);
 static GMRegistry Creg2(CMyFactory2);
 }
-
diff --git a/gm/hittestpath.cpp b/gm/hittestpath.cpp
index 4347c9b22f..03275719fb 100644
--- a/gm/hittestpath.cpp
+++ b/gm/hittestpath.cpp
@@ -73,5 +73,3 @@ private:
 
 static skiagm::GM* MyFactory(void*) { return new HitTestPathGM; }
 static skiagm::GMRegistry reg(MyFactory);
-
-
diff --git a/gm/image.cpp b/gm/image.cpp
index e54d3c7b2f..974f5f9096 100644
--- a/gm/image.cpp
+++ b/gm/image.cpp
@@ -192,4 +192,3 @@ private:
 
 static skiagm::GM* MyFactory(void*) { return new ImageGM; }
 static skiagm::GMRegistry reg(MyFactory);
-
diff --git a/gm/imagefiltersbase.cpp b/gm/imagefiltersbase.cpp
index e33c0eb272..6879e796b1 100644
--- a/gm/imagefiltersbase.cpp
+++ b/gm/imagefiltersbase.cpp
@@ -223,5 +223,3 @@ private:
 
 static skiagm::GM* MyFactory(void*) { return new ImageFiltersBaseGM; }
 static skiagm::GMRegistry reg(MyFactory);
-
-
diff --git a/gm/imagefiltersgraph.cpp b/gm/imagefiltersgraph.cpp
index 9c70770d46..739a18fe21 100644
--- a/gm/imagefiltersgraph.cpp
+++ b/gm/imagefiltersgraph.cpp
@@ -92,5 +92,3 @@ private:
 
 static skiagm::GM* MyFactory(void*) { return new ImageFiltersGraphGM; }
 static skiagm::GMRegistry reg(MyFactory);
-
-
diff --git a/gm/ninepatchstretch.cpp b/gm/ninepatchstretch.cpp
index 773a692e65..c4c52913c0 100644
--- a/gm/ninepatchstretch.cpp
+++ b/gm/ninepatchstretch.cpp
@@ -115,6 +115,3 @@ static GM* MyFactory(void*) { return new NinePatchStretchGM; }
 static GMRegistry reg(MyFactory);
 
 }
-
-
-
diff --git a/gm/pathfill.cpp b/gm/pathfill.cpp
index bfaabc924a..993917abdd 100644
--- a/gm/pathfill.cpp
+++ b/gm/pathfill.cpp
@@ -220,4 +220,3 @@ static skiagm::GMRegistry reg(MyFactory);
 
 static skiagm::GM* F1(void*) { return new PathInverseFillGM; }
 static skiagm::GMRegistry gR1(F1);
-
diff --git a/gm/pathinterior.cpp b/gm/pathinterior.cpp
index f7e0b5e867..559fb8973c 100644
--- a/gm/pathinterior.cpp
+++ b/gm/pathinterior.cpp
@@ -111,4 +111,3 @@ private:
 
 static skiagm::GM* MyFactory(void*) { return new PathInteriorGM; }
 static skiagm::GMRegistry reg(MyFactory);
-
diff --git a/gm/points.cpp b/gm/points.cpp
index 0646d61c29..0a83acf05f 100644
--- a/gm/points.cpp
+++ b/gm/points.cpp
@@ -71,4 +71,3 @@ static GM* MyFactory(void*) { return new PointsGM; }
 static GMRegistry reg(MyFactory);
 
 }
-
diff --git a/gm/poly2poly.cpp b/gm/poly2poly.cpp
index 9ad5bdcaae..20c117f2d8 100644
--- a/gm/poly2poly.cpp
+++ b/gm/poly2poly.cpp
@@ -106,4 +106,3 @@ static GM* MyFactory(void*) { return new Poly2PolyGM; }
 static GMRegistry reg(MyFactory);
 
 }
-
diff --git a/gm/rrect.cpp b/gm/rrect.cpp
index b07e3c0350..29d03005fe 100644
--- a/gm/rrect.cpp
+++ b/gm/rrect.cpp
@@ -167,4 +167,3 @@ private:
 };
 
 DEF_GM( return new RRectGM; )
-
diff --git a/gm/rrects.cpp b/gm/rrects.cpp
index e58d4f2852..299e8d8d9b 100644
--- a/gm/rrects.cpp
+++ b/gm/rrects.cpp
@@ -146,5 +146,3 @@ DEF_GM( return new RRectGM(false, true); )
 DEF_GM( return new RRectGM(true, true); )
 
 }
-
-
diff --git a/gm/srcmode.cpp b/gm/srcmode.cpp
index c99a6b2f9d..66729e2737 100644
--- a/gm/srcmode.cpp
+++ b/gm/srcmode.cpp
@@ -149,4 +149,3 @@ private:
 ///////////////////////////////////////////////////////////////////////////////
 
 DEF_GM(return new SrcModeGM;)
-
diff --git a/gm/strokerect.cpp b/gm/strokerect.cpp
index 99a50ef4f4..489f7b4d3f 100644
--- a/gm/strokerect.cpp
+++ b/gm/strokerect.cpp
@@ -110,4 +110,3 @@ private:
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
 DEF_GM(return new StrokeRectGM;)
-
diff --git a/gm/strokerects.cpp b/gm/strokerects.cpp
index 62a9639c2b..61ee9e0309 100644
--- a/gm/strokerects.cpp
+++ b/gm/strokerects.cpp
@@ -81,4 +81,3 @@ static GM* MyFactory(void*) { return new StrokeRectGM; }
 static GMRegistry reg(MyFactory);
 
 }
-
diff --git a/gm/strokes.cpp b/gm/strokes.cpp
index c479d69fff..49a7fc63b4 100644
--- a/gm/strokes.cpp
+++ b/gm/strokes.cpp
@@ -248,5 +248,3 @@ static skiagm::GM* F2(void*) { return new Strokes3GM; }
 static skiagm::GMRegistry R0(F0);
 static skiagm::GMRegistry R1(F1);
 static skiagm::GMRegistry R2(F2);
-
-
diff --git a/gm/techtalk1.cpp b/gm/techtalk1.cpp
index 00c49569c0..442d73ba81 100644
--- a/gm/techtalk1.cpp
+++ b/gm/techtalk1.cpp
@@ -395,5 +395,3 @@ ADD_GM(TalkGM, (4, true))
 
 //static GM* MyFactory(void*) { return new TalkGM(0, false); }
 //static GMRegistry reg(MyFactory);
-
-
diff --git a/gm/testimagefilters.cpp b/gm/testimagefilters.cpp
index 65d1be40ac..73581ba5c0 100644
--- a/gm/testimagefilters.cpp
+++ b/gm/testimagefilters.cpp
@@ -142,5 +142,3 @@ private:
 
 static skiagm::GM* MyFactory(void*) { return new TestImageFiltersGM; }
 static skiagm::GMRegistry reg(MyFactory);
-
-
diff --git a/gm/texteffects.cpp b/gm/texteffects.cpp
index 3436018963..782850e2f6 100644
--- a/gm/texteffects.cpp
+++ b/gm/texteffects.cpp
@@ -215,4 +215,3 @@ private:
 
 static skiagm::GM* MyFactory(void*) { return new TextEffectsGM; }
 static skiagm::GMRegistry reg(MyFactory);
-
diff --git a/gm/tilemodes.cpp b/gm/tilemodes.cpp
index 79b6104183..b0594e40cb 100644
--- a/gm/tilemodes.cpp
+++ b/gm/tilemodes.cpp
@@ -257,5 +257,3 @@ static skiagm::GMRegistry reg2(MyFactory2);
 
 static skiagm::GM* MyFactory3(void*) { return new Tiling2GM(make_grad, "gradient"); }
 static skiagm::GMRegistry reg3(MyFactory3);
-
-
diff --git a/gm/twopointradial.cpp b/gm/twopointradial.cpp
index 40712e8341..a10f5af6d5 100644
--- a/gm/twopointradial.cpp
+++ b/gm/twopointradial.cpp
@@ -109,4 +109,3 @@ protected:
 static skiagm::GM* F(void*) { return new TwoPointRadialGM; }
 
 static skiagm::GMRegistry gR(F);
-
diff --git a/include/animator/SkAnimator.h b/include/animator/SkAnimator.h
index 924c595063..9bb3642ca0 100644
--- a/include/animator/SkAnimator.h
+++ b/include/animator/SkAnimator.h
@@ -498,4 +498,3 @@ private:
 };
 
 #endif
-
diff --git a/include/animator/SkAnimatorView.h b/include/animator/SkAnimatorView.h
index 940dd2657b..2b2c61b5d8 100644
--- a/include/animator/SkAnimatorView.h
+++ b/include/animator/SkAnimatorView.h
@@ -37,4 +37,3 @@ private:
 };
 
 #endif
-
diff --git a/include/core/Sk64.h b/include/core/Sk64.h
index d232d82662..6db3001fb5 100644
--- a/include/core/Sk64.h
+++ b/include/core/Sk64.h
@@ -228,4 +228,3 @@ struct SK_API Sk64 {
 };
 
 #endif
-
diff --git a/include/core/SkBounder.h b/include/core/SkBounder.h
index 1ede5481f5..7368d09aa5 100644
--- a/include/core/SkBounder.h
+++ b/include/core/SkBounder.h
@@ -91,4 +91,3 @@ private:
 };
 
 #endif
-
diff --git a/include/core/SkClipStack.h b/include/core/SkClipStack.h
index b39c5af6e1..256f603962 100644
--- a/include/core/SkClipStack.h
+++ b/include/core/SkClipStack.h
@@ -464,4 +464,3 @@ private:
 };
 
 #endif
-
diff --git a/include/core/SkColor.h b/include/core/SkColor.h
index f5055d01ee..dafc59676d 100644
--- a/include/core/SkColor.h
+++ b/include/core/SkColor.h
@@ -164,4 +164,3 @@ typedef SkPMColor (*SkXfermodeProc)(SkPMColor src, SkPMColor dst);
 typedef uint16_t (*SkXfermodeProc16)(SkPMColor src, uint16_t dst);
 
 #endif
-
diff --git a/include/core/SkColorPriv.h b/include/core/SkColorPriv.h
index 21743bdb68..46f7d27184 100644
--- a/include/core/SkColorPriv.h
+++ b/include/core/SkColorPriv.h
@@ -861,4 +861,3 @@ static inline void SkBlitLCD16OpaqueRow(SkPMColor dst[], const uint16_t src[],
 }
 
 #endif
-
diff --git a/include/core/SkDraw.h b/include/core/SkDraw.h
index fa02919422..6829f8eaa6 100644
--- a/include/core/SkDraw.h
+++ b/include/core/SkDraw.h
@@ -134,5 +134,3 @@ public:
 };
 
 #endif
-
-
diff --git a/include/core/SkEndian.h b/include/core/SkEndian.h
index 910cf1eeab..01d21951da 100644
--- a/include/core/SkEndian.h
+++ b/include/core/SkEndian.h
@@ -149,4 +149,3 @@ static inline void SkEndianSwap32s(uint32_t array[], int count) {
 #endif
 
 #endif
-
diff --git a/include/core/SkFloatBits.h b/include/core/SkFloatBits.h
index 3c725fe3c6..a1196caca7 100644
--- a/include/core/SkFloatBits.h
+++ b/include/core/SkFloatBits.h
@@ -136,4 +136,3 @@ static inline int32_t SkFloatToIntCeil(float x) {
 #endif
 
 #endif
-
diff --git a/include/core/SkGraphics.h b/include/core/SkGraphics.h
index c9a0f532f6..87d66ad1f0 100644
--- a/include/core/SkGraphics.h
+++ b/include/core/SkGraphics.h
@@ -109,4 +109,3 @@ public:
 };
 
 #endif
-
diff --git a/include/core/SkLineClipper.h b/include/core/SkLineClipper.h
index 5827dbe2ce..8026890b8d 100644
--- a/include/core/SkLineClipper.h
+++ b/include/core/SkLineClipper.h
@@ -45,4 +45,3 @@ public:
 };
 
 #endif
-
diff --git a/include/core/SkMask.h b/include/core/SkMask.h
index 5dadb63d5b..4265595f26 100644
--- a/include/core/SkMask.h
+++ b/include/core/SkMask.h
@@ -146,4 +146,3 @@ private:
 };
 
 #endif
-
diff --git a/include/core/SkMaskFilter.h b/include/core/SkMaskFilter.h
index 245de29b8e..a874e62b48 100644
--- a/include/core/SkMaskFilter.h
+++ b/include/core/SkMaskFilter.h
@@ -145,4 +145,3 @@ private:
 };
 
 #endif
-
diff --git a/include/core/SkMath.h b/include/core/SkMath.h
index 35f7eda431..314311f655 100644
--- a/include/core/SkMath.h
+++ b/include/core/SkMath.h
@@ -159,4 +159,3 @@ static inline U8CPU SkMulDiv255Round(U8CPU a, U8CPU b) {
 }
 
 #endif
-
diff --git a/include/core/SkMetaData.h b/include/core/SkMetaData.h
index 86f186f69b..5db437c980 100644
--- a/include/core/SkMetaData.h
+++ b/include/core/SkMetaData.h
@@ -173,4 +173,3 @@ public:
 };
 
 #endif
-
diff --git a/include/core/SkPaint.h b/include/core/SkPaint.h
index a5473d3517..a64c89ded4 100644
--- a/include/core/SkPaint.h
+++ b/include/core/SkPaint.h
@@ -993,4 +993,3 @@ private:
 };
 
 #endif
-
diff --git a/include/core/SkPathEffect.h b/include/core/SkPathEffect.h
index 7a982f40f1..3b4541de56 100644
--- a/include/core/SkPathEffect.h
+++ b/include/core/SkPathEffect.h
@@ -202,4 +202,3 @@ private:
 };
 
 #endif
-
diff --git a/include/core/SkRect.h b/include/core/SkRect.h
index d66427397c..e6efed56d5 100644
--- a/include/core/SkRect.h
+++ b/include/core/SkRect.h
@@ -772,4 +772,3 @@ struct SK_API SkRect {
 };
 
 #endif
-
diff --git a/include/core/SkRefCnt.h b/include/core/SkRefCnt.h
index 21ed0efec3..0330133675 100644
--- a/include/core/SkRefCnt.h
+++ b/include/core/SkRefCnt.h
@@ -262,4 +262,3 @@ private:
 };
 
 #endif
-
diff --git a/include/core/SkScalarCompare.h b/include/core/SkScalarCompare.h
index 0842fdd8ac..5361294f9a 100644
--- a/include/core/SkScalarCompare.h
+++ b/include/core/SkScalarCompare.h
@@ -36,4 +36,3 @@
 #endif
 
 #endif
-
diff --git a/include/core/SkShader.h b/include/core/SkShader.h
index faa795fba4..126602def9 100644
--- a/include/core/SkShader.h
+++ b/include/core/SkShader.h
@@ -374,4 +374,3 @@ private:
 };
 
 #endif
-
diff --git a/include/core/SkTArray.h b/include/core/SkTArray.h
index 3ca66793f4..b2644824bd 100644
--- a/include/core/SkTArray.h
+++ b/include/core/SkTArray.h
@@ -410,4 +410,3 @@ private:
 };
 
 #endif
-
diff --git a/include/core/SkTDStack.h b/include/core/SkTDStack.h
index be34e0117d..e286e4a03a 100644
--- a/include/core/SkTDStack.h
+++ b/include/core/SkTDStack.h
@@ -108,4 +108,3 @@ private:
 };
 
 #endif
-
diff --git a/include/core/SkTDict.h b/include/core/SkTDict.h
index 3620899210..b704a48645 100644
--- a/include/core/SkTDict.h
+++ b/include/core/SkTDict.h
@@ -159,4 +159,3 @@ private:
 };
 
 #endif
-
diff --git a/include/core/SkTLazy.h b/include/core/SkTLazy.h
index 315bd95101..b9052f0d99 100644
--- a/include/core/SkTLazy.h
+++ b/include/core/SkTLazy.h
@@ -154,4 +154,3 @@ private:
 };
 
 #endif
-
diff --git a/include/core/SkTSearch.h b/include/core/SkTSearch.h
index 2541634d82..eaf5ee5934 100644
--- a/include/core/SkTSearch.h
+++ b/include/core/SkTSearch.h
@@ -237,4 +237,3 @@ private:
 #define SkCastForQSort(compare) reinterpret_cast<int (*)(const void*, const void*)>(compare)
 
 #endif
-
diff --git a/include/core/SkTemplates.h b/include/core/SkTemplates.h
index b390a1965d..42e9943dec 100644
--- a/include/core/SkTemplates.h
+++ b/include/core/SkTemplates.h
@@ -350,4 +350,3 @@ private:
 };
 
 #endif
-
diff --git a/include/core/SkTime.h b/include/core/SkTime.h
index ede1fd96b4..7f3c27053e 100644
--- a/include/core/SkTime.h
+++ b/include/core/SkTime.h
@@ -62,4 +62,3 @@ private:
 };
 
 #endif
-
diff --git a/include/core/SkTrace.h b/include/core/SkTrace.h
index 2d48799242..e6e7e2ccae 100644
--- a/include/core/SkTrace.h
+++ b/include/core/SkTrace.h
@@ -43,5 +43,3 @@
 #endif
 
 #endif
-
-
diff --git a/include/core/SkUnitMapper.h b/include/core/SkUnitMapper.h
index 45bb987870..754be26841 100644
--- a/include/core/SkUnitMapper.h
+++ b/include/core/SkUnitMapper.h
@@ -33,4 +33,3 @@ private:
 };
 
 #endif
-
diff --git a/include/core/SkUtils.h b/include/core/SkUtils.h
index b700b96276..c0ce51ffb0 100644
--- a/include/core/SkUtils.h
+++ b/include/core/SkUtils.h
@@ -133,4 +133,3 @@ private:
 };
 
 #endif
-
diff --git a/include/effects/SkGradientShader.h b/include/effects/SkGradientShader.h
index 443be93d67..dbeb2fb069 100644
--- a/include/effects/SkGradientShader.h
+++ b/include/effects/SkGradientShader.h
@@ -133,4 +133,3 @@ public:
 };
 
 #endif
-
diff --git a/include/effects/SkLightingImageFilter.h b/include/effects/SkLightingImageFilter.h
index 95498bcf12..da95b7bf31 100644
--- a/include/effects/SkLightingImageFilter.h
+++ b/include/effects/SkLightingImageFilter.h
@@ -87,4 +87,3 @@ private:
 };
 
 #endif
-
diff --git a/include/effects/SkMorphologyImageFilter.h b/include/effects/SkMorphologyImageFilter.h
index 28838ee02c..60424e9a0a 100644
--- a/include/effects/SkMorphologyImageFilter.h
+++ b/include/effects/SkMorphologyImageFilter.h
@@ -73,4 +73,3 @@ private:
 };
 
 #endif
-
diff --git a/include/gpu/GrClipData.h b/include/gpu/GrClipData.h
index 0cf702234c..078b61ec35 100644
--- a/include/gpu/GrClipData.h
+++ b/include/gpu/GrClipData.h
@@ -55,4 +55,3 @@ public:
 };
 
 #endif
-
diff --git a/include/gpu/GrColor.h b/include/gpu/GrColor.h
index 4318f141dd..af12ac69bc 100644
--- a/include/gpu/GrColor.h
+++ b/include/gpu/GrColor.h
@@ -68,4 +68,3 @@ static inline void GrColorToRGBAFloat(GrColor color, float rgba[4]) {
 }
 
 #endif
-
diff --git a/include/gpu/GrConfig.h b/include/gpu/GrConfig.h
index 928cc56fe2..d423a2a0cf 100644
--- a/include/gpu/GrConfig.h
+++ b/include/gpu/GrConfig.h
@@ -441,4 +441,3 @@ inline void GrCrash(const char* msg) { GrPrintf(msg); GrAlwaysAssert(false); }
 #endif
 
 #endif
-
diff --git a/include/gpu/GrFontScaler.h b/include/gpu/GrFontScaler.h
index a69e91248d..e3a7a2ac72 100644
--- a/include/gpu/GrFontScaler.h
+++ b/include/gpu/GrFontScaler.h
@@ -39,4 +39,3 @@ private:
 };
 
 #endif
-
diff --git a/include/gpu/GrGlyph.h b/include/gpu/GrGlyph.h
index 956404ec11..4945f2a58a 100644
--- a/include/gpu/GrGlyph.h
+++ b/include/gpu/GrGlyph.h
@@ -79,4 +79,3 @@ struct GrGlyph {
 
 
 #endif
-
diff --git a/include/gpu/GrKey.h b/include/gpu/GrKey.h
index 17d00de1b5..80eb537ca4 100644
--- a/include/gpu/GrKey.h
+++ b/include/gpu/GrKey.h
@@ -41,4 +41,3 @@ private:
 };
 
 #endif
-
diff --git a/include/gpu/GrNoncopyable.h b/include/gpu/GrNoncopyable.h
index cad722f6f4..3d47170911 100644
--- a/include/gpu/GrNoncopyable.h
+++ b/include/gpu/GrNoncopyable.h
@@ -28,4 +28,3 @@ private:
 };
 
 #endif
-
diff --git a/include/gpu/GrPoint.h b/include/gpu/GrPoint.h
index 302c4e1f27..c987b01134 100644
--- a/include/gpu/GrPoint.h
+++ b/include/gpu/GrPoint.h
@@ -28,4 +28,3 @@ struct GrIPoint16 {
 };
 
 #endif
-
diff --git a/include/gpu/GrRect.h b/include/gpu/GrRect.h
index 42ddd8e8fe..821e137030 100644
--- a/include/gpu/GrRect.h
+++ b/include/gpu/GrRect.h
@@ -34,4 +34,3 @@ struct GrIRect16 {
 };
 
 #endif
-
diff --git a/include/gpu/GrRefCnt.h b/include/gpu/GrRefCnt.h
index 50c32c6560..31aa80dacd 100644
--- a/include/gpu/GrRefCnt.h
+++ b/include/gpu/GrRefCnt.h
@@ -31,4 +31,3 @@ static inline void GrSafeSetNull(T*& obj) {
 }
 
 #endif
-
diff --git a/include/gpu/GrTextContext.h b/include/gpu/GrTextContext.h
index 6b28b79efc..fc7735db7a 100644
--- a/include/gpu/GrTextContext.h
+++ b/include/gpu/GrTextContext.h
@@ -61,4 +61,3 @@ private:
 };
 
 #endif
-
diff --git a/include/gpu/GrUserConfig.h b/include/gpu/GrUserConfig.h
index 3eb77a6891..ff10044ac2 100644
--- a/include/gpu/GrUserConfig.h
+++ b/include/gpu/GrUserConfig.h
@@ -68,5 +68,3 @@
 #define GR_TEXT_SCALAR_IS_FLOAT     1
 
 #endif
-
-
diff --git a/include/gpu/SkGpuDevice.h b/include/gpu/SkGpuDevice.h
index 815376fbfa..a6087c88b8 100644
--- a/include/gpu/SkGpuDevice.h
+++ b/include/gpu/SkGpuDevice.h
@@ -183,4 +183,3 @@ private:
 };
 
 #endif
-
diff --git a/include/gpu/SkGrPixelRef.h b/include/gpu/SkGrPixelRef.h
index 0a32f21064..ec1e22ec02 100644
--- a/include/gpu/SkGrPixelRef.h
+++ b/include/gpu/SkGrPixelRef.h
@@ -68,4 +68,3 @@ private:
 };
 
 #endif
-
diff --git a/include/gpu/SkGrTexturePixelRef.h b/include/gpu/SkGrTexturePixelRef.h
index ffa4bef444..712951235d 100644
--- a/include/gpu/SkGrTexturePixelRef.h
+++ b/include/gpu/SkGrTexturePixelRef.h
@@ -17,4 +17,3 @@ typedef SkGrPixelRef SkGrTexturePixelRef;
 typedef SkGrPixelRef SkGrRenderTargetPixelRef;
 
 #endif
-
diff --git a/include/gpu/gl/SkDebugGLContext.h b/include/gpu/gl/SkDebugGLContext.h
index c51f54c7e8..6e29b6738b 100644
--- a/include/gpu/gl/SkDebugGLContext.h
+++ b/include/gpu/gl/SkDebugGLContext.h
@@ -24,4 +24,3 @@ protected:
 };
 
 #endif
-
diff --git a/include/gpu/gl/SkNullGLContext.h b/include/gpu/gl/SkNullGLContext.h
index 9e16cee089..83213a3ac3 100644
--- a/include/gpu/gl/SkNullGLContext.h
+++ b/include/gpu/gl/SkNullGLContext.h
@@ -24,4 +24,3 @@ protected:
 };
 
 #endif
-
diff --git a/include/images/SkPageFlipper.h b/include/images/SkPageFlipper.h
index 91a1e9de6c..7779c30160 100644
--- a/include/images/SkPageFlipper.h
+++ b/include/images/SkPageFlipper.h
@@ -60,4 +60,3 @@ private:
 };
 
 #endif
-
diff --git a/include/ports/SkTypeface_mac.h b/include/ports/SkTypeface_mac.h
index eb9d25fb7b..0166ee57ea 100644
--- a/include/ports/SkTypeface_mac.h
+++ b/include/ports/SkTypeface_mac.h
@@ -27,4 +27,3 @@
 SK_API extern SkTypeface* SkCreateTypefaceFromCTFont(CTFontRef);
 
 #endif
-
diff --git a/include/ports/SkTypeface_win.h b/include/ports/SkTypeface_win.h
index 6da843f428..fdf38e26cc 100644
--- a/include/ports/SkTypeface_win.h
+++ b/include/ports/SkTypeface_win.h
@@ -29,4 +29,3 @@ SK_API SkTypeface* SkCreateTypefaceFromLOGFONT(const LOGFONT&);
 SK_API void SkLOGFONTFromTypeface(const SkTypeface* typeface, LOGFONT* lf);
 
 #endif
-
diff --git a/include/svg/SkSVGBase.h b/include/svg/SkSVGBase.h
index a512eabed1..6bfc39d0bf 100644
--- a/include/svg/SkSVGBase.h
+++ b/include/svg/SkSVGBase.h
@@ -23,4 +23,3 @@ public:
 };
 
 #endif // SkSVGBase_DEFINEDes(const SkSVGAttribute** attrPtr) = 0;
-
diff --git a/include/text/SkTextLayout.h b/include/text/SkTextLayout.h
index 7d0ffe72de..718acdbc5a 100644
--- a/include/text/SkTextLayout.h
+++ b/include/text/SkTextLayout.h
@@ -58,4 +58,3 @@ private:
 };
 
 #endif
-
diff --git a/include/utils/SkBoundaryPatch.h b/include/utils/SkBoundaryPatch.h
index 89060a65da..cf001d5ba8 100644
--- a/include/utils/SkBoundaryPatch.h
+++ b/include/utils/SkBoundaryPatch.h
@@ -64,4 +64,3 @@ public:
 };
 
 #endif
-
diff --git a/include/utils/SkCamera.h b/include/utils/SkCamera.h
index 6527c32d6e..eafacbcd7d 100644
--- a/include/utils/SkCamera.h
+++ b/include/utils/SkCamera.h
@@ -173,4 +173,3 @@ private:
 };
 
 #endif
-
diff --git a/include/utils/SkCubicInterval.h b/include/utils/SkCubicInterval.h
index bd1f9b992f..64d63cf2cd 100644
--- a/include/utils/SkCubicInterval.h
+++ b/include/utils/SkCubicInterval.h
@@ -20,4 +20,3 @@ static inline SkScalar SkEvalCubicInterval(const SkPoint pts[2], SkScalar x) {
 }
 
 #endif
-
diff --git a/include/utils/SkInterpolator.h b/include/utils/SkInterpolator.h
index 289e8867f2..74789c87ce 100644
--- a/include/utils/SkInterpolator.h
+++ b/include/utils/SkInterpolator.h
@@ -129,4 +129,3 @@ SkScalar SkUnitCubicInterp(SkScalar value, SkScalar bx, SkScalar by,
                            SkScalar cx, SkScalar cy);
 
 #endif
-
diff --git a/include/utils/SkNWayCanvas.h b/include/utils/SkNWayCanvas.h
index fcd0ccff0e..d8334551cb 100644
--- a/include/utils/SkNWayCanvas.h
+++ b/include/utils/SkNWayCanvas.h
@@ -84,4 +84,3 @@ private:
 
 
 #endif
-
diff --git a/include/utils/SkParse.h b/include/utils/SkParse.h
index 7491cd67ec..c5aac7d04c 100644
--- a/include/utils/SkParse.h
+++ b/include/utils/SkParse.h
@@ -34,4 +34,3 @@ public:
 };
 
 #endif
-
diff --git a/include/utils/SkParsePaint.h b/include/utils/SkParsePaint.h
index b35fcf1551..066292f9c7 100644
--- a/include/utils/SkParsePaint.h
+++ b/include/utils/SkParsePaint.h
@@ -24,4 +24,3 @@
 void SkPaint_Inflate(SkPaint*, const SkDOM&, const SkDOM::Node*);
 
 #endif
-
diff --git a/include/utils/SkParsePath.h b/include/utils/SkParsePath.h
index b48c2c5ddf..c52b3c0bcd 100644
--- a/include/utils/SkParsePath.h
+++ b/include/utils/SkParsePath.h
@@ -21,4 +21,3 @@ public:
 };
 
 #endif
-
diff --git a/include/utils/SkRandom.h b/include/utils/SkRandom.h
index d5f3123e02..a62828f8cd 100644
--- a/include/utils/SkRandom.h
+++ b/include/utils/SkRandom.h
@@ -152,4 +152,3 @@ private:
 };
 
 #endif
-
diff --git a/include/utils/SkUnitMappers.h b/include/utils/SkUnitMappers.h
index 901650d0ce..64aab5ddee 100644
--- a/include/utils/SkUnitMappers.h
+++ b/include/utils/SkUnitMappers.h
@@ -53,4 +53,3 @@ private:
 };
 
 #endif
-
diff --git a/include/views/SkBGViewArtist.h b/include/views/SkBGViewArtist.h
index 869beab1ee..33054c8038 100644
--- a/include/views/SkBGViewArtist.h
+++ b/include/views/SkBGViewArtist.h
@@ -31,4 +31,3 @@ private:
 };
 
 #endif
-
diff --git a/include/views/SkEventSink.h b/include/views/SkEventSink.h
index 8ef92b408a..01d4f7a252 100644
--- a/include/views/SkEventSink.h
+++ b/include/views/SkEventSink.h
@@ -110,4 +110,3 @@ private:
 };
 
 #endif
-
diff --git a/include/views/SkKey.h b/include/views/SkKey.h
index 65fac71c80..036e2c3176 100644
--- a/include/views/SkKey.h
+++ b/include/views/SkKey.h
@@ -60,4 +60,3 @@ enum SkModifierKeys {
 };
 
 #endif
-
diff --git a/include/views/SkOSMenu.h b/include/views/SkOSMenu.h
index 3e5ee43920..8801a52f50 100644
--- a/include/views/SkOSMenu.h
+++ b/include/views/SkOSMenu.h
@@ -180,4 +180,3 @@ private:
 };
 
 #endif
-
diff --git a/include/views/SkOSWindow_Android.h b/include/views/SkOSWindow_Android.h
index 9b72b4874e..ca9b7708f1 100644
--- a/include/views/SkOSWindow_Android.h
+++ b/include/views/SkOSWindow_Android.h
@@ -43,4 +43,3 @@ private:
 };
 
 #endif
-
diff --git a/include/views/SkOSWindow_NaCl.h b/include/views/SkOSWindow_NaCl.h
index 8c4ddc6083..52514cab71 100644
--- a/include/views/SkOSWindow_NaCl.h
+++ b/include/views/SkOSWindow_NaCl.h
@@ -43,4 +43,3 @@ private:
 };
 
 #endif
-
diff --git a/include/views/SkOSWindow_SDL.h b/include/views/SkOSWindow_SDL.h
index 037de3bfb7..e6b59e6511 100644
--- a/include/views/SkOSWindow_SDL.h
+++ b/include/views/SkOSWindow_SDL.h
@@ -42,4 +42,3 @@ private:
 };
 
 #endif
-
diff --git a/include/views/SkOSWindow_iOS.h b/include/views/SkOSWindow_iOS.h
index 5bf98c109a..1dd3997dfe 100755
--- a/include/views/SkOSWindow_iOS.h
+++ b/include/views/SkOSWindow_iOS.h
@@ -43,4 +43,3 @@ private:
 };
 
 #endif
-
diff --git a/include/views/SkStackViewLayout.h b/include/views/SkStackViewLayout.h
index f8d23de783..f2a7cf04c7 100644
--- a/include/views/SkStackViewLayout.h
+++ b/include/views/SkStackViewLayout.h
@@ -86,4 +86,3 @@ private:
 };
 
 #endif
-
diff --git a/include/views/SkTextBox.h b/include/views/SkTextBox.h
index e3b365ddb0..e217076fed 100644
--- a/include/views/SkTextBox.h
+++ b/include/views/SkTextBox.h
@@ -75,4 +75,3 @@ public:
 };
 
 #endif
-
diff --git a/include/views/SkTouchGesture.h b/include/views/SkTouchGesture.h
index 1ba3865aa5..3a0cfce18d 100644
--- a/include/views/SkTouchGesture.h
+++ b/include/views/SkTouchGesture.h
@@ -75,5 +75,3 @@ private:
 };
 
 #endif
-
-
diff --git a/include/views/SkView.h b/include/views/SkView.h
index 698c8c79f3..786d363041 100644
--- a/include/views/SkView.h
+++ b/include/views/SkView.h
@@ -397,4 +397,3 @@ private:
 };
 
 #endif
-
diff --git a/include/views/SkViewInflate.h b/include/views/SkViewInflate.h
index b2cd1e67ce..db3689a827 100644
--- a/include/views/SkViewInflate.h
+++ b/include/views/SkViewInflate.h
@@ -69,4 +69,3 @@ private:
 };
 
 #endif
-
diff --git a/include/views/animated/SkBorderView.h b/include/views/animated/SkBorderView.h
index 02f8725a87..8b1e537a0b 100644
--- a/include/views/animated/SkBorderView.h
+++ b/include/views/animated/SkBorderView.h
@@ -38,4 +38,3 @@ private:
 };
 
 #endif
-
diff --git a/include/views/animated/SkScrollBarView.h b/include/views/animated/SkScrollBarView.h
index 1270e14136..05042f06fe 100644
--- a/include/views/animated/SkScrollBarView.h
+++ b/include/views/animated/SkScrollBarView.h
@@ -42,4 +42,3 @@ private:
     typedef SkWidgetView INHERITED;
 };
 #endif
-
diff --git a/include/xml/SkBML_WXMLParser.h b/include/xml/SkBML_WXMLParser.h
index 5d220cfbaa..74f164cbfa 100644
--- a/include/xml/SkBML_WXMLParser.h
+++ b/include/xml/SkBML_WXMLParser.h
@@ -44,4 +44,3 @@ private:
 };
 
 #endif // SkBML_WXMLParser_DEFINED
-
diff --git a/include/xml/SkBML_XMLParser.h b/include/xml/SkBML_XMLParser.h
index 7a8d6a1588..9bdbf51282 100644
--- a/include/xml/SkBML_XMLParser.h
+++ b/include/xml/SkBML_XMLParser.h
@@ -29,4 +29,3 @@ public:
 };
 
 #endif // SkBML_XMLParser_DEFINED
-
diff --git a/include/xml/SkDOM.h b/include/xml/SkDOM.h
index fd175f06b7..e0bb744d6d 100644
--- a/include/xml/SkDOM.h
+++ b/include/xml/SkDOM.h
@@ -89,4 +89,3 @@ private:
 };
 
 #endif
-
diff --git a/include/xml/SkJS.h b/include/xml/SkJS.h
index 645e03b4c5..8a11097962 100644
--- a/include/xml/SkJS.h
+++ b/include/xml/SkJS.h
@@ -37,4 +37,3 @@ protected:
     JSContext *fContext;
     JSObject *fGlobal;
 };
-
diff --git a/include/xml/SkXMLWriter.h b/include/xml/SkXMLWriter.h
index 4e0eda1e6f..214fefe862 100644
--- a/include/xml/SkXMLWriter.h
+++ b/include/xml/SkXMLWriter.h
@@ -83,4 +83,3 @@ private:
 
 
 #endif
-
diff --git a/samplecode/ClockFaceView.cpp b/samplecode/ClockFaceView.cpp
index a182f4df95..1e9b89e9de 100644
--- a/samplecode/ClockFaceView.cpp
+++ b/samplecode/ClockFaceView.cpp
@@ -250,4 +250,3 @@ private:
 
 static SkView* MyFactory() { return new ClockFaceView; }
 static SkViewRegister reg(MyFactory);
-
diff --git a/samplecode/SampleAAClip.cpp b/samplecode/SampleAAClip.cpp
index 617d786069..d4e632d7af 100644
--- a/samplecode/SampleAAClip.cpp
+++ b/samplecode/SampleAAClip.cpp
@@ -125,4 +125,3 @@ private:
 
 static SkView* MyFactory() { return new AAClipView; }
 static SkViewRegister reg(MyFactory);
-
diff --git a/samplecode/SampleAARectModes.cpp b/samplecode/SampleAARectModes.cpp
index 00edfba690..3a8eb13749 100644
--- a/samplecode/SampleAARectModes.cpp
+++ b/samplecode/SampleAARectModes.cpp
@@ -137,4 +137,3 @@ private:
 
 static SkView* MyFactory() { return new AARectsModesView; }
 static SkViewRegister reg(MyFactory);
-
diff --git a/samplecode/SampleAARects.cpp b/samplecode/SampleAARects.cpp
index e66f8dfc43..0f84900010 100644
--- a/samplecode/SampleAARects.cpp
+++ b/samplecode/SampleAARects.cpp
@@ -195,4 +195,3 @@ private:
 
 static SkView* MyFactory() { return new AARectView; }
 static SkViewRegister reg(MyFactory);
-
diff --git a/samplecode/SampleAll.cpp b/samplecode/SampleAll.cpp
index e783d3d414..ff8249f0f9 100644
--- a/samplecode/SampleAll.cpp
+++ b/samplecode/SampleAll.cpp
@@ -644,4 +644,3 @@ private:
 
 static SkView* MyFactory() { return new DemoView; }
 static SkViewRegister reg(MyFactory);
-
diff --git a/samplecode/SampleAnimBlur.cpp b/samplecode/SampleAnimBlur.cpp
index cada0cda77..98c981456f 100644
--- a/samplecode/SampleAnimBlur.cpp
+++ b/samplecode/SampleAnimBlur.cpp
@@ -67,4 +67,3 @@ private:
 
 static SkView* MyFactory() { return new AnimBlurView; }
 static SkViewRegister reg(MyFactory);
-
diff --git a/samplecode/SampleAnimatedGradient.cpp b/samplecode/SampleAnimatedGradient.cpp
index c4a4ec5478..79ee499fa4 100644
--- a/samplecode/SampleAnimatedGradient.cpp
+++ b/samplecode/SampleAnimatedGradient.cpp
@@ -95,4 +95,3 @@ private:
 
 static SkView* MyFactory() { return new GradientView; }
 static SkViewRegister reg(MyFactory);
-
diff --git a/samplecode/SampleAnimator.cpp b/samplecode/SampleAnimator.cpp
index 7b46d471cb..50b61bad93 100644
--- a/samplecode/SampleAnimator.cpp
+++ b/samplecode/SampleAnimator.cpp
@@ -172,4 +172,3 @@ static SkView* MyFactory() {
 }
 
 static SkViewRegister reg(MyFactory);
-
diff --git a/samplecode/SampleArc.cpp b/samplecode/SampleArc.cpp
index 3b6c8e99c9..6af37b6c2c 100644
--- a/samplecode/SampleArc.cpp
+++ b/samplecode/SampleArc.cpp
@@ -189,4 +189,3 @@ private:
 
 static SkView* MyFactory() { return new ArcsView; }
 static SkViewRegister reg(MyFactory);
-
diff --git a/samplecode/SampleAvoid.cpp b/samplecode/SampleAvoid.cpp
index b8bac0d3db..879481b41c 100644
--- a/samplecode/SampleAvoid.cpp
+++ b/samplecode/SampleAvoid.cpp
@@ -103,4 +103,3 @@ static SkView* MyFactory() {
 }
 
 static SkViewRegister reg(MyFactory);
-
diff --git a/samplecode/SampleBigBlur.cpp b/samplecode/SampleBigBlur.cpp
index f5e632c345..de49c4ef4f 100644
--- a/samplecode/SampleBigBlur.cpp
+++ b/samplecode/SampleBigBlur.cpp
@@ -47,4 +47,3 @@ private:
 
 static SkView* MyFactory() { return new BigBlurView; }
 static SkViewRegister reg(MyFactory);
-
diff --git a/samplecode/SampleBigGradient.cpp b/samplecode/SampleBigGradient.cpp
index 6a68fa052b..c2e6225f5d 100644
--- a/samplecode/SampleBigGradient.cpp
+++ b/samplecode/SampleBigGradient.cpp
@@ -47,4 +47,3 @@ private:
 
 static SkView* MyFactory() { return new BigGradientView; }
 static SkViewRegister reg(MyFactory);
-
diff --git a/samplecode/SampleBitmapRect.cpp b/samplecode/SampleBitmapRect.cpp
index 3f895fc4f8..04297e05e7 100644
--- a/samplecode/SampleBitmapRect.cpp
+++ b/samplecode/SampleBitmapRect.cpp
@@ -245,4 +245,3 @@ static SkView* F0() { return new BitmapRectView; }
 static SkView* F1() { return new BitmapRectView2; }
 static SkViewRegister gR0(F0);
 static SkViewRegister gR1(F1);
-
diff --git a/samplecode/SampleBlur.cpp b/samplecode/SampleBlur.cpp
index 1444949b97..4a743cc03a 100644
--- a/samplecode/SampleBlur.cpp
+++ b/samplecode/SampleBlur.cpp
@@ -138,4 +138,3 @@ private:
 
 static SkView* MyFactory() { return new BlurView; }
 static SkViewRegister reg(MyFactory);
-
diff --git a/samplecode/SampleBox.cpp b/samplecode/SampleBox.cpp
index 19ff6ca671..8aec99265a 100644
--- a/samplecode/SampleBox.cpp
+++ b/samplecode/SampleBox.cpp
@@ -53,4 +53,3 @@ private:
 
 static SkView* MyFactory() { return new SimpleView; }
 static SkViewRegister reg(MyFactory);
-
diff --git a/samplecode/SampleCamera.cpp b/samplecode/SampleCamera.cpp
index 12e7e04589..e864528449 100644
--- a/samplecode/SampleCamera.cpp
+++ b/samplecode/SampleCamera.cpp
@@ -103,4 +103,3 @@ private:
 
 static SkView* MyFactory() { return new CameraView; }
 static SkViewRegister reg(MyFactory);
-
diff --git a/samplecode/SampleCircle.cpp b/samplecode/SampleCircle.cpp
index 1444e1be7c..aca74603d3 100644
--- a/samplecode/SampleCircle.cpp
+++ b/samplecode/SampleCircle.cpp
@@ -133,4 +133,3 @@ const SkScalar CircleView::ANIM_RAD(SK_Scalar1 / 19);
 
 static SkView* MyFactory() { return new CircleView; }
 static SkViewRegister reg(MyFactory);
-
diff --git a/samplecode/SampleClamp.cpp b/samplecode/SampleClamp.cpp
index c521f81c9b..2368ab2051 100644
--- a/samplecode/SampleClamp.cpp
+++ b/samplecode/SampleClamp.cpp
@@ -65,4 +65,3 @@ private:
 
 static SkView* MyFactory() { return new ClampView; }
 static SkViewRegister reg(MyFactory);
-
diff --git a/samplecode/SampleClip.cpp b/samplecode/SampleClip.cpp
index ce3736ef98..3a38724e9c 100644
--- a/samplecode/SampleClip.cpp
+++ b/samplecode/SampleClip.cpp
@@ -162,4 +162,3 @@ private:
 
 static SkView* MyFactory() { return new ClipView; }
 static SkViewRegister reg(MyFactory);
-
diff --git a/samplecode/SampleCode.h b/samplecode/SampleCode.h
index b5267870eb..2dacc1fc7d 100644
--- a/samplecode/SampleCode.h
+++ b/samplecode/SampleCode.h
@@ -152,4 +152,3 @@ private:
 };
 
 #endif
-
diff --git a/samplecode/SampleColorFilter.cpp b/samplecode/SampleColorFilter.cpp
index 393f9b8c4f..976f15bff5 100644
--- a/samplecode/SampleColorFilter.cpp
+++ b/samplecode/SampleColorFilter.cpp
@@ -219,4 +219,3 @@ private:
 
 static SkView* MyFactory() { return new ColorFilterView; }
 static SkViewRegister reg(MyFactory);
-
diff --git a/samplecode/SampleComplexClip.cpp b/samplecode/SampleComplexClip.cpp
index ff343dd4ad..30f94f7b48 100644
--- a/samplecode/SampleComplexClip.cpp
+++ b/samplecode/SampleComplexClip.cpp
@@ -151,4 +151,3 @@ private:
 
 static SkView* MyFactory() { return new ComplexClipView; }
 static SkViewRegister reg(MyFactory);
-
diff --git a/samplecode/SampleConcavePaths.cpp b/samplecode/SampleConcavePaths.cpp
index 4677dbc924..2fc01076d2 100644
--- a/samplecode/SampleConcavePaths.cpp
+++ b/samplecode/SampleConcavePaths.cpp
@@ -151,4 +151,3 @@ private:
 
 static SkView* MyFactory() { return new ConcavePathView; }
 static SkViewRegister reg(MyFactory);
-
diff --git a/samplecode/SampleCull.cpp b/samplecode/SampleCull.cpp
index 18d9bdcaa0..18f2d0cc40 100644
--- a/samplecode/SampleCull.cpp
+++ b/samplecode/SampleCull.cpp
@@ -193,4 +193,3 @@ private:
 
 static SkView* MyFactory() { return new CullView; }
 static SkViewRegister reg(MyFactory);
-
diff --git a/samplecode/SampleDash.cpp b/samplecode/SampleDash.cpp
index 2c16e54ada..20e28969c8 100644
--- a/samplecode/SampleDash.cpp
+++ b/samplecode/SampleDash.cpp
@@ -92,4 +92,3 @@ private:
 
 static SkView* MyFactory() { return new DashView; }
 static SkViewRegister reg(MyFactory);
-
diff --git a/samplecode/SampleDecode.cpp b/samplecode/SampleDecode.cpp
index 48759c0b9e..e96be6aaaf 100644
--- a/samplecode/SampleDecode.cpp
+++ b/samplecode/SampleDecode.cpp
@@ -74,4 +74,3 @@ private:
 
 static SkView* MyFactory() { return new DecodeView; }
 static SkViewRegister reg(MyFactory);
-
diff --git a/samplecode/SampleDither.cpp b/samplecode/SampleDither.cpp
index 259bc94627..2468df7693 100644
--- a/samplecode/SampleDither.cpp
+++ b/samplecode/SampleDither.cpp
@@ -182,4 +182,3 @@ private:
 
 static SkView* MyFactory() { return new DitherView; }
 static SkViewRegister reg(MyFactory);
-
diff --git a/samplecode/SampleDitherBitmap.cpp b/samplecode/SampleDitherBitmap.cpp
index b84d0dde78..df727c4203 100644
--- a/samplecode/SampleDitherBitmap.cpp
+++ b/samplecode/SampleDitherBitmap.cpp
@@ -145,4 +145,3 @@ private:
 
 static SkView* MyFactory() { return new DitherBitmapView; }
 static SkViewRegister reg(MyFactory);
-
diff --git a/samplecode/SampleDraw.cpp b/samplecode/SampleDraw.cpp
index e1f62fe07b..616650f9ef 100644
--- a/samplecode/SampleDraw.cpp
+++ b/samplecode/SampleDraw.cpp
@@ -377,4 +377,3 @@ private:
 
 static SkView* MyFactory() { return new DrawView; }
 static SkViewRegister reg(MyFactory);
-
diff --git a/samplecode/SampleEmboss.cpp b/samplecode/SampleEmboss.cpp
index 41c7455595..faf70270a0 100644
--- a/samplecode/SampleEmboss.cpp
+++ b/samplecode/SampleEmboss.cpp
@@ -70,4 +70,3 @@ private:
 
 static SkView* MyFactory() { return new EmbossView; }
 static SkViewRegister reg(MyFactory);
-
diff --git a/samplecode/SampleEmptyPath.cpp b/samplecode/SampleEmptyPath.cpp
index 49ad7c5226..51c570eb43 100644
--- a/samplecode/SampleEmptyPath.cpp
+++ b/samplecode/SampleEmptyPath.cpp
@@ -127,4 +127,3 @@ private:
 
 static SkView* MyFactory() { return new EmptyPathView; }
 static SkViewRegister reg(MyFactory);
-
diff --git a/samplecode/SampleEncode.cpp b/samplecode/SampleEncode.cpp
index 003c47a6ed..594c2a1644 100644
--- a/samplecode/SampleEncode.cpp
+++ b/samplecode/SampleEncode.cpp
@@ -229,4 +229,3 @@ private:
 
 static SkView* MyFactory() { return new EncodeView; }
 static SkViewRegister reg(MyFactory);
-
diff --git a/samplecode/SampleFatBits.cpp b/samplecode/SampleFatBits.cpp
index 29fd8651a7..44d7abe8dd 100644
--- a/samplecode/SampleFatBits.cpp
+++ b/samplecode/SampleFatBits.cpp
@@ -456,4 +456,3 @@ private:
 
 static SkView* MyFactory() { return new DrawLineView; }
 static SkViewRegister reg(MyFactory);
-
diff --git a/samplecode/SampleFillType.cpp b/samplecode/SampleFillType.cpp
index b291834ff7..aac6aed2e0 100644
--- a/samplecode/SampleFillType.cpp
+++ b/samplecode/SampleFillType.cpp
@@ -94,4 +94,3 @@ private:
 
 static SkView* MyFactory() { return new FillTypeView; }
 static SkViewRegister reg(MyFactory);
-
diff --git a/samplecode/SampleFilter.cpp b/samplecode/SampleFilter.cpp
index 75eb7d7ea4..3eb9cdc92c 100644
--- a/samplecode/SampleFilter.cpp
+++ b/samplecode/SampleFilter.cpp
@@ -142,4 +142,3 @@ private:
 
 static SkView* MyFactory() { return new FilterView; }
 static SkViewRegister reg(MyFactory);
-
diff --git a/samplecode/SampleFilter2.cpp b/samplecode/SampleFilter2.cpp
index 8582447357..f3a8b469ab 100644
--- a/samplecode/SampleFilter2.cpp
+++ b/samplecode/SampleFilter2.cpp
@@ -120,4 +120,3 @@ private:
 
 static SkView* MyFactory() { return new Filter2View; }
 static SkViewRegister reg(MyFactory);
-
diff --git a/samplecode/SampleFontCache.cpp b/samplecode/SampleFontCache.cpp
index d5c2add4d4..c5f4457729 100644
--- a/samplecode/SampleFontCache.cpp
+++ b/samplecode/SampleFontCache.cpp
@@ -139,4 +139,3 @@ private:
 
 static SkView* MyFactory() { return new FontCacheView; }
 static SkViewRegister reg(MyFactory);
-
diff --git a/samplecode/SampleFontScalerTest.cpp b/samplecode/SampleFontScalerTest.cpp
index 8494e7556e..a01de03556 100644
--- a/samplecode/SampleFontScalerTest.cpp
+++ b/samplecode/SampleFontScalerTest.cpp
@@ -138,4 +138,3 @@ private:
 
 static SkView* MyFactory() { return new FontScalerTestView; }
 static SkViewRegister reg(MyFactory);
-
diff --git a/samplecode/SampleFuzz.cpp b/samplecode/SampleFuzz.cpp
index c082c4d52b..a5d891772e 100644
--- a/samplecode/SampleFuzz.cpp
+++ b/samplecode/SampleFuzz.cpp
@@ -379,4 +379,3 @@ private:
 
 static SkView* MyFactory() { return new FuzzView; }
 static SkViewRegister reg(MyFactory);
-
diff --git a/samplecode/SampleGradients.cpp b/samplecode/SampleGradients.cpp
index f1a2dd9d8f..fead71473f 100644
--- a/samplecode/SampleGradients.cpp
+++ b/samplecode/SampleGradients.cpp
@@ -182,4 +182,3 @@ private:
 
 static SkView* MyFactory() { return new GradientsView; }
 static SkViewRegister reg(MyFactory);
-
diff --git a/samplecode/SampleHairCurves.cpp b/samplecode/SampleHairCurves.cpp
index 2bb2fa23fd..d121cf043c 100644
--- a/samplecode/SampleHairCurves.cpp
+++ b/samplecode/SampleHairCurves.cpp
@@ -109,4 +109,3 @@ private:
 
 static SkView* MyFactory() { return new HairCurvesView; }
 static SkViewRegister reg(MyFactory);
-
diff --git a/samplecode/SampleHairModes.cpp b/samplecode/SampleHairModes.cpp
index 59cb25ce38..4168ffd6b4 100644
--- a/samplecode/SampleHairModes.cpp
+++ b/samplecode/SampleHairModes.cpp
@@ -135,4 +135,3 @@ private:
 
 static SkView* MyFactory() { return new HairModesView; }
 static SkViewRegister reg(MyFactory);
-
diff --git a/samplecode/SampleHairline.cpp b/samplecode/SampleHairline.cpp
index 1b16504ed3..fb42e2c166 100644
--- a/samplecode/SampleHairline.cpp
+++ b/samplecode/SampleHairline.cpp
@@ -277,4 +277,3 @@ private:
 
 static SkView* MyFactory() { return new HairlineView; }
 static SkViewRegister reg(MyFactory);
-
diff --git a/samplecode/SampleLCD.cpp b/samplecode/SampleLCD.cpp
index 7136448c8c..130a28c5e5 100644
--- a/samplecode/SampleLCD.cpp
+++ b/samplecode/SampleLCD.cpp
@@ -65,4 +65,3 @@ private:
 
 static SkView* MyFactory() { return new LCDView; }
 static SkViewRegister reg(MyFactory);
-
diff --git a/samplecode/SampleLayerMask.cpp b/samplecode/SampleLayerMask.cpp
index d65c131897..2e70833e0b 100644
--- a/samplecode/SampleLayerMask.cpp
+++ b/samplecode/SampleLayerMask.cpp
@@ -72,4 +72,3 @@ private:
 
 static SkView* MyFactory() { return new LayerMaskView; }
 static SkViewRegister reg(MyFactory);
-
diff --git a/samplecode/SampleLayers.cpp b/samplecode/SampleLayers.cpp
index 03aa9fc8c5..b1311ee576 100644
--- a/samplecode/SampleLayers.cpp
+++ b/samplecode/SampleLayers.cpp
@@ -273,4 +273,3 @@ private:
 
 static SkView* MyFactory() { return new LayersView; }
 static SkViewRegister reg(MyFactory);
-
diff --git a/samplecode/SampleLines.cpp b/samplecode/SampleLines.cpp
index 57d70509c7..a9d070ff5e 100644
--- a/samplecode/SampleLines.cpp
+++ b/samplecode/SampleLines.cpp
@@ -113,4 +113,3 @@ private:
 
 static SkView* MyFactory() { return new LinesView; }
 static SkViewRegister reg(MyFactory);
-
diff --git a/samplecode/SampleMeasure.cpp b/samplecode/SampleMeasure.cpp
index 18b3720997..257f7d99e0 100644
--- a/samplecode/SampleMeasure.cpp
+++ b/samplecode/SampleMeasure.cpp
@@ -119,4 +119,3 @@ private:
 
 static SkView* MyFactory() { return new MeasureView; }
 static SkViewRegister reg(MyFactory);
-
diff --git a/samplecode/SampleMipMap.cpp b/samplecode/SampleMipMap.cpp
index f3a12cd5ae..e93636d472 100644
--- a/samplecode/SampleMipMap.cpp
+++ b/samplecode/SampleMipMap.cpp
@@ -158,4 +158,3 @@ private:
 
 static SkView* MyFactory() { return new MipMapView; }
 static SkViewRegister reg(MyFactory);
-
diff --git a/samplecode/SampleMovie.cpp b/samplecode/SampleMovie.cpp
index c85976b5ce..560151cb44 100644
--- a/samplecode/SampleMovie.cpp
+++ b/samplecode/SampleMovie.cpp
@@ -65,4 +65,3 @@ private:
 
 static SkView* MyFactory() { return new AnimGifView; }
 static SkViewRegister reg(MyFactory);
-
diff --git a/samplecode/SampleOvalTest.cpp b/samplecode/SampleOvalTest.cpp
index 88b7d5fa0b..5acf568e7b 100644
--- a/samplecode/SampleOvalTest.cpp
+++ b/samplecode/SampleOvalTest.cpp
@@ -114,4 +114,3 @@ private:
 
 static SkView* MyFactory() { return new OvalTestView; }
 static SkViewRegister reg(MyFactory);
-
diff --git a/samplecode/SampleOverflow.cpp b/samplecode/SampleOverflow.cpp
index 3cf30ad9df..35adbf3509 100644
--- a/samplecode/SampleOverflow.cpp
+++ b/samplecode/SampleOverflow.cpp
@@ -106,4 +106,3 @@ private:
 
 static SkView* MyFactory() { return new OverflowView; }
 static SkViewRegister reg(MyFactory);
-
diff --git a/samplecode/SamplePatch.cpp b/samplecode/SamplePatch.cpp
index c656d7dcc8..3da4b0c20e 100644
--- a/samplecode/SamplePatch.cpp
+++ b/samplecode/SamplePatch.cpp
@@ -334,4 +334,3 @@ private:
 
 static SkView* MyFactory() { return new PatchView; }
 static SkViewRegister reg(MyFactory);
-
diff --git a/samplecode/SamplePath.cpp b/samplecode/SamplePath.cpp
index 80e307b471..fa6ad43464 100644
--- a/samplecode/SamplePath.cpp
+++ b/samplecode/SamplePath.cpp
@@ -216,4 +216,3 @@ private:
 
 static SkView* MyFactory() { return new PathView; }
 static SkViewRegister reg(MyFactory);
-
diff --git a/samplecode/SamplePathClip.cpp b/samplecode/SamplePathClip.cpp
index b999c39e55..b7583ab2f7 100644
--- a/samplecode/SamplePathClip.cpp
+++ b/samplecode/SamplePathClip.cpp
@@ -88,4 +88,3 @@ private:
 
 static SkView* MyFactory() { return new PathClipView; }
 static SkViewRegister reg(MyFactory);
-
diff --git a/samplecode/SamplePathEffects.cpp b/samplecode/SamplePathEffects.cpp
index 35d3260dba..ac77f210de 100644
--- a/samplecode/SamplePathEffects.cpp
+++ b/samplecode/SamplePathEffects.cpp
@@ -188,4 +188,3 @@ private:
 
 static SkView* MyFactory() { return new PathEffectView; }
 static SkViewRegister reg(MyFactory);
-
diff --git a/samplecode/SamplePathFill.cpp b/samplecode/SamplePathFill.cpp
index 9c7cdc6df4..1a79d7ffe9 100644
--- a/samplecode/SamplePathFill.cpp
+++ b/samplecode/SamplePathFill.cpp
@@ -144,4 +144,3 @@ private:
 
 static SkView* MyFactory() { return new PathFillView; }
 static SkViewRegister reg(MyFactory);
-
diff --git a/samplecode/SamplePictFile.cpp b/samplecode/SamplePictFile.cpp
index b53ba83600..65279cb7a5 100644
--- a/samplecode/SamplePictFile.cpp
+++ b/samplecode/SamplePictFile.cpp
@@ -139,4 +139,3 @@ SampleView* CreateSamplePictFileView(const char filename[]) {
 static SkView* MyFactory() { return new PictFileView; }
 static SkViewRegister reg(MyFactory);
 #endif
-
diff --git a/samplecode/SamplePicture.cpp b/samplecode/SamplePicture.cpp
index 7134a1f2fc..eaec829843 100644
--- a/samplecode/SamplePicture.cpp
+++ b/samplecode/SamplePicture.cpp
@@ -196,4 +196,3 @@ private:
 
 static SkView* MyFactory() { return new PictureView; }
 static SkViewRegister reg(MyFactory);
-
diff --git a/samplecode/SamplePoints.cpp b/samplecode/SamplePoints.cpp
index 705a7b14c3..ac2f625f99 100644
--- a/samplecode/SamplePoints.cpp
+++ b/samplecode/SamplePoints.cpp
@@ -82,4 +82,3 @@ private:
 
 static SkView* MyFactory() { return new PointsView; }
 static SkViewRegister reg(MyFactory);
-
diff --git a/samplecode/SamplePolyToPoly.cpp b/samplecode/SamplePolyToPoly.cpp
index 88adae9d97..93a535186e 100644
--- a/samplecode/SamplePolyToPoly.cpp
+++ b/samplecode/SamplePolyToPoly.cpp
@@ -167,4 +167,3 @@ private:
 
 static SkView* MyFactory() { return new PolyToPolyView; }
 static SkViewRegister reg(MyFactory);
-
diff --git a/samplecode/SampleRegion.cpp b/samplecode/SampleRegion.cpp
index b493ee4b60..cb860fcfb1 100644
--- a/samplecode/SampleRegion.cpp
+++ b/samplecode/SampleRegion.cpp
@@ -415,4 +415,3 @@ private:
 
 static SkView* MyFactory() { return new RegionView; }
 static SkViewRegister reg(MyFactory);
-
diff --git a/samplecode/SampleRepeatTile.cpp b/samplecode/SampleRepeatTile.cpp
index 357ab6300b..c97c228ed7 100644
--- a/samplecode/SampleRepeatTile.cpp
+++ b/samplecode/SampleRepeatTile.cpp
@@ -90,4 +90,3 @@ private:
 
 static SkView* MyFactory() { return new RepeatTileView; }
 static SkViewRegister reg(MyFactory);
-
diff --git a/samplecode/SampleRotateCircles.cpp b/samplecode/SampleRotateCircles.cpp
index d16d07f72c..1f586be4fe 100644
--- a/samplecode/SampleRotateCircles.cpp
+++ b/samplecode/SampleRotateCircles.cpp
@@ -359,4 +359,3 @@ static SkView* F1() { return new TestCirclesView; }
 static SkViewRegister gR1(F1);
 static SkView* F2() { return new TestStrokeView; }
 static SkViewRegister gR2(F2);
-
diff --git a/samplecode/SampleShaderText.cpp b/samplecode/SampleShaderText.cpp
index a83b09995b..603d67e384 100644
--- a/samplecode/SampleShaderText.cpp
+++ b/samplecode/SampleShaderText.cpp
@@ -213,4 +213,3 @@ private:
 
 static SkView* MyFactory() { return new ShaderTextView; }
 static SkViewRegister reg(MyFactory);
-
diff --git a/samplecode/SampleShaders.cpp b/samplecode/SampleShaders.cpp
index 5c28fd5701..253388dbd8 100644
--- a/samplecode/SampleShaders.cpp
+++ b/samplecode/SampleShaders.cpp
@@ -139,4 +139,3 @@ private:
 
 static SkView* MyFactory() { return new ShaderView; }
 static SkViewRegister reg(MyFactory);
-
diff --git a/samplecode/SampleSkLayer.cpp b/samplecode/SampleSkLayer.cpp
index 7d7451f62a..8d30ff6466 100644
--- a/samplecode/SampleSkLayer.cpp
+++ b/samplecode/SampleSkLayer.cpp
@@ -243,4 +243,3 @@ private:
 
 static SkView* MyFactory() { return new SkLayerView; }
 static SkViewRegister reg(MyFactory);
-
diff --git a/samplecode/SampleSlides.cpp b/samplecode/SampleSlides.cpp
index b200473708..0766d17653 100644
--- a/samplecode/SampleSlides.cpp
+++ b/samplecode/SampleSlides.cpp
@@ -732,4 +732,3 @@ private:
 
 static SkView* MyFactory() { return new SlideView; }
 static SkViewRegister reg(MyFactory);
-
diff --git a/samplecode/SampleSpiral.cpp b/samplecode/SampleSpiral.cpp
index be6e728a15..5eda3c61ec 100644
--- a/samplecode/SampleSpiral.cpp
+++ b/samplecode/SampleSpiral.cpp
@@ -61,4 +61,3 @@ private:
 
 static SkView* MyFactory() { return new SpiralView; }
 static SkViewRegister reg(MyFactory);
-
diff --git a/samplecode/SampleStrokePath.cpp b/samplecode/SampleStrokePath.cpp
index 3bc0a127a3..d289cc63fd 100644
--- a/samplecode/SampleStrokePath.cpp
+++ b/samplecode/SampleStrokePath.cpp
@@ -222,4 +222,3 @@ private:
 
 static SkView* MyFactory() { return new StrokePathView; }
 static SkViewRegister reg(MyFactory);
-
diff --git a/samplecode/SampleStrokeRect.cpp b/samplecode/SampleStrokeRect.cpp
index edf922805f..59e0a46cc2 100644
--- a/samplecode/SampleStrokeRect.cpp
+++ b/samplecode/SampleStrokeRect.cpp
@@ -73,4 +73,3 @@ private:
 
 static SkView* MyFactory() { return new StrokeRectSample; }
 static SkViewRegister reg(MyFactory);
-
diff --git a/samplecode/SampleStrokeText.cpp b/samplecode/SampleStrokeText.cpp
index 4ceb0d5548..4e9fe0d59f 100644
--- a/samplecode/SampleStrokeText.cpp
+++ b/samplecode/SampleStrokeText.cpp
@@ -146,4 +146,3 @@ private:
 
 static SkView* MyFactory() { return new StrokeTextView; }
 static SkViewRegister reg(MyFactory);
-
diff --git a/samplecode/SampleTests.cpp b/samplecode/SampleTests.cpp
index ea317e1bd1..d0fab416b7 100644
--- a/samplecode/SampleTests.cpp
+++ b/samplecode/SampleTests.cpp
@@ -115,4 +115,3 @@ private:
 
 static SkView* MyFactory() { return new TestsView; }
 static SkViewRegister reg(MyFactory);
-
diff --git a/samplecode/SampleText.cpp b/samplecode/SampleText.cpp
index b71d844a95..ee447d3066 100644
--- a/samplecode/SampleText.cpp
+++ b/samplecode/SampleText.cpp
@@ -336,4 +336,3 @@ private:
 
 static SkView* MyFactory() { return new TextSpeedView; }
 static SkViewRegister reg(MyFactory);
-
diff --git a/samplecode/SampleTextAlpha.cpp b/samplecode/SampleTextAlpha.cpp
index ac24f08354..8a248c39e4 100644
--- a/samplecode/SampleTextAlpha.cpp
+++ b/samplecode/SampleTextAlpha.cpp
@@ -120,4 +120,3 @@ private:
 
 static SkView* MyFactory() { return new TextAlphaView; }
 static SkViewRegister reg(MyFactory);
-
diff --git a/samplecode/SampleTextBox.cpp b/samplecode/SampleTextBox.cpp
index a021dbd6fb..61a18e2e3f 100644
--- a/samplecode/SampleTextBox.cpp
+++ b/samplecode/SampleTextBox.cpp
@@ -113,4 +113,3 @@ private:
 
 static SkView* MyFactory() { return new TextBoxView; }
 static SkViewRegister reg(MyFactory);
-
diff --git a/samplecode/SampleTextureDomain.cpp b/samplecode/SampleTextureDomain.cpp
index 70149d2191..de84c35ea4 100644
--- a/samplecode/SampleTextureDomain.cpp
+++ b/samplecode/SampleTextureDomain.cpp
@@ -111,4 +111,3 @@ private:
 
 static SkView* MyFactory() { return new TextureDomainView; }
 static SkViewRegister reg(MyFactory);
-
diff --git a/samplecode/SampleTiling.cpp b/samplecode/SampleTiling.cpp
index 59e88ea9a2..5c2a352f1a 100644
--- a/samplecode/SampleTiling.cpp
+++ b/samplecode/SampleTiling.cpp
@@ -171,4 +171,3 @@ private:
 
 static SkView* MyFactory() { return new TilingView; }
 static SkViewRegister reg(MyFactory);
-
diff --git a/samplecode/SampleTinyBitmap.cpp b/samplecode/SampleTinyBitmap.cpp
index d68231778e..16cbce4adc 100644
--- a/samplecode/SampleTinyBitmap.cpp
+++ b/samplecode/SampleTinyBitmap.cpp
@@ -80,4 +80,3 @@ private:
 
 static SkView* MyFactory() { return new TinyBitmapView; }
 static SkViewRegister reg(MyFactory);
-
diff --git a/samplecode/SampleTypeface.cpp b/samplecode/SampleTypeface.cpp
index 9bc8762aa6..ad1a16fd91 100644
--- a/samplecode/SampleTypeface.cpp
+++ b/samplecode/SampleTypeface.cpp
@@ -132,4 +132,3 @@ private:
 
 static SkView* MyFactory() { return new TypefaceView; }
 static SkViewRegister reg(MyFactory);
-
diff --git a/samplecode/SampleUnitMapper.cpp b/samplecode/SampleUnitMapper.cpp
index 8cc9afb9e8..c9a8f9f29a 100644
--- a/samplecode/SampleUnitMapper.cpp
+++ b/samplecode/SampleUnitMapper.cpp
@@ -170,4 +170,3 @@ private:
 
 static SkView* MyFactory() { return new UnitMapperView; }
 static SkViewRegister reg(MyFactory);
-
diff --git a/samplecode/SampleVertices.cpp b/samplecode/SampleVertices.cpp
index bc02256359..152cb13326 100644
--- a/samplecode/SampleVertices.cpp
+++ b/samplecode/SampleVertices.cpp
@@ -231,4 +231,3 @@ private:
 
 static SkView* MyFactory() { return new VerticesView; }
 static SkViewRegister reg(MyFactory);
-
diff --git a/samplecode/SampleWarp.cpp b/samplecode/SampleWarp.cpp
index 323df80dec..e9455a6c39 100644
--- a/samplecode/SampleWarp.cpp
+++ b/samplecode/SampleWarp.cpp
@@ -471,4 +471,3 @@ private:
 
 static SkView* MyFactory() { return new WarpView; }
 static SkViewRegister reg(MyFactory);
-
diff --git a/samplecode/SampleWritePixels.cpp b/samplecode/SampleWritePixels.cpp
index f9df8f5787..04f34840e1 100644
--- a/samplecode/SampleWritePixels.cpp
+++ b/samplecode/SampleWritePixels.cpp
@@ -67,4 +67,3 @@ private:
 
 static SkView* MyFactory() { return new WritePixelsView; }
 static SkViewRegister reg(MyFactory);
-
diff --git a/src/animator/SkAnimate.h b/src/animator/SkAnimate.h
index b7018b9587..1bbecf90cf 100644
--- a/src/animator/SkAnimate.h
+++ b/src/animator/SkAnimate.h
@@ -32,4 +32,3 @@ private:
 };
 
 #endif // SkAnimateField_DEFINED
-
diff --git a/src/animator/SkAnimateActive.cpp b/src/animator/SkAnimateActive.cpp
index 32dd1fb1ad..46b849b519 100644
--- a/src/animator/SkAnimateActive.cpp
+++ b/src/animator/SkAnimateActive.cpp
@@ -502,5 +502,3 @@ SkMSec SkActive::SkState::getRelativeTime(SkMSec time) {
     }
     return result;
 }
-
-
diff --git a/src/animator/SkAnimateBase.cpp b/src/animator/SkAnimateBase.cpp
index 0e56faaf1e..3d50144abc 100644
--- a/src/animator/SkAnimateBase.cpp
+++ b/src/animator/SkAnimateBase.cpp
@@ -231,5 +231,3 @@ void SkAnimateBase::setTarget(SkAnimateMaker& maker) {
 bool SkAnimateBase::targetNeedsInitialization() const {
     return false;
 }
-
-
diff --git a/src/animator/SkAnimateField.cpp b/src/animator/SkAnimateField.cpp
index 43f510e444..0f92989dcc 100644
--- a/src/animator/SkAnimateField.cpp
+++ b/src/animator/SkAnimateField.cpp
@@ -109,4 +109,3 @@ void SkAnimate::onEndElement(SkAnimateMaker& maker) {
     fFieldInfo->setValue(maker, &fValues, fFieldOffset, max, this, outType, from);
     fFieldInfo->setValue(maker, &fValues, fComponents + fFieldOffset, max, this, outType, to);
 }
-
diff --git a/src/animator/SkAnimateMaker.h b/src/animator/SkAnimateMaker.h
index 53a5521aa2..a5abff7355 100644
--- a/src/animator/SkAnimateMaker.h
+++ b/src/animator/SkAnimateMaker.h
@@ -158,4 +158,3 @@ private:
 };
 
 #endif // SkAnimateMaker_DEFINED
-
diff --git a/src/animator/SkAnimateSet.h b/src/animator/SkAnimateSet.h
index c735a08463..b8f7bf54f6 100644
--- a/src/animator/SkAnimateSet.h
+++ b/src/animator/SkAnimateSet.h
@@ -25,4 +25,3 @@ private:
 };
 
 #endif // SkAnimateSet_DEFINED
-
diff --git a/src/animator/SkAnimator.cpp b/src/animator/SkAnimator.cpp
index 5d1f220a87..09fccd925d 100644
--- a/src/animator/SkAnimator.cpp
+++ b/src/animator/SkAnimator.cpp
@@ -700,6 +700,3 @@ void SkAnimator::Init(bool runUnitTests) {
 
 void SkAnimator::Term() {
 }
-
-
-
diff --git a/src/animator/SkAnimatorScript.cpp b/src/animator/SkAnimatorScript.cpp
index 899cd3c70f..67c53c7654 100644
--- a/src/animator/SkAnimatorScript.cpp
+++ b/src/animator/SkAnimatorScript.cpp
@@ -592,5 +592,3 @@ void SkAnimatorScript::UnitTest() {
 }
 
 #endif
-
-
diff --git a/src/animator/SkAnimatorScript.h b/src/animator/SkAnimatorScript.h
index c8802a35e7..8589388e11 100644
--- a/src/animator/SkAnimatorScript.h
+++ b/src/animator/SkAnimatorScript.h
@@ -73,4 +73,3 @@ public:
 };
 
 #endif // SkAnimatorScript_DEFINED
-
diff --git a/src/animator/SkAnimatorScript2.cpp b/src/animator/SkAnimatorScript2.cpp
index 45ce3cee58..80ae0c6aa8 100644
--- a/src/animator/SkAnimatorScript2.cpp
+++ b/src/animator/SkAnimatorScript2.cpp
@@ -620,4 +620,3 @@ void SkAnimatorScript2::UnitTest() {
 }
 
 #endif
-
diff --git a/src/animator/SkBoundable.cpp b/src/animator/SkBoundable.cpp
index 7f36218f5c..64a70057b9 100644
--- a/src/animator/SkBoundable.cpp
+++ b/src/animator/SkBoundable.cpp
@@ -53,4 +53,3 @@ SkBoundableAuto::~SkBoundableAuto() {
     fMaker.fCanvas->setBounder(NULL);
     fBoundable->setBounds(fMaker.fDisplayList.fBounds);
 }
-
diff --git a/src/animator/SkBoundable.h b/src/animator/SkBoundable.h
index 1e70505862..daeda23c7a 100644
--- a/src/animator/SkBoundable.h
+++ b/src/animator/SkBoundable.h
@@ -39,4 +39,3 @@ private:
 };
 
 #endif // SkBoundable_DEFINED
-
diff --git a/src/animator/SkBuildCondensedInfo.cpp b/src/animator/SkBuildCondensedInfo.cpp
index 8fb82c7414..411be904fe 100644
--- a/src/animator/SkBuildCondensedInfo.cpp
+++ b/src/animator/SkBuildCondensedInfo.cpp
@@ -280,5 +280,3 @@ void SkDisplayType::BuildCondensedInfo(SkAnimateMaker* maker) {
 #include "SkDisplayType.h"
 void SkDisplayType::BuildCondensedInfo(SkAnimateMaker* ) {}
 #endif
-
-
diff --git a/src/animator/SkCondensedDebug.cpp b/src/animator/SkCondensedDebug.cpp
index 08764b6649..dcebe00469 100644
--- a/src/animator/SkCondensedDebug.cpp
+++ b/src/animator/SkCondensedDebug.cpp
@@ -1385,5 +1385,3 @@ static const char* const gInfoNames[] = {
 
 #endif
 #endif
-
-
diff --git a/src/animator/SkCondensedRelease.cpp b/src/animator/SkCondensedRelease.cpp
index 60fa991edf..1222496051 100644
--- a/src/animator/SkCondensedRelease.cpp
+++ b/src/animator/SkCondensedRelease.cpp
@@ -1363,4 +1363,3 @@ static const char* const gInfoNames[] = {
 };
 #endif
 #endif
-
diff --git a/src/animator/SkDisplayAdd.cpp b/src/animator/SkDisplayAdd.cpp
index 7fd5026584..2cb5e97948 100644
--- a/src/animator/SkDisplayAdd.cpp
+++ b/src/animator/SkDisplayAdd.cpp
@@ -243,4 +243,3 @@ const SkMemberInfo SkReplace::fInfo[] = {
 #endif
 
 DEFINE_GET_MEMBER(SkReplace);
-
diff --git a/src/animator/SkDisplayAdd.h b/src/animator/SkDisplayAdd.h
index 58839630a1..d16492b063 100644
--- a/src/animator/SkDisplayAdd.h
+++ b/src/animator/SkDisplayAdd.h
@@ -69,5 +69,3 @@ private:
 };
 
 #endif // SkDisplayAdd_DEFINED
-
-
diff --git a/src/animator/SkDisplayApply.cpp b/src/animator/SkDisplayApply.cpp
index 179641a22f..8b4dfdce75 100644
--- a/src/animator/SkDisplayApply.cpp
+++ b/src/animator/SkDisplayApply.cpp
@@ -802,6 +802,3 @@ void SkApply::validate() {
         fActive->validate();
 }
 #endif
-
-
-
diff --git a/src/animator/SkDisplayApply.h b/src/animator/SkDisplayApply.h
index 3a066a4397..e128c2929d 100644
--- a/src/animator/SkDisplayApply.h
+++ b/src/animator/SkDisplayApply.h
@@ -104,5 +104,3 @@ private:
 };
 
 #endif // SkDisplayApply_DEFINED
-
-
diff --git a/src/animator/SkDisplayBounds.cpp b/src/animator/SkDisplayBounds.cpp
index 4c89481b99..49ec9b96a2 100644
--- a/src/animator/SkDisplayBounds.cpp
+++ b/src/animator/SkDisplayBounds.cpp
@@ -41,6 +41,3 @@ bool SkDisplayBounds::draw(SkAnimateMaker& maker) {
     }
     return result;
 }
-
-
-
diff --git a/src/animator/SkDisplayBounds.h b/src/animator/SkDisplayBounds.h
index bc3a987696..0511ed7439 100644
--- a/src/animator/SkDisplayBounds.h
+++ b/src/animator/SkDisplayBounds.h
@@ -22,4 +22,3 @@ private:
 };
 
 #endif // SkDisplayBounds_DEFINED
-
diff --git a/src/animator/SkDisplayEvent.h b/src/animator/SkDisplayEvent.h
index 5701da2ce3..952faeac63 100644
--- a/src/animator/SkDisplayEvent.h
+++ b/src/animator/SkDisplayEvent.h
@@ -64,4 +64,3 @@ private:
 };
 
 #endif // SkDisplayEvent_DEFINED
-
diff --git a/src/animator/SkDisplayEvents.h b/src/animator/SkDisplayEvents.h
index 2874ac579d..276955ba6c 100644
--- a/src/animator/SkDisplayEvents.h
+++ b/src/animator/SkDisplayEvents.h
@@ -40,4 +40,3 @@ private:
 };
 
 #endif // SkDisplayEvents_DEFINED
-
diff --git a/src/animator/SkDisplayInclude.h b/src/animator/SkDisplayInclude.h
index d3fe4da7da..41b5d29740 100644
--- a/src/animator/SkDisplayInclude.h
+++ b/src/animator/SkDisplayInclude.h
@@ -23,4 +23,3 @@ protected:
 };
 
 #endif // SkDisplayInclude_DEFINED
-
diff --git a/src/animator/SkDisplayInput.h b/src/animator/SkDisplayInput.h
index 79d82b5f19..d9871e211e 100644
--- a/src/animator/SkDisplayInput.h
+++ b/src/animator/SkDisplayInput.h
@@ -31,4 +31,3 @@ private:
 };
 
 #endif // SkDisplayInput_DEFINED
-
diff --git a/src/animator/SkDisplayList.cpp b/src/animator/SkDisplayList.cpp
index 39465f195d..6434601f58 100644
--- a/src/animator/SkDisplayList.cpp
+++ b/src/animator/SkDisplayList.cpp
@@ -156,5 +156,3 @@ void SkDisplayList::validate() {
     }
 }
 #endif
-
-
diff --git a/src/animator/SkDisplayList.h b/src/animator/SkDisplayList.h
index af98aeffc1..b8705982e4 100644
--- a/src/animator/SkDisplayList.h
+++ b/src/animator/SkDisplayList.h
@@ -68,4 +68,3 @@ private:
 };
 
 #endif // SkDisplayList_DEFINED
-
diff --git a/src/animator/SkDisplayMath.h b/src/animator/SkDisplayMath.h
index faa929e27d..91537953be 100644
--- a/src/animator/SkDisplayMath.h
+++ b/src/animator/SkDisplayMath.h
@@ -29,4 +29,3 @@ private:
 };
 
 #endif // SkDisplayMath_DEFINED
-
diff --git a/src/animator/SkDisplayMovie.cpp b/src/animator/SkDisplayMovie.cpp
index 33123cb019..f1f82e3201 100644
--- a/src/animator/SkDisplayMovie.cpp
+++ b/src/animator/SkDisplayMovie.cpp
@@ -126,5 +126,3 @@ void SkDisplayMovie::onEndElement(SkAnimateMaker& maker) {
     buildMovie();
     *maker.fMovies.append() = this;
 }
-
-
diff --git a/src/animator/SkDisplayMovie.h b/src/animator/SkDisplayMovie.h
index a599fb6a39..6210602a1f 100644
--- a/src/animator/SkDisplayMovie.h
+++ b/src/animator/SkDisplayMovie.h
@@ -49,4 +49,3 @@ private:
 };
 
 #endif // SkDisplayMovie_DEFINED
-
diff --git a/src/animator/SkDisplayPost.cpp b/src/animator/SkDisplayPost.cpp
index 21cc9a77e7..cc45b216ba 100644
--- a/src/animator/SkDisplayPost.cpp
+++ b/src/animator/SkDisplayPost.cpp
@@ -296,4 +296,3 @@ bool SkPost::setProperty(int index, SkScriptValue& value) {
     }
     return true;
 }
-
diff --git a/src/animator/SkDisplayRandom.cpp b/src/animator/SkDisplayRandom.cpp
index 31a20b5dd6..2efe8dc92c 100644
--- a/src/animator/SkDisplayRandom.cpp
+++ b/src/animator/SkDisplayRandom.cpp
@@ -63,4 +63,3 @@ bool SkDisplayRandom::setProperty(int index, SkScriptValue& value) {
     fRandom.setSeed(value.fOperand.fS32);
     return true;
 }
-
diff --git a/src/animator/SkDisplayRandom.h b/src/animator/SkDisplayRandom.h
index 87956d255e..1c3865333f 100644
--- a/src/animator/SkDisplayRandom.h
+++ b/src/animator/SkDisplayRandom.h
@@ -38,4 +38,3 @@ private:
 };
 
 #endif // SkDisplayRandom_DEFINED
-
diff --git a/src/animator/SkDisplayScreenplay.cpp b/src/animator/SkDisplayScreenplay.cpp
index 463f948e44..2663b43149 100644
--- a/src/animator/SkDisplayScreenplay.cpp
+++ b/src/animator/SkDisplayScreenplay.cpp
@@ -18,5 +18,3 @@ const SkMemberInfo SkDisplayScreenplay::fInfo[] = {
 #endif
 
 DEFINE_GET_MEMBER(SkDisplayScreenplay);
-
-
diff --git a/src/animator/SkDisplayTypes.cpp b/src/animator/SkDisplayTypes.cpp
index d320fc02d5..287ca6e4d4 100644
--- a/src/animator/SkDisplayTypes.cpp
+++ b/src/animator/SkDisplayTypes.cpp
@@ -212,6 +212,3 @@ bool SkDisplayArray::getProperty(int index, SkScriptValue* value) const {
     }
     return true;
 }
-
-
-
diff --git a/src/animator/SkDisplayTypes.h b/src/animator/SkDisplayTypes.h
index 614018f568..1a3d0e5aa7 100644
--- a/src/animator/SkDisplayTypes.h
+++ b/src/animator/SkDisplayTypes.h
@@ -104,4 +104,3 @@ private:
 };
 
 #endif // SkDisplayTypes_DEFINED
-
diff --git a/src/animator/SkDisplayXMLParser.cpp b/src/animator/SkDisplayXMLParser.cpp
index 515d33c71d..3ebf9dc4fe 100644
--- a/src/animator/SkDisplayXMLParser.cpp
+++ b/src/animator/SkDisplayXMLParser.cpp
@@ -314,5 +314,3 @@ rectNext:
         return lastResort;
     return NULL;
 }
-
-
diff --git a/src/animator/SkDisplayXMLParser.h b/src/animator/SkDisplayXMLParser.h
index c18e48f461..9c561eda08 100644
--- a/src/animator/SkDisplayXMLParser.h
+++ b/src/animator/SkDisplayXMLParser.h
@@ -89,5 +89,3 @@ private:
 };
 
 #endif // SkDisplayXMLParser_DEFINED
-
-
diff --git a/src/animator/SkDisplayable.cpp b/src/animator/SkDisplayable.cpp
index ed2c626b7c..aff3aaefc6 100644
--- a/src/animator/SkDisplayable.cpp
+++ b/src/animator/SkDisplayable.cpp
@@ -538,5 +538,3 @@ void SkDisplayable::setReference(const SkMemberInfo* info, SkDisplayable* displa
 void SkDisplayable::validate() {
 }
 #endif
-
-
diff --git a/src/animator/SkDraw3D.cpp b/src/animator/SkDraw3D.cpp
index 6ec178fbd6..9e1c2cc0a6 100644
--- a/src/animator/SkDraw3D.cpp
+++ b/src/animator/SkDraw3D.cpp
@@ -104,6 +104,3 @@ void Sk3D_Patch::executeFunction(SkDisplayable* target, int index,
 const SkFunctionParamType* Sk3D_Patch::getFunctionsParameters() {
     return fFunctionParameters;
 }
-
-
-
diff --git a/src/animator/SkDraw3D.h b/src/animator/SkDraw3D.h
index f4bd82b541..a204044bee 100644
--- a/src/animator/SkDraw3D.h
+++ b/src/animator/SkDraw3D.h
@@ -48,4 +48,3 @@ private:
 };
 
 #endif // SkDraw3D_DEFINED
-
diff --git a/src/animator/SkDrawBlur.cpp b/src/animator/SkDrawBlur.cpp
index 68996bcb70..d66fc5640f 100644
--- a/src/animator/SkDrawBlur.cpp
+++ b/src/animator/SkDrawBlur.cpp
@@ -29,4 +29,3 @@ SkMaskFilter* SkDrawBlur::getMaskFilter() {
         return NULL;
     return SkBlurMaskFilter::Create(radius, (SkBlurMaskFilter::BlurStyle) blurStyle);
 }
-
diff --git a/src/animator/SkDrawBlur.h b/src/animator/SkDrawBlur.h
index 220e211484..24cb4aea4e 100644
--- a/src/animator/SkDrawBlur.h
+++ b/src/animator/SkDrawBlur.h
@@ -23,4 +23,3 @@ protected:
 };
 
 #endif // SkDrawBlur_DEFINED
-
diff --git a/src/animator/SkDrawClip.cpp b/src/animator/SkDrawClip.cpp
index 521bbc561f..e26a1bf410 100644
--- a/src/animator/SkDrawClip.cpp
+++ b/src/animator/SkDrawClip.cpp
@@ -37,4 +37,3 @@ bool SkDrawClip::draw(SkAnimateMaker& maker ) {
     }
     return false;
 }
-
diff --git a/src/animator/SkDrawColor.cpp b/src/animator/SkDrawColor.cpp
index dfe06227ab..af0f04b910 100644
--- a/src/animator/SkDrawColor.cpp
+++ b/src/animator/SkDrawColor.cpp
@@ -267,4 +267,3 @@ bool SkDrawColor::setProperty(int index, SkScriptValue& value) {
     }
     return true;
 }
-
diff --git a/src/animator/SkDrawDash.cpp b/src/animator/SkDrawDash.cpp
index 0d932937fa..8e73aa1c2d 100644
--- a/src/animator/SkDrawDash.cpp
+++ b/src/animator/SkDrawDash.cpp
@@ -33,4 +33,3 @@ SkPathEffect* SkDash::getPathEffect() {
         return NULL;
     return new SkDashPathEffect(intervals.begin(), count, phase);
 }
-
diff --git a/src/animator/SkDrawDash.h b/src/animator/SkDrawDash.h
index 483d2a3348..0000462ba7 100644
--- a/src/animator/SkDrawDash.h
+++ b/src/animator/SkDrawDash.h
@@ -24,4 +24,3 @@ private:
 };
 
 #endif // SkDrawDash_DEFINED
-
diff --git a/src/animator/SkDrawDiscrete.cpp b/src/animator/SkDrawDiscrete.cpp
index 655c83df3e..18c3ee0f61 100644
--- a/src/animator/SkDrawDiscrete.cpp
+++ b/src/animator/SkDrawDiscrete.cpp
@@ -32,4 +32,3 @@ SkPathEffect* SkDiscrete::getPathEffect() {
     else
         return new SkDiscretePathEffect(segLength, deviation);
 }
-
diff --git a/src/animator/SkDrawEmboss.cpp b/src/animator/SkDrawEmboss.cpp
index 7e47ec270c..5eed370a5d 100644
--- a/src/animator/SkDrawEmboss.cpp
+++ b/src/animator/SkDrawEmboss.cpp
@@ -31,4 +31,3 @@ SkMaskFilter* SkDrawEmboss::getMaskFilter() {
         return NULL;
     return SkBlurMaskFilter::CreateEmboss(direction.begin(), ambient, specular, radius);
 }
-
diff --git a/src/animator/SkDrawEmboss.h b/src/animator/SkDrawEmboss.h
index 50ce71a8f8..6e6199753c 100644
--- a/src/animator/SkDrawEmboss.h
+++ b/src/animator/SkDrawEmboss.h
@@ -22,4 +22,3 @@ protected:
 };
 
 #endif // SkDrawEmboss_DEFINED
-
diff --git a/src/animator/SkDrawFull.cpp b/src/animator/SkDrawFull.cpp
index 762b3daa8c..a1a5fc9f16 100644
--- a/src/animator/SkDrawFull.cpp
+++ b/src/animator/SkDrawFull.cpp
@@ -16,4 +16,3 @@ bool SkFull::draw(SkAnimateMaker& maker) {
     maker.fCanvas->drawPaint(*maker.fPaint);
     return false;
 }
-
diff --git a/src/animator/SkDrawGradient.h b/src/animator/SkDrawGradient.h
index 7763c1fcdc..ff79e3fb91 100644
--- a/src/animator/SkDrawGradient.h
+++ b/src/animator/SkDrawGradient.h
@@ -65,4 +65,3 @@ private:
 };
 
 #endif // SkDrawGradient_DEFINED
-
diff --git a/src/animator/SkDrawGroup.cpp b/src/animator/SkDrawGroup.cpp
index ddd23d3526..c56943462b 100644
--- a/src/animator/SkDrawGroup.cpp
+++ b/src/animator/SkDrawGroup.cpp
@@ -319,5 +319,3 @@ bool SkSave::draw(SkAnimateMaker& maker) {
     maker.fCanvas->restore();
     return result;
 }
-
-
diff --git a/src/animator/SkDrawLine.h b/src/animator/SkDrawLine.h
index e90c9970e4..b287802e25 100644
--- a/src/animator/SkDrawLine.h
+++ b/src/animator/SkDrawLine.h
@@ -26,4 +26,3 @@ private:
 };
 
 #endif // SkDrawLine_DEFINED
-
diff --git a/src/animator/SkDrawMatrix.cpp b/src/animator/SkDrawMatrix.cpp
index 62507ea43f..80b04c1bcd 100644
--- a/src/animator/SkDrawMatrix.cpp
+++ b/src/animator/SkDrawMatrix.cpp
@@ -266,4 +266,3 @@ bool SkDrawMatrix::setProperty(int index, SkScriptValue& scriptValue) {
     fConcat = fMatrix;
     return true;
 }
-
diff --git a/src/animator/SkDrawOval.cpp b/src/animator/SkDrawOval.cpp
index ab0fc814f5..e5efa7d538 100644
--- a/src/animator/SkDrawOval.cpp
+++ b/src/animator/SkDrawOval.cpp
@@ -26,4 +26,3 @@ bool SkOval::draw(SkAnimateMaker& maker) {
     maker.fCanvas->drawOval(fRect, *maker.fPaint);
     return false;
 }
-
diff --git a/src/animator/SkDrawOval.h b/src/animator/SkDrawOval.h
index afdc25287f..3c09e0fa06 100644
--- a/src/animator/SkDrawOval.h
+++ b/src/animator/SkDrawOval.h
@@ -20,4 +20,3 @@ private:
 };
 
 #endif // SkDrawOval_DEFINED
-
diff --git a/src/animator/SkDrawPaint.h b/src/animator/SkDrawPaint.h
index db95d345af..3caf6b6e49 100644
--- a/src/animator/SkDrawPaint.h
+++ b/src/animator/SkDrawPaint.h
@@ -77,4 +77,3 @@ private:
 };
 
 #endif // SkDrawPaint_DEFINED
-
diff --git a/src/animator/SkDrawPath.cpp b/src/animator/SkDrawPath.cpp
index aaeeb0bd48..f62f7c04dd 100644
--- a/src/animator/SkDrawPath.cpp
+++ b/src/animator/SkDrawPath.cpp
@@ -218,4 +218,3 @@ void SkPolygon::onEndElement(SkAnimateMaker& maker) {
     INHERITED::onEndElement(maker);
     fPath.close();
 }
-
diff --git a/src/animator/SkDrawPoint.cpp b/src/animator/SkDrawPoint.cpp
index 66d2b4e766..41a6be4ba5 100644
--- a/src/animator/SkDrawPoint.cpp
+++ b/src/animator/SkDrawPoint.cpp
@@ -42,5 +42,3 @@ void SkDrawPoint::getBounds(SkRect* rect ) {
     rect->fLeft = rect->fRight = fPoint.fX;
     rect->fTop = rect->fBottom = fPoint.fY;
 }
-
-
diff --git a/src/animator/SkDrawRectangle.cpp b/src/animator/SkDrawRectangle.cpp
index 7587e4b3f9..c3fb7ff705 100644
--- a/src/animator/SkDrawRectangle.cpp
+++ b/src/animator/SkDrawRectangle.cpp
@@ -140,6 +140,3 @@ void SkRoundRect::dump(SkAnimateMaker* maker) {
             SkScalarToFloat(fRect.fBottom), SkScalarToFloat(rx), SkScalarToFloat(ry));
 }
 #endif
-
-
-
diff --git a/src/animator/SkDrawRectangle.h b/src/animator/SkDrawRectangle.h
index 321c4ee657..42af02b1e7 100644
--- a/src/animator/SkDrawRectangle.h
+++ b/src/animator/SkDrawRectangle.h
@@ -53,4 +53,3 @@ private:
 };
 
 #endif // SkDrawRectangle_DEFINED
-
diff --git a/src/animator/SkDrawSaveLayer.cpp b/src/animator/SkDrawSaveLayer.cpp
index 43ec5c1b55..4e97a044e5 100644
--- a/src/animator/SkDrawSaveLayer.cpp
+++ b/src/animator/SkDrawSaveLayer.cpp
@@ -74,5 +74,3 @@ void SkSaveLayer::onEndElement(SkAnimateMaker& maker)
         maker.setErrorCode(SkDisplayXMLParserError::kSaveLayerNeedsBounds);
     INHERITED::onEndElement(maker);
 }
-
-
diff --git a/src/animator/SkDrawText.cpp b/src/animator/SkDrawText.cpp
index b8d38b4fd0..e7e5facabb 100644
--- a/src/animator/SkDrawText.cpp
+++ b/src/animator/SkDrawText.cpp
@@ -53,4 +53,3 @@ bool SkText::getProperty(int index, SkScriptValue* value) const {
     value->fOperand.fS32 = (int32_t) text.size();
     return true;
 }
-
diff --git a/src/animator/SkDrawTextBox.cpp b/src/animator/SkDrawTextBox.cpp
index f920e8eaa2..7a3251a26f 100644
--- a/src/animator/SkDrawTextBox.cpp
+++ b/src/animator/SkDrawTextBox.cpp
@@ -78,5 +78,3 @@ bool SkDrawTextBox::draw(SkAnimateMaker& maker)
     box.draw(maker.fCanvas, fText.c_str(), fText.size(), *maker.fPaint);
     return false;
 }
-
-
diff --git a/src/animator/SkDrawTextBox.h b/src/animator/SkDrawTextBox.h
index d8d7f0cf17..6155befb29 100644
--- a/src/animator/SkDrawTextBox.h
+++ b/src/animator/SkDrawTextBox.h
@@ -36,4 +36,3 @@ private:
 };
 
 #endif // SkDrawTextBox_DEFINED
-
diff --git a/src/animator/SkDrawTo.cpp b/src/animator/SkDrawTo.cpp
index bc5cd6d010..ef084d12d0 100644
--- a/src/animator/SkDrawTo.cpp
+++ b/src/animator/SkDrawTo.cpp
@@ -53,4 +53,3 @@ void SkDrawTo::dump(SkAnimateMaker* maker) {
     dumpDrawables(maker);
 }
 #endif
-
diff --git a/src/animator/SkDrawTransparentShader.cpp b/src/animator/SkDrawTransparentShader.cpp
index bb5392a532..2f286f4bea 100644
--- a/src/animator/SkDrawTransparentShader.cpp
+++ b/src/animator/SkDrawTransparentShader.cpp
@@ -13,4 +13,3 @@
 SkShader* SkDrawTransparentShader::getShader() {
     return new SkTransparentShader();
 }
-
diff --git a/src/animator/SkDrawTransparentShader.h b/src/animator/SkDrawTransparentShader.h
index df1c6eb87e..bf6617403e 100644
--- a/src/animator/SkDrawTransparentShader.h
+++ b/src/animator/SkDrawTransparentShader.h
@@ -18,4 +18,3 @@ class SkDrawTransparentShader : public SkDrawShader {
 };
 
 #endif // SkDrawTransparentShader_DEFINED
-
diff --git a/src/animator/SkDrawable.cpp b/src/animator/SkDrawable.cpp
index 9e80c9dc27..610c39761b 100644
--- a/src/animator/SkDrawable.cpp
+++ b/src/animator/SkDrawable.cpp
@@ -22,4 +22,3 @@ void SkDrawable::initialize() {
 
 void SkDrawable::setSteps(int steps) {
 }
-
diff --git a/src/animator/SkDump.h b/src/animator/SkDump.h
index 3222f06f21..0a31b1c049 100644
--- a/src/animator/SkDump.h
+++ b/src/animator/SkDump.h
@@ -40,4 +40,3 @@ class SkDump : public SkDisplayable {
 
 
 #endif // SkDump_DEFINED
-
diff --git a/src/animator/SkGetCondensedInfo.cpp b/src/animator/SkGetCondensedInfo.cpp
index 6d83b1d10c..f2471bbed9 100644
--- a/src/animator/SkGetCondensedInfo.cpp
+++ b/src/animator/SkGetCondensedInfo.cpp
@@ -119,4 +119,3 @@ const SkMemberInfo* SkMemberInfo::getInherited() const {
 }
 
 #endif
-
diff --git a/src/animator/SkHitClear.cpp b/src/animator/SkHitClear.cpp
index 70b3e73501..96b1747596 100644
--- a/src/animator/SkHitClear.cpp
+++ b/src/animator/SkHitClear.cpp
@@ -30,4 +30,3 @@ bool SkHitClear::enable(SkAnimateMaker& maker) {
 bool SkHitClear::hasEnable() const {
     return true;
 }
-
diff --git a/src/animator/SkHitTest.cpp b/src/animator/SkHitTest.cpp
index dc4e739e50..7506edc70e 100644
--- a/src/animator/SkHitTest.cpp
+++ b/src/animator/SkHitTest.cpp
@@ -72,4 +72,3 @@ const SkMemberInfo* SkHitTest::preferredChild(SkDisplayTypes type) {
         return getMember("bullets");
     return getMember("targets"); // !!! cwap! need to refer to member through enum like kScope instead
 }
-
diff --git a/src/animator/SkIntArray.h b/src/animator/SkIntArray.h
index 4dac75af24..401e51b8d4 100644
--- a/src/animator/SkIntArray.h
+++ b/src/animator/SkIntArray.h
@@ -53,6 +53,3 @@ typedef SkLongArray(SkOperand) SkTDOperandArray;
 typedef SkLongArray(SkOperand*) SkTDOperandPtrArray;
 
 #endif // SkIntArray_DEFINED
-
-
-
diff --git a/src/animator/SkMatrixParts.cpp b/src/animator/SkMatrixParts.cpp
index 221ac0a510..a2f3a9a524 100644
--- a/src/animator/SkMatrixParts.cpp
+++ b/src/animator/SkMatrixParts.cpp
@@ -290,5 +290,3 @@ const SkMemberInfo* SkPolyToPoly::preferredChild(SkDisplayTypes ) {
         return getMember("destination");
     }
 }
-
-
diff --git a/src/animator/SkMemberInfo.cpp b/src/animator/SkMemberInfo.cpp
index 582b29ad27..5e54b53aed 100644
--- a/src/animator/SkMemberInfo.cpp
+++ b/src/animator/SkMemberInfo.cpp
@@ -557,5 +557,3 @@ bool SkMemberInfo::SetValue(void* valuePtr, const char value[], SkDisplayTypes t
     return true;
 }
 #endif
-
-
diff --git a/src/animator/SkMemberInfo.h b/src/animator/SkMemberInfo.h
index 007df60ec6..a1b194118a 100644
--- a/src/animator/SkMemberInfo.h
+++ b/src/animator/SkMemberInfo.h
@@ -268,4 +268,3 @@ public: \
 #endif
 
 #endif // SkMemberInfo_DEFINED
-
diff --git a/src/animator/SkOperandInterpolator.h b/src/animator/SkOperandInterpolator.h
index 82fa272a10..adbe69f167 100644
--- a/src/animator/SkOperandInterpolator.h
+++ b/src/animator/SkOperandInterpolator.h
@@ -45,4 +45,3 @@ private:
 };
 
 #endif // SkOperandInterpolator_DEFINED
-
diff --git a/src/animator/SkOperandIterpolator.cpp b/src/animator/SkOperandIterpolator.cpp
index bc7d46be24..7822ee286e 100644
--- a/src/animator/SkOperandIterpolator.cpp
+++ b/src/animator/SkOperandIterpolator.cpp
@@ -147,5 +147,3 @@ void SkOperandInterpolator::UnitTest()
 }
 
 #endif
-
-
diff --git a/src/animator/SkPaintParts.cpp b/src/animator/SkPaintParts.cpp
index 2959238745..da47178261 100644
--- a/src/animator/SkPaintParts.cpp
+++ b/src/animator/SkPaintParts.cpp
@@ -99,5 +99,3 @@ void SkDrawTypeface::dump(SkAnimateMaker* maker) {
     SkDebugf("style=\"%s\" />\n", string.c_str());
 }
 #endif
-
-
diff --git a/src/animator/SkParseSVGPath.cpp b/src/animator/SkParseSVGPath.cpp
index f020e2e01a..4b548e28be 100644
--- a/src/animator/SkParseSVGPath.cpp
+++ b/src/animator/SkParseSVGPath.cpp
@@ -232,4 +232,3 @@ void SkDrawPath::parseSVG() {
         previousOp = op;
     } while (data[0] > 0);
 }
-
diff --git a/src/animator/SkPathParts.cpp b/src/animator/SkPathParts.cpp
index 3060bd445f..efc7c3355d 100644
--- a/src/animator/SkPathParts.cpp
+++ b/src/animator/SkPathParts.cpp
@@ -316,5 +316,3 @@ bool SkAddPath::add() {
         fPath->fPath.addPath(path->fPath);
     return false;
 }
-
-
diff --git a/src/animator/SkPathParts.h b/src/animator/SkPathParts.h
index cc81cdd722..f82aa74531 100644
--- a/src/animator/SkPathParts.h
+++ b/src/animator/SkPathParts.h
@@ -162,4 +162,3 @@ private:
 };
 
 #endif // SkPathParts_DEFINED
-
diff --git a/src/animator/SkPostParts.cpp b/src/animator/SkPostParts.cpp
index b6549a2890..7c0931eaa0 100644
--- a/src/animator/SkPostParts.cpp
+++ b/src/animator/SkPostParts.cpp
@@ -54,4 +54,3 @@ bool SkDataInput::setParent(SkDisplayable* displayable) {
 void SkDataInput::onEndElement(SkAnimateMaker&) {
     add();
 }
-
diff --git a/src/animator/SkScript.cpp b/src/animator/SkScript.cpp
index 64e8b5cf1b..14ca625925 100644
--- a/src/animator/SkScript.cpp
+++ b/src/animator/SkScript.cpp
@@ -1893,4 +1893,3 @@ void SkScriptEngine::UnitTest() {
     }
 }
 #endif
-
diff --git a/src/animator/SkScript2.h b/src/animator/SkScript2.h
index 03eb92cd14..33e2af7fee 100644
--- a/src/animator/SkScript2.h
+++ b/src/animator/SkScript2.h
@@ -289,4 +289,3 @@ struct SkScriptNAnswer2 {
 
 
 #endif // SkScript2_DEFINED
-
diff --git a/src/animator/SkScriptRuntime.cpp b/src/animator/SkScriptRuntime.cpp
index b211a71c12..f28785010f 100644
--- a/src/animator/SkScriptRuntime.cpp
+++ b/src/animator/SkScriptRuntime.cpp
@@ -349,4 +349,3 @@ void SkScriptRuntime::untrack(SkString* string) {
     SkASSERT(index >= 0);
     fTrackString.begin()[index] = NULL;
 }
-
diff --git a/src/animator/SkSnapshot.cpp b/src/animator/SkSnapshot.cpp
index 4e78bbd8e6..a253d8e259 100644
--- a/src/animator/SkSnapshot.cpp
+++ b/src/animator/SkSnapshot.cpp
@@ -61,4 +61,3 @@ bool SkSnapshot::draw(SkAnimateMaker& maker) {
                         SkScalarFloor(quality));
     return false;
 }
-
diff --git a/src/animator/SkSnapshot.h b/src/animator/SkSnapshot.h
index beb26caf2d..5ae6917ae7 100644
--- a/src/animator/SkSnapshot.h
+++ b/src/animator/SkSnapshot.h
@@ -28,4 +28,3 @@ class SkSnapshot: public SkDrawable {
 };
 
 #endif // SkSnapShot_DEFINED
-
diff --git a/src/animator/SkTextToPath.cpp b/src/animator/SkTextToPath.cpp
index b38daff7ec..0c1b0e42e4 100644
--- a/src/animator/SkTextToPath.cpp
+++ b/src/animator/SkTextToPath.cpp
@@ -45,4 +45,3 @@ void SkTextToPath::onEndElement(SkAnimateMaker& maker) {
     realPaint.getTextPath(text->getText(), text->getSize(), text->x,
         text->y, &path->getPath());
 }
-
diff --git a/src/animator/SkTextToPath.h b/src/animator/SkTextToPath.h
index cb2a15e498..ac44ad7028 100644
--- a/src/animator/SkTextToPath.h
+++ b/src/animator/SkTextToPath.h
@@ -29,4 +29,3 @@ private:
 };
 
 #endif // SkTextToPath_DEFINED
-
diff --git a/src/animator/SkTime.cpp b/src/animator/SkTime.cpp
index 06ad9bd44b..ffd6f38d57 100644
--- a/src/animator/SkTime.cpp
+++ b/src/animator/SkTime.cpp
@@ -78,4 +78,3 @@ SkMSec SkTime::GetMSecs()
 }
 
 #endif
-
diff --git a/src/animator/SkXMLAnimatorWriter.cpp b/src/animator/SkXMLAnimatorWriter.cpp
index 6d299b6b08..58f20f136b 100644
--- a/src/animator/SkXMLAnimatorWriter.cpp
+++ b/src/animator/SkXMLAnimatorWriter.cpp
@@ -80,4 +80,3 @@ void SkXMLAnimatorWriter::UnitTest(SkCanvas* canvas)
 }
 
 #endif
-
diff --git a/src/animator/SkXMLAnimatorWriter.h b/src/animator/SkXMLAnimatorWriter.h
index bd6ccf4ad7..1b17f6ffd6 100644
--- a/src/animator/SkXMLAnimatorWriter.h
+++ b/src/animator/SkXMLAnimatorWriter.h
@@ -31,4 +31,3 @@ private:
 };
 
 #endif // SkXMLAnimatorWriter_DEFINED
-
diff --git a/src/core/ARGB32_Clamp_Bilinear_BitmapShader.h b/src/core/ARGB32_Clamp_Bilinear_BitmapShader.h
index 720b4799e9..87121cfdb2 100644
--- a/src/core/ARGB32_Clamp_Bilinear_BitmapShader.h
+++ b/src/core/ARGB32_Clamp_Bilinear_BitmapShader.h
@@ -175,4 +175,3 @@ void ARGB32_Clamp_Bilinear_BitmapShader::shadeSpan(int x, int y, SkPMColor dstC[
         }
     }
 }
-
diff --git a/src/core/SkAAClip.cpp b/src/core/SkAAClip.cpp
index fce6683999..988e2d7615 100644
--- a/src/core/SkAAClip.cpp
+++ b/src/core/SkAAClip.cpp
@@ -2176,4 +2176,3 @@ void SkAAClipBlitter::blitMask(const SkMask& origMask, const SkIRect& clip) {
 const SkBitmap* SkAAClipBlitter::justAnOpaqueColor(uint32_t* value) {
     return NULL;
 }
-
diff --git a/src/core/SkAlphaRuns.cpp b/src/core/SkAlphaRuns.cpp
index 116d132a5d..a80e9af45a 100644
--- a/src/core/SkAlphaRuns.cpp
+++ b/src/core/SkAlphaRuns.cpp
@@ -176,4 +176,3 @@ int SkAlphaRuns::add(int x, U8CPU startAlpha, int middleCount, U8CPU stopAlpha,
         SkASSERT(count == fWidth);
     }
 #endif
-
diff --git a/src/core/SkAnnotation.cpp b/src/core/SkAnnotation.cpp
index 81767611b3..5e4363e728 100644
--- a/src/core/SkAnnotation.cpp
+++ b/src/core/SkAnnotation.cpp
@@ -62,4 +62,3 @@ void SkAnnotateRectWithURL(SkCanvas* canvas, const SkRect& rect, SkData* value)
 
     canvas->drawRect(rect, paint);
 }
-
diff --git a/src/core/SkAntiRun.h b/src/core/SkAntiRun.h
index 31b52e3b1a..123972692e 100644
--- a/src/core/SkAntiRun.h
+++ b/src/core/SkAntiRun.h
@@ -90,4 +90,3 @@ private:
 };
 
 #endif
-
diff --git a/src/core/SkAutoKern.h b/src/core/SkAutoKern.h
index 0a08432a73..0b22e56413 100644
--- a/src/core/SkAutoKern.h
+++ b/src/core/SkAutoKern.h
@@ -51,4 +51,3 @@ private:
 };
 
 #endif
-
diff --git a/src/core/SkBBoxHierarchy.cpp b/src/core/SkBBoxHierarchy.cpp
index 7d061b5761..5232fb7c18 100644
--- a/src/core/SkBBoxHierarchy.cpp
+++ b/src/core/SkBBoxHierarchy.cpp
@@ -9,4 +9,3 @@
 #include "SkBBoxHierarchy.h"
 
 SK_DEFINE_INST_COUNT(SkBBoxHierarchy)
-
diff --git a/src/core/SkBBoxHierarchy.h b/src/core/SkBBoxHierarchy.h
index 6625a846fe..4c8b2ae256 100644
--- a/src/core/SkBBoxHierarchy.h
+++ b/src/core/SkBBoxHierarchy.h
@@ -54,4 +54,3 @@ private:
 };
 
 #endif
-
diff --git a/src/core/SkBBoxHierarchyRecord.h b/src/core/SkBBoxHierarchyRecord.h
index ac7ab1c1b4..854e525961 100644
--- a/src/core/SkBBoxHierarchyRecord.h
+++ b/src/core/SkBBoxHierarchyRecord.h
@@ -52,4 +52,3 @@ private:
 };
 
 #endif
-
diff --git a/src/core/SkBBoxRecord.cpp b/src/core/SkBBoxRecord.cpp
index bec6ff6e13..52d599f57e 100644
--- a/src/core/SkBBoxRecord.cpp
+++ b/src/core/SkBBoxRecord.cpp
@@ -282,4 +282,3 @@ bool SkBBoxRecord::transformBounds(const SkRect& bounds, const SkPaint* paint) {
 
     return false;
 }
-
diff --git a/src/core/SkBBoxRecord.h b/src/core/SkBBoxRecord.h
index 190d1450d1..9f796717e4 100644
--- a/src/core/SkBBoxRecord.h
+++ b/src/core/SkBBoxRecord.h
@@ -76,4 +76,3 @@ private:
 };
 
 #endif
-
diff --git a/src/core/SkBitmap.cpp b/src/core/SkBitmap.cpp
index 9692a71be2..e5a202c540 100644
--- a/src/core/SkBitmap.cpp
+++ b/src/core/SkBitmap.cpp
@@ -1678,4 +1678,3 @@ void SkBitmap::toString(SkString* str) const {
     str->append(")");
 }
 #endif
-
diff --git a/src/core/SkBitmapProcState.cpp b/src/core/SkBitmapProcState.cpp
index 92e55e876a..97ffef5728 100644
--- a/src/core/SkBitmapProcState.cpp
+++ b/src/core/SkBitmapProcState.cpp
@@ -727,4 +727,3 @@ int SkBitmapProcState::maxCountForBufferSize(size_t bufferSize) const {
 
     return size;
 }
-
diff --git a/src/core/SkBitmapProcState_matrixProcs.cpp b/src/core/SkBitmapProcState_matrixProcs.cpp
index d1de750e31..15c17b67dc 100644
--- a/src/core/SkBitmapProcState_matrixProcs.cpp
+++ b/src/core/SkBitmapProcState_matrixProcs.cpp
@@ -519,4 +519,3 @@ SkBitmapProcState::chooseMatrixProc(bool trivial_matrix) {
     fTileLowBitsProcY = choose_tile_lowbits_proc(fTileModeY);
     return GeneralXY_Procs[index];
 }
-
diff --git a/src/core/SkBitmapProcState_procs.h b/src/core/SkBitmapProcState_procs.h
index d43305b2cf..da9ca89bbf 100644
--- a/src/core/SkBitmapProcState_procs.h
+++ b/src/core/SkBitmapProcState_procs.h
@@ -341,4 +341,3 @@ static inline U8CPU Filter_8(unsigned x, unsigned y,
 #include "SkBitmapProcState_shaderproc.h"
 
 #undef NAME_WRAP
-
diff --git a/src/core/SkBitmapSampler.cpp b/src/core/SkBitmapSampler.cpp
index 755f717b52..da8aa8a5ba 100644
--- a/src/core/SkBitmapSampler.cpp
+++ b/src/core/SkBitmapSampler.cpp
@@ -414,4 +414,3 @@ SkBitmapSampler* SkBitmapSampler::Create(const SkBitmap& bm, bool doFilter,
     }
     return SkNEW_ARGS(SkNullBitmapSampler, (bm, doFilter, tmx, tmy));
 }
-
diff --git a/src/core/SkBlitMask_D32.cpp b/src/core/SkBlitMask_D32.cpp
index 4fb974b907..80cc787991 100644
--- a/src/core/SkBlitMask_D32.cpp
+++ b/src/core/SkBlitMask_D32.cpp
@@ -594,4 +594,3 @@ SkBlitMask::RowProc SkBlitMask::RowFactory(SkBitmap::Config config,
     }
     return NULL;
 }
-
diff --git a/src/core/SkBlitRow_D16.cpp b/src/core/SkBlitRow_D16.cpp
index 9453488a79..309e459c2e 100644
--- a/src/core/SkBlitRow_D16.cpp
+++ b/src/core/SkBlitRow_D16.cpp
@@ -251,4 +251,3 @@ SkBlitRow::Proc SkBlitRow::Factory(unsigned flags, SkBitmap::Config config) {
     }
     return proc;
 }
-
diff --git a/src/core/SkBlitRow_D32.cpp b/src/core/SkBlitRow_D32.cpp
index c2cb855743..c858af6318 100644
--- a/src/core/SkBlitRow_D32.cpp
+++ b/src/core/SkBlitRow_D32.cpp
@@ -247,4 +247,3 @@ SkBlitRow::ColorRectProc SkBlitRow::ColorRectProcFactory() {
     SkASSERT(proc);
     return proc;
 }
-
diff --git a/src/core/SkBlitRow_D4444.cpp b/src/core/SkBlitRow_D4444.cpp
index c32e812499..026d156376 100644
--- a/src/core/SkBlitRow_D4444.cpp
+++ b/src/core/SkBlitRow_D4444.cpp
@@ -216,5 +216,3 @@ SkBlitRow::Proc SkBlitRow_Factory_4444(unsigned flags)
 
     return gProcs4444[flags];
 }
-
-
diff --git a/src/core/SkBlitter.cpp b/src/core/SkBlitter.cpp
index e3b3c3471a..f43ad75a44 100644
--- a/src/core/SkBlitter.cpp
+++ b/src/core/SkBlitter.cpp
@@ -1018,4 +1018,3 @@ SkShaderBlitter::~SkShaderBlitter() {
     fShader->endContext();
     fShader->unref();
 }
-
diff --git a/src/core/SkBlitter_4444.cpp b/src/core/SkBlitter_4444.cpp
index ec62523c5d..3844b768aa 100644
--- a/src/core/SkBlitter_4444.cpp
+++ b/src/core/SkBlitter_4444.cpp
@@ -478,4 +478,3 @@ SkBlitter* SkBlitter_ChooseD4444(const SkBitmap& device,
     }
     return blitter;
 }
-
diff --git a/src/core/SkBlitter_A1.cpp b/src/core/SkBlitter_A1.cpp
index 5638477d85..b64afe2ae9 100644
--- a/src/core/SkBlitter_A1.cpp
+++ b/src/core/SkBlitter_A1.cpp
@@ -48,4 +48,3 @@ void SkA1_Blitter::blitH(int x, int y, int width) {
         *dst |= rite_mask;
     }
 }
-
diff --git a/src/core/SkBlitter_A8.cpp b/src/core/SkBlitter_A8.cpp
index 92a4971e84..4213c6b4dc 100644
--- a/src/core/SkBlitter_A8.cpp
+++ b/src/core/SkBlitter_A8.cpp
@@ -343,4 +343,3 @@ void SkA8_Shader_Blitter::blitMask(const SkMask& mask, const SkIRect& clip) {
         alpha += mask.fRowBytes;
     }
 }
-
diff --git a/src/core/SkBlitter_ARGB32.cpp b/src/core/SkBlitter_ARGB32.cpp
index 8b47481b3c..16487ad2f4 100644
--- a/src/core/SkBlitter_ARGB32.cpp
+++ b/src/core/SkBlitter_ARGB32.cpp
@@ -636,4 +636,3 @@ void SkARGB32_Shader_Blitter::blitV(int x, int y, int height, SkAlpha alpha) {
         }
     }
 }
-
diff --git a/src/core/SkBlitter_Sprite.cpp b/src/core/SkBlitter_Sprite.cpp
index c2a0062c4f..db7cc69a78 100644
--- a/src/core/SkBlitter_Sprite.cpp
+++ b/src/core/SkBlitter_Sprite.cpp
@@ -85,4 +85,3 @@ SkBlitter* SkBlitter::ChooseSprite( const SkBitmap& device,
     }
     return blitter;
 }
-
diff --git a/src/core/SkBuffer.h b/src/core/SkBuffer.h
index 6722eb8df3..9633389907 100644
--- a/src/core/SkBuffer.h
+++ b/src/core/SkBuffer.h
@@ -136,4 +136,3 @@ private:
 };
 
 #endif
-
diff --git a/src/core/SkCanvas.cpp b/src/core/SkCanvas.cpp
index 587304bc35..b1e86782f6 100644
--- a/src/core/SkCanvas.cpp
+++ b/src/core/SkCanvas.cpp
@@ -2118,5 +2118,3 @@ int SkCanvas::LayerIter::y() const { return fImpl->getY(); }
 ///////////////////////////////////////////////////////////////////////////////
 
 SkCanvas::ClipVisitor::~ClipVisitor() { }
-
-
diff --git a/src/core/SkChunkAlloc.cpp b/src/core/SkChunkAlloc.cpp
index 25ef4bcaf9..30cc4e19a7 100644
--- a/src/core/SkChunkAlloc.cpp
+++ b/src/core/SkChunkAlloc.cpp
@@ -136,4 +136,3 @@ bool SkChunkAlloc::contains(const void* addr) const {
     }
     return false;
 }
-
diff --git a/src/core/SkColor.cpp b/src/core/SkColor.cpp
index cb5f15cb7f..6fa239ff53 100644
--- a/src/core/SkColor.cpp
+++ b/src/core/SkColor.cpp
@@ -111,4 +111,3 @@ SkColor SkHSVToColor(U8CPU a, const SkScalar hsv[3]) {
     }
     return SkColorSetARGB(a, r, g, b);
 }
-
diff --git a/src/core/SkCordic.h b/src/core/SkCordic.h
index aa703ebf6f..fecf645643 100644
--- a/src/core/SkCordic.h
+++ b/src/core/SkCordic.h
@@ -26,4 +26,3 @@ SkFixed SkCordicTan(SkFixed a);
 #endif
 
 #endif // SkCordic
-
diff --git a/src/core/SkCoreBlitters.h b/src/core/SkCoreBlitters.h
index 47a0aa4a57..823cb41b0d 100644
--- a/src/core/SkCoreBlitters.h
+++ b/src/core/SkCoreBlitters.h
@@ -189,4 +189,3 @@ extern SkBlitter* SkBlitter_ChooseD565(const SkBitmap& device,
                                        void* storage, size_t storageSize);
 
 #endif
-
diff --git a/src/core/SkCubicClipper.cpp b/src/core/SkCubicClipper.cpp
index 3db2feb34c..aed681b9f3 100644
--- a/src/core/SkCubicClipper.cpp
+++ b/src/core/SkCubicClipper.cpp
@@ -160,4 +160,3 @@ bool SkCubicClipper::clipCubic(const SkPoint srcPts[4], SkPoint dst[4]) {
     }
     return true;
 }
-
diff --git a/src/core/SkDebug.cpp b/src/core/SkDebug.cpp
index 4b33836e73..a10d443f78 100644
--- a/src/core/SkDebug.cpp
+++ b/src/core/SkDebug.cpp
@@ -48,4 +48,3 @@ uint32_t SkToU32(size_t x)
 }
 
 #endif
-
diff --git a/src/core/SkDescriptor.h b/src/core/SkDescriptor.h
index 071a89c186..79b086f614 100644
--- a/src/core/SkDescriptor.h
+++ b/src/core/SkDescriptor.h
@@ -162,4 +162,3 @@ private:
 
 
 #endif
-
diff --git a/src/core/SkDevice.cpp b/src/core/SkDevice.cpp
index c79b4f8aa3..9aa652d572 100644
--- a/src/core/SkDevice.cpp
+++ b/src/core/SkDevice.cpp
@@ -542,4 +542,3 @@ bool SkDevice::filterTextFlags(const SkPaint& paint, TextFlags* flags) {
     // we're cool with the paint as is
     return false;
 }
-
diff --git a/src/core/SkDeviceProfile.cpp b/src/core/SkDeviceProfile.cpp
index abb78acb52..ce3e566397 100644
--- a/src/core/SkDeviceProfile.cpp
+++ b/src/core/SkDeviceProfile.cpp
@@ -76,5 +76,3 @@ void SkDeviceProfile::SetGlobal(SkDeviceProfile* profile) {
 
     SkRefCnt_SafeAssign(gGlobalProfile, profile);
 }
-
-
diff --git a/src/core/SkDeviceProfile.h b/src/core/SkDeviceProfile.h
index 2a3f4bb67d..6ef8dfb839 100644
--- a/src/core/SkDeviceProfile.h
+++ b/src/core/SkDeviceProfile.h
@@ -96,4 +96,3 @@ private:
 };
 
 #endif
-
diff --git a/src/core/SkDither.cpp b/src/core/SkDither.cpp
index e733aad789..546d4799c8 100644
--- a/src/core/SkDither.cpp
+++ b/src/core/SkDither.cpp
@@ -53,4 +53,3 @@ const uint16_t gDitherMatrix_3Bit_16[4] = {
 };
 
 #endif
-
diff --git a/src/core/SkDraw.cpp b/src/core/SkDraw.cpp
index fcaf4cf698..6d8bfc5974 100644
--- a/src/core/SkDraw.cpp
+++ b/src/core/SkDraw.cpp
@@ -2790,4 +2790,3 @@ bool SkDraw::DrawToMask(const SkPath& devPath, const SkIRect* clipBounds,
 
     return true;
 }
-
diff --git a/src/core/SkDrawProcs.h b/src/core/SkDrawProcs.h
index ba1a875aff..ec086dd7da 100644
--- a/src/core/SkDrawProcs.h
+++ b/src/core/SkDrawProcs.h
@@ -43,4 +43,3 @@ struct SkDrawProcs {
 bool SkDrawTreatAsHairline(const SkPaint&, const SkMatrix&, SkScalar* coverage);
 
 #endif
-
diff --git a/src/core/SkEdge.cpp b/src/core/SkEdge.cpp
index e646c4765f..8904ca727b 100644
--- a/src/core/SkEdge.cpp
+++ b/src/core/SkEdge.cpp
@@ -495,6 +495,3 @@ int SkCubicEdge::updateCubic()
     fCurveCount = SkToS8(count);
     return success;
 }
-
-
-
diff --git a/src/core/SkEdgeBuilder.cpp b/src/core/SkEdgeBuilder.cpp
index ad9eeb73a0..608a83c7c7 100644
--- a/src/core/SkEdgeBuilder.cpp
+++ b/src/core/SkEdgeBuilder.cpp
@@ -238,4 +238,3 @@ int SkEdgeBuilder::build(const SkPath& path, const SkIRect* iclip,
     fEdgeList = fList.begin();
     return fList.count();
 }
-
diff --git a/src/core/SkFDot6.h b/src/core/SkFDot6.h
index 9b8e4d05ad..a88ea92501 100644
--- a/src/core/SkFDot6.h
+++ b/src/core/SkFDot6.h
@@ -58,4 +58,3 @@ inline SkFixed SkFDot6Div(SkFDot6 a, SkFDot6 b) {
 }
 
 #endif
-
diff --git a/src/core/SkFilterProc.h b/src/core/SkFilterProc.h
index 4dfdf60f14..3b20d592d2 100644
--- a/src/core/SkFilterProc.h
+++ b/src/core/SkFilterProc.h
@@ -133,5 +133,3 @@ inline SkFilterPtrProc SkGetBilinearFilterPtrXProc(const SkFilterPtrProc* table,
 }
 
 #endif
-
-
diff --git a/src/core/SkFlate.cpp b/src/core/SkFlate.cpp
index 39fc724e51..8258cdcd1d 100644
--- a/src/core/SkFlate.cpp
+++ b/src/core/SkFlate.cpp
@@ -138,4 +138,3 @@ bool SkFlate::Inflate(SkStream* src, SkWStream* dst) {
 }
 
 #endif
-
diff --git a/src/core/SkFloatBits.cpp b/src/core/SkFloatBits.cpp
index 54a1d20188..39b51abf1d 100644
--- a/src/core/SkFloatBits.cpp
+++ b/src/core/SkFloatBits.cpp
@@ -204,4 +204,3 @@ float SkIntToFloatCast_NoOverflowCheck(int32_t value) {
     data.fSignBitInt = (sign << 31) | (shift << 23) | (value & ~MATISSA_MAGIC_BIG);
     return data.fFloat;
 }
-
diff --git a/src/core/SkGeometry.cpp b/src/core/SkGeometry.cpp
index 3114ccb34d..1ca40befa1 100644
--- a/src/core/SkGeometry.cpp
+++ b/src/core/SkGeometry.cpp
@@ -1383,4 +1383,3 @@ int SkBuildQuadArc(const SkVector& uStart, const SkVector& uStop,
     matrix.mapPoints(quadPoints, pointCount);
     return pointCount;
 }
-
diff --git a/src/core/SkGlyphCache.cpp b/src/core/SkGlyphCache.cpp
index b878df8b77..2673aba8a5 100644
--- a/src/core/SkGlyphCache.cpp
+++ b/src/core/SkGlyphCache.cpp
@@ -741,4 +741,3 @@ void SkGraphics::SetTLSFontCacheLimit(size_t bytes) {
         SkGlyphCache_Globals::GetTLS().setFontCacheLimit(bytes);
     }
 }
-
diff --git a/src/core/SkGlyphCache.h b/src/core/SkGlyphCache.h
index 8509011f0a..537b44784a 100644
--- a/src/core/SkGlyphCache.h
+++ b/src/core/SkGlyphCache.h
@@ -303,4 +303,3 @@ private:
 };
 
 #endif
-
diff --git a/src/core/SkLineClipper.cpp b/src/core/SkLineClipper.cpp
index 1e9ace53be..fc4e3d2592 100644
--- a/src/core/SkLineClipper.cpp
+++ b/src/core/SkLineClipper.cpp
@@ -295,4 +295,3 @@ int SkLineClipper::ClipLine(const SkPoint pts[], const SkRect& clip,
     }
     return lineCount;
 }
-
diff --git a/src/core/SkMMapStream.cpp b/src/core/SkMMapStream.cpp
index 1579044dc8..7388e81498 100644
--- a/src/core/SkMMapStream.cpp
+++ b/src/core/SkMMapStream.cpp
@@ -75,4 +75,3 @@ void SkMMAPStream::closeMMap()
         fAddr = NULL;
     }
 }
-
diff --git a/src/core/SkMask.cpp b/src/core/SkMask.cpp
index c290b574f0..09744194b9 100644
--- a/src/core/SkMask.cpp
+++ b/src/core/SkMask.cpp
@@ -74,4 +74,3 @@ void* SkMask::getAddr(int x, int y) const {
     addr += (x - fBounds.fLeft) << maskFormatToShift(fFormat);
     return addr;
 }
-
diff --git a/src/core/SkMaskFilter.cpp b/src/core/SkMaskFilter.cpp
index 5de76c76dd..9805bf9b05 100644
--- a/src/core/SkMaskFilter.cpp
+++ b/src/core/SkMaskFilter.cpp
@@ -277,5 +277,3 @@ void SkMaskFilter::computeFastBounds(const SkRect& src, SkRect* dst) const {
         dst->set(srcM.fBounds);
     }
 }
-
-
diff --git a/src/core/SkMath.cpp b/src/core/SkMath.cpp
index 9e7094ccfb..0efedd727b 100644
--- a/src/core/SkMath.cpp
+++ b/src/core/SkMath.cpp
@@ -534,4 +534,3 @@ SkFixed SkFixedACos(SkFixed x) { return SkCordicACos(x); }
 SkFixed SkFixedATan2(SkFixed y, SkFixed x) { return SkCordicATan2(y, x); }
 SkFixed SkFixedExp(SkFixed x) { return SkCordicExp(x); }
 SkFixed SkFixedLog(SkFixed x) { return SkCordicLog(x); }
-
diff --git a/src/core/SkMathPriv.h b/src/core/SkMathPriv.h
index 11ad1ba45a..53cf43063d 100644
--- a/src/core/SkMathPriv.h
+++ b/src/core/SkMathPriv.h
@@ -87,4 +87,3 @@ static inline unsigned SkDiv255Round(unsigned prod) {
 }
 
 #endif
-
diff --git a/src/core/SkMatrix.cpp b/src/core/SkMatrix.cpp
index eda8f14c07..55eaa83398 100644
--- a/src/core/SkMatrix.cpp
+++ b/src/core/SkMatrix.cpp
@@ -1928,4 +1928,3 @@ bool SkTreatAsSprite(const SkMatrix& mat, int width, int height,
     dst.round(&idst);
     return isrc == idst;
 }
-
diff --git a/src/core/SkMemory_stdlib.cpp b/src/core/SkMemory_stdlib.cpp
index 17bf6a9ac6..fa13e9cb7b 100644
--- a/src/core/SkMemory_stdlib.cpp
+++ b/src/core/SkMemory_stdlib.cpp
@@ -265,4 +265,3 @@ void* sk_malloc_flags(size_t size, unsigned flags)
     ValidateHeap();
     return p;
 }
-
diff --git a/src/core/SkMetaData.cpp b/src/core/SkMetaData.cpp
index 338ec5e281..5a494b3511 100644
--- a/src/core/SkMetaData.cpp
+++ b/src/core/SkMetaData.cpp
@@ -334,4 +334,3 @@ SkMetaData::Rec* SkMetaData::Rec::Alloc(size_t size) {
 void SkMetaData::Rec::Free(Rec* rec) {
     sk_free(rec);
 }
-
diff --git a/src/core/SkPaint.cpp b/src/core/SkPaint.cpp
index 71a68ef1c8..8acdd8db28 100644
--- a/src/core/SkPaint.cpp
+++ b/src/core/SkPaint.cpp
@@ -2383,4 +2383,3 @@ void SkDrawLooper::computeFastBounds(const SkPaint& paint, const SkRect& src,
         }
     }
 }
-
diff --git a/src/core/SkPath.cpp b/src/core/SkPath.cpp
index ac9b676e86..aa35e74e6c 100644
--- a/src/core/SkPath.cpp
+++ b/src/core/SkPath.cpp
@@ -2952,4 +2952,3 @@ bool SkPath::contains(SkScalar x, SkScalar y) const {
     }
     return SkToBool(w);
 }
-
diff --git a/src/core/SkPathEffect.cpp b/src/core/SkPathEffect.cpp
index 38332a4a2f..8306d7aa51 100644
--- a/src/core/SkPathEffect.cpp
+++ b/src/core/SkPathEffect.cpp
@@ -79,4 +79,3 @@ bool SkSumPathEffect::filterPath(SkPath* dst, const SkPath& src,
     return fPE0->filterPath(dst, src, rec, cullRect) |
            fPE1->filterPath(dst, src, rec, cullRect);
 }
-
diff --git a/src/core/SkPathHeap.cpp b/src/core/SkPathHeap.cpp
index bd5269d327..b8ca40b4ef 100644
--- a/src/core/SkPathHeap.cpp
+++ b/src/core/SkPathHeap.cpp
@@ -61,4 +61,3 @@ void SkPathHeap::flatten(SkFlattenableWriteBuffer& buffer) const {
         iter++;
     }
 }
-
diff --git a/src/core/SkPathHeap.h b/src/core/SkPathHeap.h
index f043222027..095e84a202 100644
--- a/src/core/SkPathHeap.h
+++ b/src/core/SkPathHeap.h
@@ -48,4 +48,3 @@ private:
 };
 
 #endif
-
diff --git a/src/core/SkPicture.cpp b/src/core/SkPicture.cpp
index b9273df467..93c996a44a 100644
--- a/src/core/SkPicture.cpp
+++ b/src/core/SkPicture.cpp
@@ -327,5 +327,3 @@ void SkPicture::abortPlayback() {
     }
     fPlayback->abort();
 }
-
-
diff --git a/src/core/SkPictureStateTree.cpp b/src/core/SkPictureStateTree.cpp
index 9299f8c8f8..2abed19658 100644
--- a/src/core/SkPictureStateTree.cpp
+++ b/src/core/SkPictureStateTree.cpp
@@ -175,4 +175,3 @@ uint32_t SkPictureStateTree::Iterator::draw() {
     ++fPlaybackIndex;
     return draw->fOffset;
 }
-
diff --git a/src/core/SkPictureStateTree.h b/src/core/SkPictureStateTree.h
index bcf2aee6fb..ab467cf5b9 100644
--- a/src/core/SkPictureStateTree.h
+++ b/src/core/SkPictureStateTree.h
@@ -133,4 +133,3 @@ private:
 };
 
 #endif
-
diff --git a/src/core/SkPtrRecorder.cpp b/src/core/SkPtrRecorder.cpp
index 896e62d7fb..d473cab8c1 100644
--- a/src/core/SkPtrRecorder.cpp
+++ b/src/core/SkPtrRecorder.cpp
@@ -75,5 +75,3 @@ void SkPtrSet::copyToArray(void* array[]) const {
         }
     }
 }
-
-
diff --git a/src/core/SkQuadClipper.cpp b/src/core/SkQuadClipper.cpp
index 9e048878c9..a67a23f939 100644
--- a/src/core/SkQuadClipper.cpp
+++ b/src/core/SkQuadClipper.cpp
@@ -126,4 +126,3 @@ bool SkQuadClipper::clipQuad(const SkPoint srcPts[3], SkPoint dst[3]) {
     }
     return true;
 }
-
diff --git a/src/core/SkRTree.cpp b/src/core/SkRTree.cpp
index 42c1c999d4..32f531f78a 100644
--- a/src/core/SkRTree.cpp
+++ b/src/core/SkRTree.cpp
@@ -473,4 +473,3 @@ static inline void join_no_empty_check(const SkIRect& joinWith, SkIRect* out) {
     if (joinWith.fRight > out->fRight) { out->fRight = joinWith.fRight; }
     if (joinWith.fBottom > out->fBottom) { out->fBottom = joinWith.fBottom; }
 }
-
diff --git a/src/core/SkRTree.h b/src/core/SkRTree.h
index 1f166489a1..139cc61b76 100644
--- a/src/core/SkRTree.h
+++ b/src/core/SkRTree.h
@@ -180,4 +180,3 @@ private:
 };
 
 #endif
-
diff --git a/src/core/SkRasterClip.cpp b/src/core/SkRasterClip.cpp
index 4312717a44..919fde9ffc 100644
--- a/src/core/SkRasterClip.cpp
+++ b/src/core/SkRasterClip.cpp
@@ -291,4 +291,3 @@ void SkAAClipBlitterWrapper::init(const SkRasterClip& clip, SkBlitter* blitter)
         fBlitter = &fAABlitter;
     }
 }
-
diff --git a/src/core/SkRasterizer.cpp b/src/core/SkRasterizer.cpp
index 23a749fd4b..a65d541ac5 100644
--- a/src/core/SkRasterizer.cpp
+++ b/src/core/SkRasterizer.cpp
@@ -48,4 +48,3 @@ bool SkRasterizer::onRasterize(const SkPath& fillPath, const SkMatrix& matrix,
     return SkDraw::DrawToMask(devPath, clipBounds, NULL, NULL, mask, mode,
                               SkPaint::kFill_Style);
 }
-
diff --git a/src/core/SkRect.cpp b/src/core/SkRect.cpp
index 1d8a13e085..c62f2f3cf6 100644
--- a/src/core/SkRect.cpp
+++ b/src/core/SkRect.cpp
@@ -181,4 +181,3 @@ void SkRect::join(SkScalar left, SkScalar top, SkScalar right,
         if (bottom > fBottom) fBottom = bottom;
     }
 }
-
diff --git a/src/core/SkRefCnt.cpp b/src/core/SkRefCnt.cpp
index 773e0d9072..8d09065a43 100644
--- a/src/core/SkRefCnt.cpp
+++ b/src/core/SkRefCnt.cpp
@@ -11,4 +11,3 @@
 
 SK_DEFINE_INST_COUNT(SkRefCnt)
 SK_DEFINE_INST_COUNT(SkWeakRefCnt)
-
diff --git a/src/core/SkRefDict.cpp b/src/core/SkRefDict.cpp
index 53b099b4db..50a469dfc7 100644
--- a/src/core/SkRefDict.cpp
+++ b/src/core/SkRefDict.cpp
@@ -86,4 +86,3 @@ void SkRefDict::removeAll() {
     }
     fImpl = NULL;
 }
-
diff --git a/src/core/SkRegion_path.cpp b/src/core/SkRegion_path.cpp
index 58812eb37f..80149a3836 100644
--- a/src/core/SkRegion_path.cpp
+++ b/src/core/SkRegion_path.cpp
@@ -488,4 +488,3 @@ bool SkRegion::getBoundaryPath(SkPath* path) const {
 
     return true;
 }
-
diff --git a/src/core/SkScalerContext.cpp b/src/core/SkScalerContext.cpp
index c35c0db444..690ee77b3f 100644
--- a/src/core/SkScalerContext.cpp
+++ b/src/core/SkScalerContext.cpp
@@ -766,4 +766,3 @@ SkScalerContext* SkScalerContext::Create(const SkDescriptor* desc) {
     }
     return c;
 }
-
diff --git a/src/core/SkScalerContext.h b/src/core/SkScalerContext.h
index f30bbd3eb6..1ada0acfe4 100644
--- a/src/core/SkScalerContext.h
+++ b/src/core/SkScalerContext.h
@@ -294,4 +294,3 @@ void SkScalerContextRec::setHinting(SkPaint::Hinting hinting) {
 
 
 #endif
-
diff --git a/src/core/SkScan.cpp b/src/core/SkScan.cpp
index 30626f7640..44968bd9ec 100644
--- a/src/core/SkScan.cpp
+++ b/src/core/SkScan.cpp
@@ -115,4 +115,3 @@ void SkScan::FillRect(const SkRect& r, const SkRasterClip& clip,
 }
 
 #endif
-
diff --git a/src/core/SkScanPriv.h b/src/core/SkScanPriv.h
index 82402a7454..75ceee08b4 100644
--- a/src/core/SkScanPriv.h
+++ b/src/core/SkScanPriv.h
@@ -38,4 +38,3 @@ void sk_blit_above(SkBlitter*, const SkIRect& avoid, const SkRegion& clip);
 void sk_blit_below(SkBlitter*, const SkIRect& avoid, const SkRegion& clip);
 
 #endif
-
diff --git a/src/core/SkScan_AntiPath.cpp b/src/core/SkScan_AntiPath.cpp
index fdd0c8e676..0d2152c7c1 100644
--- a/src/core/SkScan_AntiPath.cpp
+++ b/src/core/SkScan_AntiPath.cpp
@@ -744,4 +744,3 @@ void SkScan::AntiFillPath(const SkPath& path, const SkRasterClip& clip,
         SkScan::AntiFillPath(path, tmp, &aaBlitter, true);
     }
 }
-
diff --git a/src/core/SkScan_Antihair.cpp b/src/core/SkScan_Antihair.cpp
index b671a7ba5a..a6a0869f22 100644
--- a/src/core/SkScan_Antihair.cpp
+++ b/src/core/SkScan_Antihair.cpp
@@ -1062,4 +1062,3 @@ void SkScan::AntiFrameRect(const SkRect& r, const SkPoint& strokeSize,
         AntiFrameRect(r, strokeSize, &wrap.getRgn(), wrap.getBlitter());
     }
 }
-
diff --git a/src/core/SkScan_Path.cpp b/src/core/SkScan_Path.cpp
index a68f2a74f9..66e9507678 100644
--- a/src/core/SkScan_Path.cpp
+++ b/src/core/SkScan_Path.cpp
@@ -727,4 +727,3 @@ void SkScan::FillTriangle(const SkPoint pts[], const SkRasterClip& clip,
         sk_fill_triangle(pts, clipper.getClipRect(), blitter, ir);
     }
 }
-
diff --git a/src/core/SkSpriteBlitter.h b/src/core/SkSpriteBlitter.h
index c1dbfa2a7c..ae79afe1d8 100644
--- a/src/core/SkSpriteBlitter.h
+++ b/src/core/SkSpriteBlitter.h
@@ -44,4 +44,3 @@ protected:
 };
 
 #endif
-
diff --git a/src/core/SkStroke.cpp b/src/core/SkStroke.cpp
index e811471cbe..cc98d7428a 100644
--- a/src/core/SkStroke.cpp
+++ b/src/core/SkStroke.cpp
@@ -804,4 +804,3 @@ void SkStroke::strokeRect(const SkRect& origRect, SkPath* dst,
         dst->addRect(r, reverse_direction(dir));
     }
 }
-
diff --git a/src/core/SkStroke.h b/src/core/SkStroke.h
index 48805165cb..a6a9f08331 100644
--- a/src/core/SkStroke.h
+++ b/src/core/SkStroke.h
@@ -54,4 +54,3 @@ private:
 };
 
 #endif
-
diff --git a/src/core/SkStrokeRec.cpp b/src/core/SkStrokeRec.cpp
index 756872bdfb..cdaf241366 100644
--- a/src/core/SkStrokeRec.cpp
+++ b/src/core/SkStrokeRec.cpp
@@ -103,4 +103,3 @@ bool SkStrokeRec::applyToPath(SkPath* dst, const SkPath& src) const {
     stroker.strokePath(src, dst);
     return true;
 }
-
diff --git a/src/core/SkStrokerPriv.cpp b/src/core/SkStrokerPriv.cpp
index 0a0a581e8e..269ebd3dbd 100644
--- a/src/core/SkStrokerPriv.cpp
+++ b/src/core/SkStrokerPriv.cpp
@@ -262,6 +262,3 @@ SkStrokerPriv::JoinProc SkStrokerPriv::JoinFactory(SkPaint::Join join)
     SkASSERT((unsigned)join < SkPaint::kJoinCount);
     return gJoiners[join];
 }
-
-
-
diff --git a/src/core/SkStrokerPriv.h b/src/core/SkStrokerPriv.h
index e67d6774e0..1c35f0a8ea 100644
--- a/src/core/SkStrokerPriv.h
+++ b/src/core/SkStrokerPriv.h
@@ -39,4 +39,3 @@ public:
 };
 
 #endif
-
diff --git a/src/core/SkTLS.cpp b/src/core/SkTLS.cpp
index e4f61881b0..f7bf3048c3 100755
--- a/src/core/SkTLS.cpp
+++ b/src/core/SkTLS.cpp
@@ -121,4 +121,3 @@ void SkTLS::Delete(CreateProc createProc) {
         curr = next;
     }
 }
-
diff --git a/src/core/SkTSearch.cpp b/src/core/SkTSearch.cpp
index 801c0d6ef5..64c70cb311 100644
--- a/src/core/SkTSearch.cpp
+++ b/src/core/SkTSearch.cpp
@@ -112,4 +112,3 @@ SkAutoAsciiToLC::~SkAutoAsciiToLC()
         sk_free(fLC);
     }
 }
-
diff --git a/src/core/SkTypeface.cpp b/src/core/SkTypeface.cpp
index 94bb237b84..c30e5a9f6d 100644
--- a/src/core/SkTypeface.cpp
+++ b/src/core/SkTypeface.cpp
@@ -134,4 +134,3 @@ int SkTypeface::getUnitsPerEm() const {
 #endif
     return upem;
 }
-
diff --git a/src/core/SkTypefaceCache.cpp b/src/core/SkTypefaceCache.cpp
index ee5ced908c..bb83d55121 100644
--- a/src/core/SkTypefaceCache.cpp
+++ b/src/core/SkTypefaceCache.cpp
@@ -145,4 +145,3 @@ void SkTypefaceCache::Dump() {
     (void)Get().findByProcAndRef(DumpProc, NULL);
 #endif
 }
-
diff --git a/src/core/SkUtils.cpp b/src/core/SkUtils.cpp
index fe498ceba1..1af64c2aea 100644
--- a/src/core/SkUtils.cpp
+++ b/src/core/SkUtils.cpp
@@ -428,4 +428,3 @@ SkAutoMemoryUsageProbe::~SkAutoMemoryUsageProbe() {
             round_to_K(mi.uordblks));
 #endif
 }
-
diff --git a/src/core/SkWriter32.cpp b/src/core/SkWriter32.cpp
index 611bac73f0..56edd19698 100644
--- a/src/core/SkWriter32.cpp
+++ b/src/core/SkWriter32.cpp
@@ -294,5 +294,3 @@ size_t SkWriter32::WriteStringSize(const char* str, size_t len) {
     // add 1 since we also write a terminating 0
     return SkAlign4(lenBytes + len + 1);
 }
-
-
diff --git a/src/device/xps/SkXPSDevice.cpp b/src/device/xps/SkXPSDevice.cpp
index 931a07c496..2f01123c5e 100644
--- a/src/device/xps/SkXPSDevice.cpp
+++ b/src/device/xps/SkXPSDevice.cpp
@@ -2422,4 +2422,3 @@ SkXPSDevice::SkXPSDevice(IXpsOMObjectFactory* xpsFactory)
 bool SkXPSDevice::allowImageFilter(SkImageFilter*) {
     return false;
 }
-
diff --git a/src/effects/SkArithmeticMode.cpp b/src/effects/SkArithmeticMode.cpp
index df6ff50fe4..7492cce5ec 100644
--- a/src/effects/SkArithmeticMode.cpp
+++ b/src/effects/SkArithmeticMode.cpp
@@ -191,5 +191,3 @@ SkXfermode* SkArithmeticMode::Create(SkScalar k1, SkScalar k2,
     }
     return SkNEW_ARGS(SkArithmeticMode_scalar, (k1, k2, k3, k4));
 }
-
-
diff --git a/src/effects/SkBlurMask.h b/src/effects/SkBlurMask.h
index b46576ceeb..853ba52855 100644
--- a/src/effects/SkBlurMask.h
+++ b/src/effects/SkBlurMask.h
@@ -45,6 +45,3 @@ private:
 };
 
 #endif
-
-
-
diff --git a/src/effects/SkColorFilters.cpp b/src/effects/SkColorFilters.cpp
index 6ce96fc77a..a14babc7cd 100644
--- a/src/effects/SkColorFilters.cpp
+++ b/src/effects/SkColorFilters.cpp
@@ -490,4 +490,3 @@ SK_DEFINE_FLATTENABLE_REGISTRAR_GROUP_START(SkColorFilter)
     SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(SkLightingColorFilter_NoPin)
     SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(SkSimpleColorFilter)
 SK_DEFINE_FLATTENABLE_REGISTRAR_GROUP_END
-
diff --git a/src/effects/SkColorMatrix.cpp b/src/effects/SkColorMatrix.cpp
index 98e2865601..d6cb9405fc 100644
--- a/src/effects/SkColorMatrix.cpp
+++ b/src/effects/SkColorMatrix.cpp
@@ -159,4 +159,3 @@ void SkColorMatrix::setYUV2RGB() {
     setrow(fMat + 10, SK_Scalar1, kU2B, 0);
     fMat[18] = SK_Scalar1;
 }
-
diff --git a/src/effects/SkEmbossMask.cpp b/src/effects/SkEmbossMask.cpp
index 300494b448..32e9b232ae 100644
--- a/src/effects/SkEmbossMask.cpp
+++ b/src/effects/SkEmbossMask.cpp
@@ -161,5 +161,3 @@ void SkEmbossMask::Emboss(SkMask* mask, const SkEmbossMaskFilter::Light& light)
         prev_row = rowBytes;
     }
 }
-
-
diff --git a/src/effects/SkEmbossMask.h b/src/effects/SkEmbossMask.h
index 15e24748cc..7053be2b55 100644
--- a/src/effects/SkEmbossMask.h
+++ b/src/effects/SkEmbossMask.h
@@ -18,4 +18,3 @@ public:
 };
 
 #endif
-
diff --git a/src/effects/SkKernel33MaskFilter.cpp b/src/effects/SkKernel33MaskFilter.cpp
index a8c8661359..9c42b398c7 100644
--- a/src/effects/SkKernel33MaskFilter.cpp
+++ b/src/effects/SkKernel33MaskFilter.cpp
@@ -117,4 +117,3 @@ SkKernel33MaskFilter::SkKernel33MaskFilter(SkFlattenableReadBuffer& rb)
     SkASSERT(9 == count);
     fShift = rb.readInt();
 }
-
diff --git a/src/effects/SkPaintFlagsDrawFilter.cpp b/src/effects/SkPaintFlagsDrawFilter.cpp
index 92d6f642f4..dc1c0074bc 100644
--- a/src/effects/SkPaintFlagsDrawFilter.cpp
+++ b/src/effects/SkPaintFlagsDrawFilter.cpp
@@ -18,4 +18,3 @@ bool SkPaintFlagsDrawFilter::filter(SkPaint* paint, Type) {
     paint->setFlags((paint->getFlags() & ~fClearFlags) | fSetFlags);
     return true;
 }
-
diff --git a/src/effects/SkPorterDuff.cpp b/src/effects/SkPorterDuff.cpp
index 8acb3453cf..4dc9783d2b 100644
--- a/src/effects/SkPorterDuff.cpp
+++ b/src/effects/SkPorterDuff.cpp
@@ -85,4 +85,3 @@ SkXfermodeProc SkPorterDuff::GetXfermodeProc(Mode mode) {
 SkXfermodeProc16 SkPorterDuff::GetXfermodeProc16(Mode mode, SkColor srcColor) {
     return SkXfermode::GetProc16(gPairs[mode].fXF, srcColor);
 }
-
diff --git a/src/effects/SkTableMaskFilter.cpp b/src/effects/SkTableMaskFilter.cpp
index 73b7fa614c..ada5d01217 100644
--- a/src/effects/SkTableMaskFilter.cpp
+++ b/src/effects/SkTableMaskFilter.cpp
@@ -126,4 +126,3 @@ void SkTableMaskFilter::MakeClipTable(uint8_t table[256], uint8_t min,
     SkDebugf("\n\n");
 #endif
 }
-
diff --git a/src/effects/gradients/SkBitmapCache.cpp b/src/effects/gradients/SkBitmapCache.cpp
index 91f67ec23d..95175e4fb6 100644
--- a/src/effects/gradients/SkBitmapCache.cpp
+++ b/src/effects/gradients/SkBitmapCache.cpp
@@ -151,4 +151,3 @@ void SkBitmapCache::validate() const {
 }
 
 #endif
-
diff --git a/src/effects/gradients/SkBitmapCache.h b/src/effects/gradients/SkBitmapCache.h
index ea9cf91942..d2af5e136f 100644
--- a/src/effects/gradients/SkBitmapCache.h
+++ b/src/effects/gradients/SkBitmapCache.h
@@ -47,4 +47,3 @@ private:
 };
 
 #endif
-
diff --git a/src/effects/gradients/SkClampRange.cpp b/src/effects/gradients/SkClampRange.cpp
index c4bf8b1906..3e2ca8e932 100644
--- a/src/effects/gradients/SkClampRange.cpp
+++ b/src/effects/gradients/SkClampRange.cpp
@@ -163,4 +163,3 @@ void SkClampRange::init(SkFixed fx0, SkFixed dx0, int count, int v0, int v1) {
         fCount0 += extraCount;
     }
 }
-
diff --git a/src/effects/gradients/SkClampRange.h b/src/effects/gradients/SkClampRange.h
index 68a27e9618..376dc93b4b 100644
--- a/src/effects/gradients/SkClampRange.h
+++ b/src/effects/gradients/SkClampRange.h
@@ -36,4 +36,3 @@ private:
 };
 
 #endif
-
diff --git a/src/effects/gradients/SkLinearGradient.h b/src/effects/gradients/SkLinearGradient.h
index 046a1e10b4..ff1796bd1f 100644
--- a/src/effects/gradients/SkLinearGradient.h
+++ b/src/effects/gradients/SkLinearGradient.h
@@ -38,4 +38,3 @@ private:
 };
 
 #endif
-
diff --git a/src/effects/gradients/SkRadialGradient.h b/src/effects/gradients/SkRadialGradient.h
index 88530cd51e..83f79aef94 100644
--- a/src/effects/gradients/SkRadialGradient.h
+++ b/src/effects/gradients/SkRadialGradient.h
@@ -40,4 +40,3 @@ private:
 };
 
 #endif
-
diff --git a/src/effects/gradients/SkSweepGradient.h b/src/effects/gradients/SkSweepGradient.h
index 95c1419b6f..d57242989d 100644
--- a/src/effects/gradients/SkSweepGradient.h
+++ b/src/effects/gradients/SkSweepGradient.h
@@ -39,4 +39,3 @@ private:
 };
 
 #endif
-
diff --git a/src/effects/gradients/SkTwoPointConicalGradient.h b/src/effects/gradients/SkTwoPointConicalGradient.h
index 32a7b80ed8..e02c390ab4 100644
--- a/src/effects/gradients/SkTwoPointConicalGradient.h
+++ b/src/effects/gradients/SkTwoPointConicalGradient.h
@@ -83,4 +83,3 @@ private:
 };
 
 #endif
-
diff --git a/src/effects/gradients/SkTwoPointRadialGradient.h b/src/effects/gradients/SkTwoPointRadialGradient.h
index 273d1c932e..e82fc75c93 100644
--- a/src/effects/gradients/SkTwoPointRadialGradient.h
+++ b/src/effects/gradients/SkTwoPointRadialGradient.h
@@ -55,4 +55,3 @@ private:
 };
 
 #endif
-
diff --git a/src/gpu/FlingState.cpp b/src/gpu/FlingState.cpp
index 8d9e1c5607..f0db5016bd 100644
--- a/src/gpu/FlingState.cpp
+++ b/src/gpu/FlingState.cpp
@@ -123,5 +123,3 @@ float GrAnimateFloat::evaluate() {
     }
     return fValue0 + t * (fValue1 - fValue0);
 }
-
-
diff --git a/src/gpu/GrAAConvexPathRenderer.cpp b/src/gpu/GrAAConvexPathRenderer.cpp
index e0a80d3399..4efc43a0db 100644
--- a/src/gpu/GrAAConvexPathRenderer.cpp
+++ b/src/gpu/GrAAConvexPathRenderer.cpp
@@ -501,4 +501,3 @@ bool GrAAConvexPathRenderer::onDrawPath(const SkPath& origPath,
 
     return true;
 }
-
diff --git a/src/gpu/GrAAHairLinePathRenderer.cpp b/src/gpu/GrAAHairLinePathRenderer.cpp
index 347e4b5bee..df7aca8984 100644
--- a/src/gpu/GrAAHairLinePathRenderer.cpp
+++ b/src/gpu/GrAAHairLinePathRenderer.cpp
@@ -624,4 +624,3 @@ bool GrAAHairLinePathRenderer::onDrawPath(const SkPath& path,
     drawState->setVertexEdgeType(oldEdgeType);
     return true;
 }
-
diff --git a/src/gpu/GrAAHairLinePathRenderer.h b/src/gpu/GrAAHairLinePathRenderer.h
index 20be696745..7d1a6db5d2 100644
--- a/src/gpu/GrAAHairLinePathRenderer.h
+++ b/src/gpu/GrAAHairLinePathRenderer.h
@@ -48,4 +48,3 @@ private:
 
 
 #endif
-
diff --git a/src/gpu/GrAllocPool.cpp b/src/gpu/GrAllocPool.cpp
index 39f8350c16..971f8ee116 100644
--- a/src/gpu/GrAllocPool.cpp
+++ b/src/gpu/GrAllocPool.cpp
@@ -116,5 +116,3 @@ void GrAllocPool::validate() const {
 }
 
 #endif
-
-
diff --git a/src/gpu/GrAllocPool.h b/src/gpu/GrAllocPool.h
index 3489cb9563..4f58f006df 100644
--- a/src/gpu/GrAllocPool.h
+++ b/src/gpu/GrAllocPool.h
@@ -61,4 +61,3 @@ private:
 };
 
 #endif
-
diff --git a/src/gpu/GrAtlas.h b/src/gpu/GrAtlas.h
index 005598e28d..40a21545e1 100644
--- a/src/gpu/GrAtlas.h
+++ b/src/gpu/GrAtlas.h
@@ -79,5 +79,3 @@ private:
 };
 
 #endif
-
-
diff --git a/src/gpu/GrClipData.cpp b/src/gpu/GrClipData.cpp
index 7c84c18a9b..ce9dcdf44f 100644
--- a/src/gpu/GrClipData.cpp
+++ b/src/gpu/GrClipData.cpp
@@ -32,4 +32,3 @@ void GrClipData::getConservativeBounds(const GrSurface* surface,
 
     devBounds.roundOut(devResult);
 }
-
diff --git a/src/gpu/GrClipMaskCache.cpp b/src/gpu/GrClipMaskCache.cpp
index b7cfb65087..470cc4a256 100644
--- a/src/gpu/GrClipMaskCache.cpp
+++ b/src/gpu/GrClipMaskCache.cpp
@@ -19,4 +19,3 @@ GrClipMaskCache::GrClipMaskCache()
 void GrClipMaskCache::push() {
     SkNEW_PLACEMENT(fStack.push_back(), GrClipStackFrame);
 }
-
diff --git a/src/gpu/GrGpu.cpp b/src/gpu/GrGpu.cpp
index d6a6e44ca8..2eb5ad756c 100644
--- a/src/gpu/GrGpu.cpp
+++ b/src/gpu/GrGpu.cpp
@@ -557,4 +557,3 @@ void GrGpu::releaseIndexArray() {
     fIndexPool->putBack(bytes);
     --fIndexPoolUseCnt;
 }
-
diff --git a/src/gpu/GrGpuVertex.h b/src/gpu/GrGpuVertex.h
index a5e39e8ab2..19a0b01e54 100644
--- a/src/gpu/GrGpuVertex.h
+++ b/src/gpu/GrGpuVertex.h
@@ -94,4 +94,3 @@ struct GrGpuTextVertex {
 };
 
 #endif
-
diff --git a/src/gpu/GrMemory.cpp b/src/gpu/GrMemory.cpp
index f6d3c7f06e..bf96b0bc31 100644
--- a/src/gpu/GrMemory.cpp
+++ b/src/gpu/GrMemory.cpp
@@ -24,5 +24,3 @@ void GrFree(void* ptr) {
         ::free(ptr);
     }
 }
-
-
diff --git a/src/gpu/GrMemoryPool.cpp b/src/gpu/GrMemoryPool.cpp
index 2518a7486f..fc777e0db0 100644
--- a/src/gpu/GrMemoryPool.cpp
+++ b/src/gpu/GrMemoryPool.cpp
@@ -159,4 +159,3 @@ void GrMemoryPool::validate() {
     GrAssert(prev == fTail);
 #endif
 }
-
diff --git a/src/gpu/GrPathRenderer.cpp b/src/gpu/GrPathRenderer.cpp
index 1daa6c9f2f..e0d2682bcd 100644
--- a/src/gpu/GrPathRenderer.cpp
+++ b/src/gpu/GrPathRenderer.cpp
@@ -12,4 +12,3 @@ SK_DEFINE_INST_COUNT(GrPathRenderer)
 
 GrPathRenderer::GrPathRenderer() {
 }
-
diff --git a/src/gpu/GrPathRenderer.h b/src/gpu/GrPathRenderer.h
index fa2112c410..ebd464ffb3 100644
--- a/src/gpu/GrPathRenderer.h
+++ b/src/gpu/GrPathRenderer.h
@@ -179,4 +179,3 @@ private:
 };
 
 #endif
-
diff --git a/src/gpu/GrPlotMgr.h b/src/gpu/GrPlotMgr.h
index 6dd7114c06..4f79a2135e 100644
--- a/src/gpu/GrPlotMgr.h
+++ b/src/gpu/GrPlotMgr.h
@@ -74,4 +74,3 @@ private:
 };
 
 #endif
-
diff --git a/src/gpu/GrRectanizer.cpp b/src/gpu/GrRectanizer.cpp
index 652cc29742..75ff92c7ee 100644
--- a/src/gpu/GrRectanizer.cpp
+++ b/src/gpu/GrRectanizer.cpp
@@ -119,5 +119,3 @@ bool GrRectanizerPow2::addRect(int width, int height, GrIPoint16* loc) {
 GrRectanizer* GrRectanizer::Factory(int width, int height) {
     return SkNEW_ARGS(GrRectanizerPow2, (width, height));
 }
-
-
diff --git a/src/gpu/GrRectanizer.h b/src/gpu/GrRectanizer.h
index 0be83249b3..44d14a1c03 100644
--- a/src/gpu/GrRectanizer.h
+++ b/src/gpu/GrRectanizer.h
@@ -52,5 +52,3 @@ private:
 };
 
 #endif
-
-
diff --git a/src/gpu/GrRectanizer_fifo.cpp b/src/gpu/GrRectanizer_fifo.cpp
index aab012de6a..b6ef1d9a88 100644
--- a/src/gpu/GrRectanizer_fifo.cpp
+++ b/src/gpu/GrRectanizer_fifo.cpp
@@ -119,5 +119,3 @@ bool GrRectanizerFIFO::addRect(int width, int height, GrIPoint16* loc) {
 GrRectanizer* GrRectanizer::Factory(int width, int height) {
     return SkNEW_ARGS(GrRectanizerFIFO, (width, height));
 }
-
-
diff --git a/src/gpu/GrSWMaskHelper.cpp b/src/gpu/GrSWMaskHelper.cpp
index 0a4fe6a8dd..6d27d873b3 100644
--- a/src/gpu/GrSWMaskHelper.cpp
+++ b/src/gpu/GrSWMaskHelper.cpp
@@ -214,4 +214,3 @@ void GrSWMaskHelper::DrawToTargetWithPathMask(GrTexture* texture,
     target->drawRect(dstRect, NULL, srcRects, NULL);
     drawState->disableStage(kPathMaskStage);
 }
-
diff --git a/src/gpu/GrSurface.cpp b/src/gpu/GrSurface.cpp
index 3fd90d912c..47d9959d26 100644
--- a/src/gpu/GrSurface.cpp
+++ b/src/gpu/GrSurface.cpp
@@ -8,4 +8,3 @@
 #include "GrSurface.h"
 
 SK_DEFINE_INST_COUNT(GrSurface)
-
diff --git a/src/gpu/GrTBSearch.h b/src/gpu/GrTBSearch.h
index 1d77c958c1..cee4f2a414 100644
--- a/src/gpu/GrTBSearch.h
+++ b/src/gpu/GrTBSearch.h
@@ -43,4 +43,3 @@ int GrTBSearch(const ELEM array[], int count, KEY target) {
 }
 
 #endif
-
diff --git a/src/gpu/GrTHashCache.h b/src/gpu/GrTHashCache.h
index c75a5a79ce..b73b5748f5 100644
--- a/src/gpu/GrTHashCache.h
+++ b/src/gpu/GrTHashCache.h
@@ -243,4 +243,3 @@ bool GrTHashTable<T, Key, kHashBits>::contains(T* elem) const {
 #endif
 
 #endif
-
diff --git a/src/gpu/GrTextContext.cpp b/src/gpu/GrTextContext.cpp
index fd7a6891e8..9daa31572f 100644
--- a/src/gpu/GrTextContext.cpp
+++ b/src/gpu/GrTextContext.cpp
@@ -263,4 +263,3 @@ HAS_ATLAS:
 #endif
     fCurrVertex += 4;
 }
-
diff --git a/src/gpu/GrTextStrike.cpp b/src/gpu/GrTextStrike.cpp
index 4b55810660..4b4298a96c 100644
--- a/src/gpu/GrTextStrike.cpp
+++ b/src/gpu/GrTextStrike.cpp
@@ -207,5 +207,3 @@ bool GrTextStrike::getGlyphAtlas(GrGlyph* glyph, GrFontScaler* scaler) {
     glyph->fAtlas = fAtlas = atlas;
     return true;
 }
-
-
diff --git a/src/gpu/GrTextStrike.h b/src/gpu/GrTextStrike.h
index 701acea7ab..25ced6de9b 100644
--- a/src/gpu/GrTextStrike.h
+++ b/src/gpu/GrTextStrike.h
@@ -112,4 +112,3 @@ private:
 };
 
 #endif
-
diff --git a/src/gpu/GrTextStrike_impl.h b/src/gpu/GrTextStrike_impl.h
index a3f37b3a7b..48323bcc25 100644
--- a/src/gpu/GrTextStrike_impl.h
+++ b/src/gpu/GrTextStrike_impl.h
@@ -103,4 +103,3 @@ GrGlyph* GrTextStrike::getGlyph(GrGlyph::PackedID packed,
 }
 
 #endif
-
diff --git a/src/gpu/SkGrFontScaler.cpp b/src/gpu/SkGrFontScaler.cpp
index dc637a8176..acecbd955a 100644
--- a/src/gpu/SkGrFontScaler.cpp
+++ b/src/gpu/SkGrFontScaler.cpp
@@ -199,6 +199,3 @@ bool SkGrFontScaler::getGlyphPath(uint16_t glyphID, SkPath* path) {
     }
     return false;
 }
-
-
-
diff --git a/src/gpu/SkGrPixelRef.cpp b/src/gpu/SkGrPixelRef.cpp
index 081c09f91c..f8160ab9fe 100644
--- a/src/gpu/SkGrPixelRef.cpp
+++ b/src/gpu/SkGrPixelRef.cpp
@@ -177,4 +177,3 @@ bool SkGrPixelRef::onReadPixels(SkBitmap* dst, const SkIRect* subset) {
                                 kSkia8888_PM_GrPixelConfig,
                                 buffer, dst->rowBytes());
 }
-
diff --git a/src/gpu/effects/GrTextureStripAtlas.h b/src/gpu/effects/GrTextureStripAtlas.h
index 1e1e5088c7..9ac356b4cc 100644
--- a/src/gpu/effects/GrTextureStripAtlas.h
+++ b/src/gpu/effects/GrTextureStripAtlas.h
@@ -179,4 +179,3 @@ private:
 };
 
 #endif
-
diff --git a/src/gpu/gl/GrGLCaps.cpp b/src/gpu/gl/GrGLCaps.cpp
index ec80cda760..b140a100da 100644
--- a/src/gpu/gl/GrGLCaps.cpp
+++ b/src/gpu/gl/GrGLCaps.cpp
@@ -426,4 +426,3 @@ void GrGLCaps::print() const {
     GrPrintf("Two Format Limit: %s\n", (fTwoFormatLimit ? "YES": "NO"));
     GrPrintf("Fragment coord conventions support: %s\n", (fFragCoordsConventionSupport ? "YES": "NO"));
 }
-
diff --git a/src/gpu/gl/GrGLContextInfo.cpp b/src/gpu/gl/GrGLContextInfo.cpp
index 060d236b22..7a33ac7fee 100644
--- a/src/gpu/gl/GrGLContextInfo.cpp
+++ b/src/gpu/gl/GrGLContextInfo.cpp
@@ -83,4 +83,3 @@ bool GrGLContextInfo::initialize(const GrGLInterface* interface) {
 bool GrGLContextInfo::isInitialized() const {
     return kNone_GrGLBinding != fBindingInUse;
 }
-
diff --git a/src/gpu/gl/GrGLInterface.cpp b/src/gpu/gl/GrGLInterface.cpp
index 297e1fc1d9..61020bc2e3 100644
--- a/src/gpu/gl/GrGLInterface.cpp
+++ b/src/gpu/gl/GrGLInterface.cpp
@@ -346,4 +346,3 @@ bool GrGLInterface::validate(GrGLBinding binding) const {
 
     return true;
 }
-
diff --git a/src/gpu/gl/GrGLUtil.cpp b/src/gpu/gl/GrGLUtil.cpp
index 55236aab14..3f110cc49f 100644
--- a/src/gpu/gl/GrGLUtil.cpp
+++ b/src/gpu/gl/GrGLUtil.cpp
@@ -205,4 +205,3 @@ GrGLVendor GrGLGetVendor(const GrGLInterface* gl) {
     GR_GL_CALL_RET(gl, v, GetString(GR_GL_VENDOR));
     return GrGLGetVendorFromString((const char*) v);
 }
-
diff --git a/src/gpu/gl/GrGpuGL.h b/src/gpu/gl/GrGpuGL.h
index 97b95d05b5..fd391d80b9 100644
--- a/src/gpu/gl/GrGpuGL.h
+++ b/src/gpu/gl/GrGpuGL.h
@@ -362,4 +362,3 @@ private:
 };
 
 #endif
-
diff --git a/src/gpu/gl/angle/GrGLCreateANGLEInterface.cpp b/src/gpu/gl/angle/GrGLCreateANGLEInterface.cpp
index 19fe44f6d8..bc1e0ee6c3 100644
--- a/src/gpu/gl/angle/GrGLCreateANGLEInterface.cpp
+++ b/src/gpu/gl/angle/GrGLCreateANGLEInterface.cpp
@@ -153,4 +153,3 @@ const GrGLInterface* GrGLCreateANGLEInterface() {
     glInterface.get()->ref();
     return glInterface.get();
 }
-
diff --git a/src/gpu/gl/debug/GrTextureUnitObj.cpp b/src/gpu/gl/debug/GrTextureUnitObj.cpp
index b7c7b0ca57..316dcecd93 100644
--- a/src/gpu/gl/debug/GrTextureUnitObj.cpp
+++ b/src/gpu/gl/debug/GrTextureUnitObj.cpp
@@ -29,4 +29,3 @@ void GrTextureUnitObj::setTexture(GrTextureObj *texture)  {
         fTexture->setBound(this);
     }
 }
-
diff --git a/src/image/SkImage.cpp b/src/image/SkImage.cpp
index b6fc4899da..b388d58a3b 100644
--- a/src/image/SkImage.cpp
+++ b/src/image/SkImage.cpp
@@ -31,4 +31,3 @@ void SkImage::draw(SkCanvas* canvas, SkScalar x, SkScalar y,
                    const SkPaint* paint) {
     asIB(this)->onDraw(canvas, x, y, paint);
 }
-
diff --git a/src/image/SkImagePriv.cpp b/src/image/SkImagePriv.cpp
index e10a44c28c..c44e439b72 100644
--- a/src/image/SkImagePriv.cpp
+++ b/src/image/SkImagePriv.cpp
@@ -141,4 +141,3 @@ void SkImagePrivDrawPicture(SkCanvas* canvas, SkPicture* picture,
     canvas->drawPicture(*picture);
     canvas->restoreToCount(saveCount);
 }
-
diff --git a/src/image/SkImage_Base.h b/src/image/SkImage_Base.h
index 648b25914f..2687025a81 100644
--- a/src/image/SkImage_Base.h
+++ b/src/image/SkImage_Base.h
@@ -21,4 +21,3 @@ private:
 };
 
 #endif
-
diff --git a/src/image/SkImage_Codec.cpp b/src/image/SkImage_Codec.cpp
index b46ac2d8ab..9d81dc943a 100644
--- a/src/image/SkImage_Codec.cpp
+++ b/src/image/SkImage_Codec.cpp
@@ -64,4 +64,3 @@ SkImage* SkImage::NewEncodedData(SkData* data) {
 
     return SkNEW_ARGS(SkImage_Codec, (data, bitmap.width(), bitmap.height()));
 }
-
diff --git a/src/image/SkImage_Picture.cpp b/src/image/SkImage_Picture.cpp
index 959e47bd06..447299f49d 100644
--- a/src/image/SkImage_Picture.cpp
+++ b/src/image/SkImage_Picture.cpp
@@ -52,4 +52,3 @@ SkImage* SkNewImageFromPicture(const SkPicture* srcPicture) {
 
     return SkNEW_ARGS(SkImage_Picture, (playback));
 }
-
diff --git a/src/image/SkImage_Raster.cpp b/src/image/SkImage_Raster.cpp
index 8638052fc5..d4ed171f10 100644
--- a/src/image/SkImage_Raster.cpp
+++ b/src/image/SkImage_Raster.cpp
@@ -159,4 +159,3 @@ SkImage* SkNewImageFromPixelRef(const SkImage::Info& info, SkPixelRef* pr,
 SkPixelRef* SkBitmapImageGetPixelRef(SkImage* image) {
     return ((SkImage_Raster*)image)->getPixelRef();
 }
-
diff --git a/src/image/SkSurface.cpp b/src/image/SkSurface.cpp
index 6547780438..37995b1c1d 100644
--- a/src/image/SkSurface.cpp
+++ b/src/image/SkSurface.cpp
@@ -131,4 +131,3 @@ void SkSurface::draw(SkCanvas* canvas, SkScalar x, SkScalar y,
                      const SkPaint* paint) {
     return asSB(this)->onDraw(canvas, x, y, paint);
 }
-
diff --git a/src/image/SkSurface_Base.h b/src/image/SkSurface_Base.h
index e5ca498b85..b9c4890c66 100644
--- a/src/image/SkSurface_Base.h
+++ b/src/image/SkSurface_Base.h
@@ -73,4 +73,3 @@ private:
 };
 
 #endif
-
diff --git a/src/image/SkSurface_Gpu.cpp b/src/image/SkSurface_Gpu.cpp
index 74fbe0b0b2..c4975774b7 100644
--- a/src/image/SkSurface_Gpu.cpp
+++ b/src/image/SkSurface_Gpu.cpp
@@ -144,4 +144,3 @@ SkSurface* SkSurface::NewRenderTarget(GrContext* ctx, const SkImage::Info& info,
 
     return SkNEW_ARGS(SkSurface_Gpu, (ctx, tex->asRenderTarget()));
 }
-
diff --git a/src/image/SkSurface_Picture.cpp b/src/image/SkSurface_Picture.cpp
index 54998445bc..ba3ee638d0 100644
--- a/src/image/SkSurface_Picture.cpp
+++ b/src/image/SkSurface_Picture.cpp
@@ -91,4 +91,3 @@ SkSurface* SkSurface::NewPicture(int width, int height) {
 
     return SkNEW_ARGS(SkSurface_Picture, (width, height));
 }
-
diff --git a/src/image/SkSurface_Raster.cpp b/src/image/SkSurface_Raster.cpp
index 455ef1be5a..6e972dda9e 100644
--- a/src/image/SkSurface_Raster.cpp
+++ b/src/image/SkSurface_Raster.cpp
@@ -171,4 +171,3 @@ SkSurface* SkSurface::NewRaster(const SkImage::Info& info) {
     SkAutoTUnref<SkPixelRef> pr(SkNEW_ARGS(SkMallocPixelRef, (pixels, size, NULL, true)));
     return SkNEW_ARGS(SkSurface_Raster, (info, pr, rowBytes));
 }
-
diff --git a/src/images/SkFDStream.cpp b/src/images/SkFDStream.cpp
index 5bf0850ee3..d38813c54d 100644
--- a/src/images/SkFDStream.cpp
+++ b/src/images/SkFDStream.cpp
@@ -89,4 +89,3 @@ size_t SkFDStream::read(void* buffer, size_t size) {
     }
     return 0;
 }
-
diff --git a/src/images/SkImageDecoder.cpp b/src/images/SkImageDecoder.cpp
index 2980896ddb..a0d7ba9f2a 100644
--- a/src/images/SkImageDecoder.cpp
+++ b/src/images/SkImageDecoder.cpp
@@ -191,4 +191,3 @@ bool SkImageDecoder::DecodeStream(SkStream* stream, SkBitmap* bm,
     }
     return success;
 }
-
diff --git a/src/images/SkImageDecoder_libico.cpp b/src/images/SkImageDecoder_libico.cpp
index 5167fe1adb..edfaa2e62b 100644
--- a/src/images/SkImageDecoder_libico.cpp
+++ b/src/images/SkImageDecoder_libico.cpp
@@ -390,4 +390,3 @@ static SkImageDecoder* sk_libico_dfactory(SkStream* stream) {
 }
 
 static SkTRegistry<SkImageDecoder*, SkStream*> gReg(sk_libico_dfactory);
-
diff --git a/src/images/SkImageDecoder_libjpeg.cpp b/src/images/SkImageDecoder_libjpeg.cpp
index 6bae965e42..867c41cb62 100644
--- a/src/images/SkImageDecoder_libjpeg.cpp
+++ b/src/images/SkImageDecoder_libjpeg.cpp
@@ -679,4 +679,3 @@ static SkImageEncoder* sk_libjpeg_efactory(SkImageEncoder::Type t) {
 
 static SkTRegistry<SkImageDecoder*, SkStream*> gDReg(sk_libjpeg_dfactory);
 static SkTRegistry<SkImageEncoder*, SkImageEncoder::Type> gEReg(sk_libjpeg_efactory);
-
diff --git a/src/images/SkImageDecoder_wbmp.cpp b/src/images/SkImageDecoder_wbmp.cpp
index 175a444008..c475ec126e 100644
--- a/src/images/SkImageDecoder_wbmp.cpp
+++ b/src/images/SkImageDecoder_wbmp.cpp
@@ -161,4 +161,3 @@ static SkImageDecoder* sk_wbmp_dfactory(SkStream* stream) {
 }
 
 static SkTRegistry<SkImageDecoder*, SkStream*> gReg(sk_wbmp_dfactory);
-
diff --git a/src/images/SkImageEncoder.cpp b/src/images/SkImageEncoder.cpp
index e05a28cbdb..4b52fcdc8c 100644
--- a/src/images/SkImageEncoder.cpp
+++ b/src/images/SkImageEncoder.cpp
@@ -38,4 +38,3 @@ bool SkImageEncoder::EncodeStream(SkWStream* stream, const SkBitmap& bm, Type t,
     SkAutoTDelete<SkImageEncoder> enc(SkImageEncoder::Create(t));
     return enc.get() && enc.get()->encodeStream(stream, bm, quality);
 }
-
diff --git a/src/images/SkImageRef.cpp b/src/images/SkImageRef.cpp
index 39a1de9302..3ed62fb98b 100644
--- a/src/images/SkImageRef.cpp
+++ b/src/images/SkImageRef.cpp
@@ -198,4 +198,3 @@ void SkImageRef::flatten(SkFlattenableWriteBuffer& buffer) const {
     fStream->rewind();
     buffer.writeStream(fStream, fStream->getLength());
 }
-
diff --git a/src/images/SkImageRefPool.cpp b/src/images/SkImageRefPool.cpp
index b8bbfd2f6e..0a3d7bf8cc 100644
--- a/src/images/SkImageRefPool.cpp
+++ b/src/images/SkImageRefPool.cpp
@@ -190,4 +190,3 @@ void SkImageRefPool::dump() const {
     }
 #endif
 }
-
diff --git a/src/images/SkImageRefPool.h b/src/images/SkImageRefPool.h
index 08633ee39f..1e74a6d077 100644
--- a/src/images/SkImageRefPool.h
+++ b/src/images/SkImageRefPool.h
@@ -47,4 +47,3 @@ private:
 };
 
 #endif
-
diff --git a/src/images/SkMovie.cpp b/src/images/SkMovie.cpp
index e671950bb9..ea4a76c6a1 100644
--- a/src/images/SkMovie.cpp
+++ b/src/images/SkMovie.cpp
@@ -107,4 +107,3 @@ SkMovie* SkMovie::DecodeFile(const char path[])
 
     return movie;
 }
-
diff --git a/src/images/SkPageFlipper.cpp b/src/images/SkPageFlipper.cpp
index 4fd8632574..a53f47bce2 100644
--- a/src/images/SkPageFlipper.cpp
+++ b/src/images/SkPageFlipper.cpp
@@ -74,5 +74,3 @@ const SkRegion& SkPageFlipper::update(SkRegion* copyBits) {
     fDirty1->setEmpty();
     return *fDirty0;
 }
-
-
diff --git a/src/opts/SkBitmapProcState_opts_arm.cpp b/src/opts/SkBitmapProcState_opts_arm.cpp
index 8b64773a82..e044ad8129 100644
--- a/src/opts/SkBitmapProcState_opts_arm.cpp
+++ b/src/opts/SkBitmapProcState_opts_arm.cpp
@@ -218,4 +218,3 @@ void SkBitmapProcState::platformProcs() {
             break;
     }
 }
-
diff --git a/src/opts/SkBitmapProcState_opts_none.cpp b/src/opts/SkBitmapProcState_opts_none.cpp
index 82be4ea23a..3a186b5bfe 100644
--- a/src/opts/SkBitmapProcState_opts_none.cpp
+++ b/src/opts/SkBitmapProcState_opts_none.cpp
@@ -21,5 +21,3 @@
 
 // empty implementation just uses default supplied function pointers
 void SkBitmapProcState::platformProcs() {}
-
-
diff --git a/src/opts/SkBlitRect_opts_SSE2.cpp b/src/opts/SkBlitRect_opts_SSE2.cpp
index 6d8a296472..cb61813871 100644
--- a/src/opts/SkBlitRect_opts_SSE2.cpp
+++ b/src/opts/SkBlitRect_opts_SSE2.cpp
@@ -130,4 +130,3 @@ void ColorRect32_SSE2(SkPMColor* destination,
         SkBlitRow::ColorRect32(destination, width, height, rowBytes, color);
     }
 }
-
diff --git a/src/opts/SkBlitRect_opts_SSE2.h b/src/opts/SkBlitRect_opts_SSE2.h
index d3ec0e3499..4d2f74a4b1 100644
--- a/src/opts/SkBlitRect_opts_SSE2.h
+++ b/src/opts/SkBlitRect_opts_SSE2.h
@@ -21,4 +21,3 @@ void ColorRect32_SSE2(SkPMColor* SK_RESTRICT dst,
 
 
 #endif
-
diff --git a/src/opts/SkBlitRow_opts_none.cpp b/src/opts/SkBlitRow_opts_none.cpp
index 5f4598e7ae..88e1af398c 100644
--- a/src/opts/SkBlitRow_opts_none.cpp
+++ b/src/opts/SkBlitRow_opts_none.cpp
@@ -43,4 +43,3 @@ SkBlitMask::RowProc SkBlitMask::PlatformRowProcs(SkBitmap::Config dstConfig,
                                                  RowFlags flags) {
     return NULL;
 }
-
diff --git a/src/opts/SkUtils_opts_none.cpp b/src/opts/SkUtils_opts_none.cpp
index bb2558c803..d905425e40 100644
--- a/src/opts/SkUtils_opts_none.cpp
+++ b/src/opts/SkUtils_opts_none.cpp
@@ -21,5 +21,3 @@ SkMemset32Proc SkMemset32GetPlatformProc() {
 SkBlitRow::ColorRectProc PlatformColorRectProcFactory() {
     return NULL;
 }
-
-
diff --git a/src/opts/opts_check_SSE2.cpp b/src/opts/opts_check_SSE2.cpp
index 96d0dea1cf..6370058f0d 100644
--- a/src/opts/opts_check_SSE2.cpp
+++ b/src/opts/opts_check_SSE2.cpp
@@ -244,5 +244,3 @@ SkBlitRow::ColorRectProc PlatformColorRectProcFactory() {
         return NULL;
     }
 }
-
-
diff --git a/src/opts/opts_check_arm.cpp b/src/opts/opts_check_arm.cpp
index 69cedb269a..ba407d71ec 100644
--- a/src/opts/opts_check_arm.cpp
+++ b/src/opts/opts_check_arm.cpp
@@ -65,4 +65,3 @@ SkMemset32Proc SkMemset32GetPlatformProc() {
 SkBlitRow::ColorRectProc PlatformColorRectProcFactory() {
     return NULL;
 }
-
diff --git a/src/pipe/SkGPipeRead.cpp b/src/pipe/SkGPipeRead.cpp
index 8a86c582c2..6cffb1b343 100644
--- a/src/pipe/SkGPipeRead.cpp
+++ b/src/pipe/SkGPipeRead.cpp
@@ -837,5 +837,3 @@ SkGPipeReader::Status SkGPipeReader::playback(const void* data, size_t length,
     }
     return status;
 }
-
-
diff --git a/src/ports/SkDebug_nacl.cpp b/src/ports/SkDebug_nacl.cpp
index b1d260f0ee..6e35f0965a 100644
--- a/src/ports/SkDebug_nacl.cpp
+++ b/src/ports/SkDebug_nacl.cpp
@@ -36,4 +36,3 @@ void SkDebugf(const char format[], ...) {
         gPluginInstance->PostMessage(msg);
     }
 }
-
diff --git a/src/ports/SkDebug_stdio.cpp b/src/ports/SkDebug_stdio.cpp
index bc3d98b97b..318269e60b 100644
--- a/src/ports/SkDebug_stdio.cpp
+++ b/src/ports/SkDebug_stdio.cpp
@@ -22,4 +22,3 @@ void SkDebugf(const char format[], ...) {
     va_end(args);
     fprintf(stderr, "%s", buffer);
 }
-
diff --git a/src/ports/SkDebug_win.cpp b/src/ports/SkDebug_win.cpp
index b3077f1c69..4b340b069b 100644
--- a/src/ports/SkDebug_win.cpp
+++ b/src/ports/SkDebug_win.cpp
@@ -26,4 +26,3 @@ void SkDebugf(const char format[], ...) {
     OutputDebugStringA(buffer);
     printf(buffer);
 }
-
diff --git a/src/ports/SkFontHost_FONTPATH.cpp b/src/ports/SkFontHost_FONTPATH.cpp
index 69e73f536d..3b5e99365e 100644
--- a/src/ports/SkFontHost_FONTPATH.cpp
+++ b/src/ports/SkFontHost_FONTPATH.cpp
@@ -320,4 +320,3 @@ SkScalerContext* SkFontHost::CreateFallbackScalerContext(
 
     return SkFontHost::CreateScalerContext(desc);
 }
-
diff --git a/src/ports/SkFontHost_FreeType.cpp b/src/ports/SkFontHost_FreeType.cpp
index 71899f40a4..47e77ac7ea 100644
--- a/src/ports/SkFontHost_FreeType.cpp
+++ b/src/ports/SkFontHost_FreeType.cpp
@@ -1366,4 +1366,3 @@ bool find_name_and_attributes(SkStream* stream, SkString* name,
     FT_Done_FreeType(library);
     return true;
 }
-
diff --git a/src/ports/SkFontHost_ascender.cpp b/src/ports/SkFontHost_ascender.cpp
index 067d474357..d20cc825cd 100644
--- a/src/ports/SkFontHost_ascender.cpp
+++ b/src/ports/SkFontHost_ascender.cpp
@@ -227,4 +227,3 @@ SkScalerContext* SkFontHost::CreateScalerContext(const SkDescriptor* desc)
 {
     return SkNEW_ARGS(SkScalerContext_Ascender, (desc));
 }
-
diff --git a/src/ports/SkFontHost_fontconfig.cpp b/src/ports/SkFontHost_fontconfig.cpp
index 0f79a30ea3..355ea79645 100644
--- a/src/ports/SkFontHost_fontconfig.cpp
+++ b/src/ports/SkFontHost_fontconfig.cpp
@@ -249,4 +249,3 @@ SkFontID SkFontHost::NextLogicalFont(SkFontID currFontID, SkFontID origFontID) {
     // We don't handle font fallback, WebKit does.
     return 0;
 }
-
diff --git a/src/ports/SkFontHost_freetype_mac.cpp b/src/ports/SkFontHost_freetype_mac.cpp
index 652fb463db..bc197d6872 100644
--- a/src/ports/SkFontHost_freetype_mac.cpp
+++ b/src/ports/SkFontHost_freetype_mac.cpp
@@ -103,4 +103,3 @@ SkTypeface* SkCreateTypefaceFromCTFont(CTFontRef fontRef) {
     SkDEBUGFAIL("Not supported");
     return NULL;
 }
-
diff --git a/src/ports/SkFontHost_linux.cpp b/src/ports/SkFontHost_linux.cpp
index adcee49439..fb6c6d564b 100644
--- a/src/ports/SkFontHost_linux.cpp
+++ b/src/ports/SkFontHost_linux.cpp
@@ -600,4 +600,3 @@ SkTypeface* SkFontHost::CreateTypefaceFromFile(const char path[]) {
     stream->unref();
     return face;
 }
-
diff --git a/src/ports/SkFontHost_mac.cpp b/src/ports/SkFontHost_mac.cpp
index 7d12f53a04..79c5541774 100755
--- a/src/ports/SkFontHost_mac.cpp
+++ b/src/ports/SkFontHost_mac.cpp
@@ -35,5 +35,3 @@
 #else
     #include "SkFontHost_mac_atsui.cpp"
 #endif
-
-
diff --git a/src/ports/SkFontHost_none.cpp b/src/ports/SkFontHost_none.cpp
index 21eda8e1b8..6475c09deb 100644
--- a/src/ports/SkFontHost_none.cpp
+++ b/src/ports/SkFontHost_none.cpp
@@ -74,5 +74,3 @@ SkScalerContext* SkFontHost::CreateScalerContext(const SkDescriptor* desc) {
 SkFontID SkFontHost::NextLogicalFont(SkFontID currFontID, SkFontID origFontID) {
     return 0;
 }
-
-
diff --git a/src/ports/SkFontHost_simple.cpp b/src/ports/SkFontHost_simple.cpp
index ac3c713fd9..101d5761d2 100644
--- a/src/ports/SkFontHost_simple.cpp
+++ b/src/ports/SkFontHost_simple.cpp
@@ -642,4 +642,3 @@ SkTypeface* SkFontHost::CreateTypefaceFromFile(const char path[]) {
     stream->unref();
     return face;
 }
-
diff --git a/src/ports/SkFontHost_tables.cpp b/src/ports/SkFontHost_tables.cpp
index 9878119a64..38d2e60687 100644
--- a/src/ports/SkFontHost_tables.cpp
+++ b/src/ports/SkFontHost_tables.cpp
@@ -203,4 +203,3 @@ size_t SkFontHost::GetTableData(SkFontID fontID, SkFontTableTag tag,
     }
     return 0;
 }
-
diff --git a/src/ports/SkHarfBuzzFont.cpp b/src/ports/SkHarfBuzzFont.cpp
index 12f37f5203..b5cd0f7f9e 100644
--- a/src/ports/SkHarfBuzzFont.cpp
+++ b/src/ports/SkHarfBuzzFont.cpp
@@ -185,4 +185,3 @@ HB_Error SkHarfBuzzFont::GetFontTableFunc(void* voidface, const HB_Tag tag,
     SkFontHost::GetTableData(uniqueID, tag, 0, tableSize, buffer);
     return HB_Err_Ok;
 }
-
diff --git a/src/ports/SkImageDecoder_CG.cpp b/src/ports/SkImageDecoder_CG.cpp
index afe4cf44ac..f8ec108429 100644
--- a/src/ports/SkImageDecoder_CG.cpp
+++ b/src/ports/SkImageDecoder_CG.cpp
@@ -219,4 +219,3 @@ SkImageEncoder* SkImageEncoder::Create(Type t) {
     }
     return SkNEW_ARGS(SkImageEncoder_CG, (t));
 }
-
diff --git a/src/ports/SkImageDecoder_WIC.cpp b/src/ports/SkImageDecoder_WIC.cpp
index e16f575a1e..4b869dd328 100644
--- a/src/ports/SkImageDecoder_WIC.cpp
+++ b/src/ports/SkImageDecoder_WIC.cpp
@@ -334,4 +334,3 @@ SkImageEncoder* SkImageEncoder::Create(Type t) {
     }
     return SkNEW_ARGS(SkImageEncoder_WIC, (t));
 }
-
diff --git a/src/ports/SkMemory_malloc.cpp b/src/ports/SkMemory_malloc.cpp
index 44e43ad5a7..73b56079a6 100644
--- a/src/ports/SkMemory_malloc.cpp
+++ b/src/ports/SkMemory_malloc.cpp
@@ -49,4 +49,3 @@ void* sk_malloc_flags(size_t size, unsigned flags) {
     }
     return p;
 }
-
diff --git a/src/ports/SkMemory_mozalloc.cpp b/src/ports/SkMemory_mozalloc.cpp
index 1f16ee5808..2c049b2a03 100644
--- a/src/ports/SkMemory_mozalloc.cpp
+++ b/src/ports/SkMemory_mozalloc.cpp
@@ -37,4 +37,3 @@ void sk_free(void* p) {
 void* sk_malloc_flags(size_t size, unsigned flags) {
     return (flags & SK_MALLOC_THROW) ? moz_xmalloc(size) : moz_malloc(size);
 }
-
diff --git a/src/ports/SkThread_pthread.cpp b/src/ports/SkThread_pthread.cpp
index b430dd9551..370f673d86 100644
--- a/src/ports/SkThread_pthread.cpp
+++ b/src/ports/SkThread_pthread.cpp
@@ -218,4 +218,3 @@ void* SkTLS::PlatformGetSpecific(bool forceCreateTheSlot) {
 void SkTLS::PlatformSetSpecific(void* ptr) {
     (void)pthread_setspecific(gSkTLSKey, ptr);
 }
-
diff --git a/src/ports/SkXMLParser_expat.cpp b/src/ports/SkXMLParser_expat.cpp
index 8c1c2bfd1c..afc9f79fb5 100644
--- a/src/ports/SkXMLParser_expat.cpp
+++ b/src/ports/SkXMLParser_expat.cpp
@@ -138,4 +138,3 @@ void SkXMLParser::GetNativeErrorString(int error, SkString* str)
     if (str)
         str->set(XML_ErrorString((XML_Error) error));
 }
-
diff --git a/src/ports/SkXMLParser_tinyxml.cpp b/src/ports/SkXMLParser_tinyxml.cpp
index de1fbe57bc..f357592b29 100644
--- a/src/ports/SkXMLParser_tinyxml.cpp
+++ b/src/ports/SkXMLParser_tinyxml.cpp
@@ -85,4 +85,3 @@ void SkXMLParser::GetNativeErrorString(int error, SkString* str)
     if (str)
         str->set("GetNativeErrorString not implemented for TinyXml");
 }
-
diff --git a/src/ports/SkXMLPullParser_expat.cpp b/src/ports/SkXMLPullParser_expat.cpp
index 5fcdff372c..1d1615bcdc 100644
--- a/src/ports/SkXMLPullParser_expat.cpp
+++ b/src/ports/SkXMLPullParser_expat.cpp
@@ -211,4 +211,3 @@ CHECK_STATUS:
     }
     return fCurr.fEventType;
 }
-
diff --git a/src/svg/SkSVGElements.cpp b/src/svg/SkSVGElements.cpp
index 66dcd4e9c9..a1bd100571 100644
--- a/src/svg/SkSVGElements.cpp
+++ b/src/svg/SkSVGElements.cpp
@@ -84,5 +84,3 @@ void SkSVGElement::setIsDef() {
 void SkSVGElement::write(SkSVGParser& , SkString& ) {
     SkASSERT(0);
 }
-
-
diff --git a/src/svg/SkSVGFilter.h b/src/svg/SkSVGFilter.h
index 58912373ee..f615bd06a3 100644
--- a/src/svg/SkSVGFilter.h
+++ b/src/svg/SkSVGFilter.h
@@ -25,4 +25,3 @@ private:
 };
 
 #endif // SkSVGFilter_DEFINEDRITED;
-
diff --git a/src/svg/SkSVGGradient.cpp b/src/svg/SkSVGGradient.cpp
index d5f76394eb..bbcca18f39 100644
--- a/src/svg/SkSVGGradient.cpp
+++ b/src/svg/SkSVGGradient.cpp
@@ -112,4 +112,3 @@ void SkSVGGradient::write(SkSVGParser& parser, SkString& baseColor) {
     parser.fSuppressPaint = false;
     parser.fHead = saveHead;
 }
-
diff --git a/src/svg/SkSVGPaintState.cpp b/src/svg/SkSVGPaintState.cpp
index db3090074c..5db624d02e 100644
--- a/src/svg/SkSVGPaintState.cpp
+++ b/src/svg/SkSVGPaintState.cpp
@@ -452,4 +452,3 @@ void SkSVGPaint::Pop(SkSVGPaint** head) {
     SkSVGPaint* next = (*head)->fNext;
     *head = next;
 }
-
diff --git a/src/text/SkTextLayout.cpp b/src/text/SkTextLayout.cpp
index 4d87ffe242..4e531cf21d 100644
--- a/src/text/SkTextLayout.cpp
+++ b/src/text/SkTextLayout.cpp
@@ -78,4 +78,3 @@ SkTextLayout::Line::~Line() {
 
 void SkTextLayout::draw(SkCanvas* canvas) {
 }
-
diff --git a/src/utils/SkBase64.cpp b/src/utils/SkBase64.cpp
index 8e1f2237ac..11b647fe9a 100644
--- a/src/utils/SkBase64.cpp
+++ b/src/utils/SkBase64.cpp
@@ -183,5 +183,3 @@ void SkBase64::UnitTest() {
     }
 }
 #endif
-
-
diff --git a/src/utils/SkBoundaryPatch.cpp b/src/utils/SkBoundaryPatch.cpp
index afc76b5c70..fd1545d2a9 100644
--- a/src/utils/SkBoundaryPatch.cpp
+++ b/src/utils/SkBoundaryPatch.cpp
@@ -79,4 +79,3 @@ SkPoint SkCubicBoundary::eval(Edge e, SkScalar t) {
     SkEvalCubicAt(&fPts[e * 3], t, &loc, NULL, NULL);
     return loc;
 }
-
diff --git a/src/utils/SkCamera.cpp b/src/utils/SkCamera.cpp
index 11e10f6dc2..a7c0b1483d 100644
--- a/src/utils/SkCamera.cpp
+++ b/src/utils/SkCamera.cpp
@@ -423,4 +423,3 @@ void Sk3DView::applyToCanvas(SkCanvas* canvas) const {
     this->getMatrix(&matrix);
     canvas->concat(matrix);
 }
-
diff --git a/src/utils/SkCountdown.cpp b/src/utils/SkCountdown.cpp
index 5b476cc094..98b3545071 100644
--- a/src/utils/SkCountdown.cpp
+++ b/src/utils/SkCountdown.cpp
@@ -30,4 +30,3 @@ void SkCountdown::wait() {
     }
     fReady.unlock();
 }
-
diff --git a/src/utils/SkCubicInterval.cpp b/src/utils/SkCubicInterval.cpp
index 904f26bd23..566023a244 100644
--- a/src/utils/SkCubicInterval.cpp
+++ b/src/utils/SkCubicInterval.cpp
@@ -65,4 +65,3 @@ SkScalar SkEvalCubicInterval(SkScalar x1, SkScalar y1,
     y2 *= 3;
     return eval_cubic(y1, y2 - 2*y1, y1 - y2 + SK_Scalar1, t);
 }
-
diff --git a/src/utils/SkCullPoints.cpp b/src/utils/SkCullPoints.cpp
index e76679daaa..efb94f4870 100644
--- a/src/utils/SkCullPoints.cpp
+++ b/src/utils/SkCullPoints.cpp
@@ -217,4 +217,3 @@ bool SkHitTestPath(const SkPath& path, SkScalar x, SkScalar y, bool hires) {
     SkRect r = SkRect::MakeXYWH(x - half, y - half, one, one);
     return SkHitTestPath(path, r, hires);
 }
-
diff --git a/src/utils/SkDebugTrace.h b/src/utils/SkDebugTrace.h
index 447418e139..5ec3e1c477 100644
--- a/src/utils/SkDebugTrace.h
+++ b/src/utils/SkDebugTrace.h
@@ -22,5 +22,3 @@
   SkDebugf("Trace: %s (%s=%s, %s=%s)\n", event, name1, value1, name2, value2)
 
 #endif
-
-
diff --git a/src/utils/SkInterpolator.cpp b/src/utils/SkInterpolator.cpp
index 146adc2848..2853b0703a 100644
--- a/src/utils/SkInterpolator.cpp
+++ b/src/utils/SkInterpolator.cpp
@@ -329,4 +329,3 @@ void SkInterpolator::UnitTest() {
 }
 
 #endif
-
diff --git a/src/utils/SkJSON.cpp b/src/utils/SkJSON.cpp
index 06989f3148..9b12208202 100644
--- a/src/utils/SkJSON.cpp
+++ b/src/utils/SkJSON.cpp
@@ -632,6 +632,3 @@ void SkJSON::Array::setString(int index, const char str[]) {
         prev = dup_string(str);
     }
 }
-
-
-
diff --git a/src/utils/SkLayer.cpp b/src/utils/SkLayer.cpp
index 54f1840f6f..a96d921457 100644
--- a/src/utils/SkLayer.cpp
+++ b/src/utils/SkLayer.cpp
@@ -230,4 +230,3 @@ void SkLayer::draw(SkCanvas* canvas, SkScalar opacity) {
         }
     }
 }
-
diff --git a/src/utils/SkMeshUtils.cpp b/src/utils/SkMeshUtils.cpp
index 7970ba1af4..3857dc954f 100644
--- a/src/utils/SkMeshUtils.cpp
+++ b/src/utils/SkMeshUtils.cpp
@@ -100,4 +100,3 @@ void SkMeshUtils::Draw(SkCanvas* canvas, const SkBitmap& bitmap,
                              idx.indices(), idx.indexCount(), p);
     }
 }
-
diff --git a/src/utils/SkNWayCanvas.cpp b/src/utils/SkNWayCanvas.cpp
index d59d559328..bfc7a7ab70 100644
--- a/src/utils/SkNWayCanvas.cpp
+++ b/src/utils/SkNWayCanvas.cpp
@@ -311,5 +311,3 @@ SkDrawFilter* SkNWayCanvas::setDrawFilter(SkDrawFilter* filter) {
     }
     return this->INHERITED::setDrawFilter(filter);
 }
-
-
diff --git a/src/utils/SkOSFile.cpp b/src/utils/SkOSFile.cpp
index 1fec35a63b..478a0cc448 100644
--- a/src/utils/SkOSFile.cpp
+++ b/src/utils/SkOSFile.cpp
@@ -227,4 +227,3 @@ bool SkOSFile::Iter::next(SkString* name, bool getDir)
 }
 
 #endif
-
diff --git a/src/utils/SkParseColor.cpp b/src/utils/SkParseColor.cpp
index db47aae82c..becad2cab7 100644
--- a/src/utils/SkParseColor.cpp
+++ b/src/utils/SkParseColor.cpp
@@ -537,4 +537,3 @@ void SkParse::TestColor() {
 //  SkASSERT(result == ((0xFF << 24) | (71 << 16) | (162 << 8) | (253 << 0)));
 }
 #endif
-
diff --git a/src/utils/SkParsePath.cpp b/src/utils/SkParsePath.cpp
index 18ea5e023b..8c7a4d0df8 100644
--- a/src/utils/SkParsePath.cpp
+++ b/src/utils/SkParsePath.cpp
@@ -243,4 +243,3 @@ void SkParsePath::ToSVGString(const SkPath& path, SkString* str) {
         }
     }
 }
-
diff --git a/src/utils/SkPictureUtils.cpp b/src/utils/SkPictureUtils.cpp
index 0f9f97e48f..4ddc566dac 100644
--- a/src/utils/SkPictureUtils.cpp
+++ b/src/utils/SkPictureUtils.cpp
@@ -214,4 +214,3 @@ SkData* SkPictureUtils::GatherPixelRefs(SkPicture* pict, const SkRect& area) {
     }
     return data;
 }
-
diff --git a/src/utils/SkProxyCanvas.cpp b/src/utils/SkProxyCanvas.cpp
index 4af509df4f..057f1df35a 100644
--- a/src/utils/SkProxyCanvas.cpp
+++ b/src/utils/SkProxyCanvas.cpp
@@ -165,4 +165,3 @@ SkBounder* SkProxyCanvas::setBounder(SkBounder* bounder) {
 SkDrawFilter* SkProxyCanvas::setDrawFilter(SkDrawFilter* filter) {
     return fProxy->setDrawFilter(filter);
 }
-
diff --git a/src/utils/mac/SkCreateCGImageRef.cpp b/src/utils/mac/SkCreateCGImageRef.cpp
index abad8cb440..e9e1107ff6 100644
--- a/src/utils/mac/SkCreateCGImageRef.cpp
+++ b/src/utils/mac/SkCreateCGImageRef.cpp
@@ -238,4 +238,3 @@ bool SkPDFDocumentToBitmap(SkStream* stream, SkBitmap* output) {
     output->swap(bitmap);
     return true;
 }
-
diff --git a/src/utils/mac/SkStream_mac.cpp b/src/utils/mac/SkStream_mac.cpp
index 5b3fe6be6a..afb87fb5d7 100644
--- a/src/utils/mac/SkStream_mac.cpp
+++ b/src/utils/mac/SkStream_mac.cpp
@@ -55,5 +55,3 @@ CGDataProviderRef SkCreateDataProviderFromStream(SkStream* stream) {
     rec.releaseInfo = release_info_proc;
     return CGDataProviderCreateSequential(stream, &rec);
 }
-
-
diff --git a/src/views/SkBGViewArtist.cpp b/src/views/SkBGViewArtist.cpp
index ffc410aea6..c10fe3eb78 100644
--- a/src/views/SkBGViewArtist.cpp
+++ b/src/views/SkBGViewArtist.cpp
@@ -28,4 +28,3 @@ void SkBGViewArtist::onInflate(const SkDOM& dom, const SkDOM::Node* node)
 {
     SkPaint_Inflate(&fPaint, dom, node);
 }
-
diff --git a/src/views/SkEvent.cpp b/src/views/SkEvent.cpp
index 151317039b..52a0c4dd7f 100644
--- a/src/views/SkEvent.cpp
+++ b/src/views/SkEvent.cpp
@@ -506,4 +506,3 @@ void SkEvent::Term() {
         evt = next;
     }
 }
-
diff --git a/src/views/SkParsePaint.cpp b/src/views/SkParsePaint.cpp
index 7a305f2867..344da0b572 100644
--- a/src/views/SkParsePaint.cpp
+++ b/src/views/SkParsePaint.cpp
@@ -107,4 +107,3 @@ void SkPaint_Inflate(SkPaint* paint, const SkDOM& dom, const SkDOM::Node* node)
     if (shader)
         paint->setShader(shader)->unref();
 }
-
diff --git a/src/views/SkProgressView.cpp b/src/views/SkProgressView.cpp
index edb78bdcf6..03e28eb208 100644
--- a/src/views/SkProgressView.cpp
+++ b/src/views/SkProgressView.cpp
@@ -130,4 +130,3 @@ void SkProgressView::onInflate(const SkDOM& dom, const SkDOM::Node* node)
         fOffShader = inflate_shader(s);
     (void)dom.findBool(node, "do-interp", &fDoInterp);
 }
-
diff --git a/src/views/SkStackViewLayout.cpp b/src/views/SkStackViewLayout.cpp
index e4fbb80ea8..9a3a352853 100644
--- a/src/views/SkStackViewLayout.cpp
+++ b/src/views/SkStackViewLayout.cpp
@@ -271,4 +271,3 @@ void SkFillViewLayout::onInflate(const SkDOM& dom, const SkDOM::Node* node)
     this->INHERITED::onInflate(dom, node);
     (void)dom.findScalars(node, "margin", (SkScalar*)&fMargin, 4);
 }
-
diff --git a/src/views/SkTagList.cpp b/src/views/SkTagList.cpp
index e1b1662cd7..8ede870feb 100644
--- a/src/views/SkTagList.cpp
+++ b/src/views/SkTagList.cpp
@@ -60,4 +60,3 @@ void SkTagList::DeleteAll(SkTagList* rec)
         rec = next;
     }
 }
-
diff --git a/src/views/SkTextBox.cpp b/src/views/SkTextBox.cpp
index 78828b6d85..b5dab09d00 100644
--- a/src/views/SkTextBox.cpp
+++ b/src/views/SkTextBox.cpp
@@ -257,4 +257,3 @@ SkScalar SkTextBox::getTextHeight() const {
     SkScalar spacing = SkScalarMul(fPaint->getTextSize(), fSpacingMul) + fSpacingAdd;
     return this->countLines() * spacing;
 }
-
diff --git a/src/views/SkTouchGesture.cpp b/src/views/SkTouchGesture.cpp
index afda8c15cd..3becccd8fc 100644
--- a/src/views/SkTouchGesture.cpp
+++ b/src/views/SkTouchGesture.cpp
@@ -325,5 +325,3 @@ bool SkTouchGesture::handleDblTap(float x, float y) {
     fLastUpP.set(x, y);
     return found;
 }
-
-
diff --git a/src/views/SkViewInflate.cpp b/src/views/SkViewInflate.cpp
index 4d7de0483c..59cc4813fa 100644
--- a/src/views/SkViewInflate.cpp
+++ b/src/views/SkViewInflate.cpp
@@ -143,4 +143,3 @@ void SkViewInflate::dump() const
         SkDebugf("inflate: broadcastFrom(\"%s\")\n", iter->fStr);
 }
 #endif
-
diff --git a/src/views/SkViewPriv.cpp b/src/views/SkViewPriv.cpp
index ba40c1e360..0348fd7e32 100644
--- a/src/views/SkViewPriv.cpp
+++ b/src/views/SkViewPriv.cpp
@@ -101,4 +101,3 @@ SkView::Layout* SkView::setLayout(Layout* obj, bool invokeLayoutNow)
 
     return obj;
 }
-
diff --git a/src/views/SkViewPriv.h b/src/views/SkViewPriv.h
index 8a9c0b7e9a..487e379471 100644
--- a/src/views/SkViewPriv.h
+++ b/src/views/SkViewPriv.h
@@ -42,4 +42,3 @@ struct Artist_SkTagList : SkTagList {
 };
 
 #endif
-
diff --git a/src/views/SkWidgets.cpp b/src/views/SkWidgets.cpp
index 1693a31239..202bf52930 100644
--- a/src/views/SkWidgets.cpp
+++ b/src/views/SkWidgets.cpp
@@ -558,4 +558,3 @@ void SkBitmapView::onInflate(const SkDOM& dom, const SkDOM::Node* node)
 }
 
 #endif
-
diff --git a/src/views/SkWindow.cpp b/src/views/SkWindow.cpp
index 0f0d9c179f..73319766c5 100644
--- a/src/views/SkWindow.cpp
+++ b/src/views/SkWindow.cpp
@@ -413,4 +413,3 @@ bool SkWindow::onDispatchClick(int x, int y, Click::State state,
     }
     return handled;
 }
-
diff --git a/src/views/animated/SkImageView.cpp b/src/views/animated/SkImageView.cpp
index a75aa73d1b..2956729fef 100644
--- a/src/views/animated/SkImageView.cpp
+++ b/src/views/animated/SkImageView.cpp
@@ -300,4 +300,3 @@ bool SkImageView::ensureUriIsLoaded()
     }
     return true;
 }
-
diff --git a/src/views/animated/SkScrollBarView.cpp b/src/views/animated/SkScrollBarView.cpp
index 0d937750be..80ee49fdb3 100644
--- a/src/views/animated/SkScrollBarView.cpp
+++ b/src/views/animated/SkScrollBarView.cpp
@@ -143,4 +143,3 @@ void SkScrollBarView::adjust()
 //    e.setS32("hideBar", hideBar);
     fAnim.doUserEvent(e);
 }
-
diff --git a/src/views/animated/SkStaticTextView.cpp b/src/views/animated/SkStaticTextView.cpp
index 199b2fe8c5..0e4cad63e5 100644
--- a/src/views/animated/SkStaticTextView.cpp
+++ b/src/views/animated/SkStaticTextView.cpp
@@ -189,4 +189,3 @@ if (false) { // avoid bit rot, suppress warning
     }
 }
 }
-
diff --git a/src/views/sdl/SkOSWindow_SDL.cpp b/src/views/sdl/SkOSWindow_SDL.cpp
index 4edc5acfd3..2a1fae28a6 100644
--- a/src/views/sdl/SkOSWindow_SDL.cpp
+++ b/src/views/sdl/SkOSWindow_SDL.cpp
@@ -224,4 +224,3 @@ void SkEvent::SignalQueueTimer(SkMSec delay)
         SDL_SetTimer(delay, timer_callback);
     }
 }
-
diff --git a/src/xml/SkBML_XMLParser.cpp b/src/xml/SkBML_XMLParser.cpp
index bf497821da..c0a5af55e5 100644
--- a/src/xml/SkBML_XMLParser.cpp
+++ b/src/xml/SkBML_XMLParser.cpp
@@ -179,6 +179,3 @@ void BML_XMLParser::Read(SkStream& s, SkXMLParser& output)
     SkXMLParserWriter writer(&output);
     Read(s, writer);
 }
-
-
-
diff --git a/src/xml/SkDOM.cpp b/src/xml/SkDOM.cpp
index bdfdd86bdc..98546089fa 100644
--- a/src/xml/SkDOM.cpp
+++ b/src/xml/SkDOM.cpp
@@ -501,4 +501,3 @@ void SkDOM::UnitTest()
 }
 
 #endif
-
diff --git a/src/xml/SkJS.cpp b/src/xml/SkJS.cpp
index f2e7a83672..8167c9c1ea 100644
--- a/src/xml/SkJS.cpp
+++ b/src/xml/SkJS.cpp
@@ -226,4 +226,3 @@ void SkJS::Test(void* hwnd) {
     SkASSERT(success);
 }
 #endifASSERT(success);
-
diff --git a/src/xml/SkXMLPullParser.cpp b/src/xml/SkXMLPullParser.cpp
index 4080aeb1ec..ed042281a7 100644
--- a/src/xml/SkXMLPullParser.cpp
+++ b/src/xml/SkXMLPullParser.cpp
@@ -136,4 +136,3 @@ bool SkXMLPullParser::onEntityReplacement(const char name[],
     // TODO: std 5 entities here
     return false;
 }
-
diff --git a/src/xml/SkXMLWriter.cpp b/src/xml/SkXMLWriter.cpp
index 451d1d5241..2ff47eae66 100644
--- a/src/xml/SkXMLWriter.cpp
+++ b/src/xml/SkXMLWriter.cpp
@@ -331,4 +331,3 @@ void SkXMLStreamWriter::UnitTest()
 }
 
 #endif
-
diff --git a/tests/AtomicTest.cpp b/tests/AtomicTest.cpp
index 5275e84027..a9ab8d2279 100644
--- a/tests/AtomicTest.cpp
+++ b/tests/AtomicTest.cpp
@@ -58,4 +58,3 @@ static void test_atomicAddTests(skiatest::Reporter* reporter) {
 
 #include "TestClassDef.h"
 DEFINE_TESTCLASS("AtomicAdd", AtomicAddTestClass, test_atomicAddTests)
-
diff --git a/tests/PremulAlphaRoundTripTest.cpp b/tests/PremulAlphaRoundTripTest.cpp
index 17fb42a41c..8321c940b9 100644
--- a/tests/PremulAlphaRoundTripTest.cpp
+++ b/tests/PremulAlphaRoundTripTest.cpp
@@ -110,4 +110,3 @@ void PremulAlphaRoundTripTest(skiatest::Reporter* reporter,
 
 #include "TestClassDef.h"
 DEFINE_GPUTESTCLASS("PremulAlphaRoundTripTest", PremulAlphaRoundTripTestClass, PremulAlphaRoundTripTest)
-
diff --git a/tests/ReadPixelsTest.cpp b/tests/ReadPixelsTest.cpp
index 8b47906315..a33e819c28 100644
--- a/tests/ReadPixelsTest.cpp
+++ b/tests/ReadPixelsTest.cpp
@@ -398,4 +398,3 @@ void ReadPixelsTest(skiatest::Reporter* reporter, GrContext* context) {
 
 #include "TestClassDef.h"
 DEFINE_GPUTESTCLASS("ReadPixels", ReadPixelsTestClass, ReadPixelsTest)
-
diff --git a/tests/Reader32Test.cpp b/tests/Reader32Test.cpp
index 13f2fc4fa6..d81287bd74 100644
--- a/tests/Reader32Test.cpp
+++ b/tests/Reader32Test.cpp
@@ -85,4 +85,3 @@ static void Tests(skiatest::Reporter* reporter) {
 
 #include "TestClassDef.h"
 DEFINE_TESTCLASS("Reader32", Reader32Class, Tests)
-
diff --git a/tests/ScalarTest.cpp b/tests/ScalarTest.cpp
index 801872e12e..8a166454d6 100644
--- a/tests/ScalarTest.cpp
+++ b/tests/ScalarTest.cpp
@@ -193,4 +193,3 @@ static void TestScalar(skiatest::Reporter* reporter) {
 
 #include "TestClassDef.h"
 DEFINE_TESTCLASS("Scalar", TestScalarClass, TestScalar)
-
diff --git a/tests/StrokeTest.cpp b/tests/StrokeTest.cpp
index ded1130be4..9336bed33a 100644
--- a/tests/StrokeTest.cpp
+++ b/tests/StrokeTest.cpp
@@ -61,4 +61,3 @@ static void TestStroke(skiatest::Reporter* reporter) {
 
 #include "TestClassDef.h"
 DEFINE_TESTCLASS("Stroke", TestStrokeClass, TestStroke)
-
diff --git a/tests/Test.cpp b/tests/Test.cpp
index 6953d9435d..de5e79335f 100644
--- a/tests/Test.cpp
+++ b/tests/Test.cpp
@@ -114,4 +114,3 @@ GrContext* GpuTest::GetContext() {
     return NULL;
 #endif
 }
-
diff --git a/tests/Writer32Test.cpp b/tests/Writer32Test.cpp
index a6e274702d..33777a1af7 100644
--- a/tests/Writer32Test.cpp
+++ b/tests/Writer32Test.cpp
@@ -229,4 +229,3 @@ static void Tests(skiatest::Reporter* reporter) {
 
 #include "TestClassDef.h"
 DEFINE_TESTCLASS("Writer32", Writer32Class, Tests)
-
diff --git a/tests/skia_test.cpp b/tests/skia_test.cpp
index 84318da824..8a1feaec31 100644
--- a/tests/skia_test.cpp
+++ b/tests/skia_test.cpp
@@ -164,4 +164,3 @@ int main(int argc, char * const argv[]) {
     return tool_main(argc, (char**) argv);
 }
 #endif
-
diff --git a/tools/render_pdfs_main.cpp b/tools/render_pdfs_main.cpp
index 80ec7fbc3a..3aac682434 100644
--- a/tools/render_pdfs_main.cpp
+++ b/tools/render_pdfs_main.cpp
@@ -236,4 +236,3 @@ int main(int argc, char * const argv[]) {
     return tool_main(argc, (char**) argv);
 }
 #endif
-
diff --git a/tools/skimage_main.cpp b/tools/skimage_main.cpp
index 83f115cbb0..53cc6b3d0f 100644
--- a/tools/skimage_main.cpp
+++ b/tools/skimage_main.cpp
@@ -108,4 +108,3 @@ int main(int argc, char * const argv[]) {
     return tool_main(argc, (char**) argv);
 }
 #endif
-