8 files changed, 11 insertions, 15 deletions
diff --git a/src/core/SkTileGrid.cpp b/src/core/SkTileGrid.cpp
index 8a299496ac..7b901e9b3b 100644
--- a/src/core/SkTileGrid.cpp
+++ b/src/core/SkTileGrid.cpp
@@ -45,7 +45,7 @@ void SkTileGrid::insert(void* data, const SkIRect& bounds, bool) {
 
     // Note: SkIRects are non-inclusive of the right() column and bottom() row,
     // hence the "-1"s in the computations of maxTileX and maxTileY.
-    int minTileX = SkMax32(SkMin32(dilatedBounds.left() / fInfo.fTileInterval.width(), 
+    int minTileX = SkMax32(SkMin32(dilatedBounds.left() / fInfo.fTileInterval.width(),
         fXTileCount - 1), 0);
     int maxTileX = SkMax32(SkMin32((dilatedBounds.right() - 1) / fInfo.fTileInterval.width(),
         fXTileCount - 1), 0);
diff --git a/src/gpu/gl/GrGLCaps.cpp b/src/gpu/gl/GrGLCaps.cpp
index 9058b35dea..a2f89f0c82 100644
--- a/src/gpu/gl/GrGLCaps.cpp
+++ b/src/gpu/gl/GrGLCaps.cpp
@@ -178,7 +178,7 @@ void GrGLCaps::init(const GrGLContextInfo& ctxInfo, const GrGLInterface* gli) {
         (kARM_GrGLVendor == ctxInfo.vendor() || kImagination_GrGLVendor == ctxInfo.vendor())) {
         fUseNonVBOVertexAndIndexDynamicData = true;
     }
-    
+
     if (kDesktop_GrGLBinding == binding && version >= GR_GL_VER(3, 2)) {
         GrGLint profileMask;
         GR_GL_GetIntegerv(gli, GR_GL_CONTEXT_PROFILE_MASK, &profileMask);
diff --git a/src/gpu/gl/GrGLCaps.h b/src/gpu/gl/GrGLCaps.h
index 35b4dfc1a8..31edd657b3 100644
--- a/src/gpu/gl/GrGLCaps.h
+++ b/src/gpu/gl/GrGLCaps.h
@@ -228,7 +228,7 @@ public:
     bool readPixelsSupported(const GrGLInterface* intf,
                              GrGLenum format,
                              GrGLenum type) const;
-    
+
     bool isCoreProfile() const { return fIsCoreProfile; }
 
 private:
diff --git a/src/gpu/gl/GrGLContext.cpp b/src/gpu/gl/GrGLContext.cpp
index ba4196de8e..0c3f0eb67a 100644
--- a/src/gpu/gl/GrGLContext.cpp
+++ b/src/gpu/gl/GrGLContext.cpp
@@ -17,7 +17,7 @@ GrGLContextInfo& GrGLContextInfo::operator= (const GrGLContextInfo& ctxInfo) {
     fGLCaps = ctxInfo.fGLCaps;
     return *this;
 }
-    
+
 bool GrGLContextInfo::initialize(const GrGLInterface* interface) {
     this->reset();
     // We haven't validated the GrGLInterface yet, so check for GetString
@@ -44,7 +44,7 @@ bool GrGLContextInfo::initialize(const GrGLInterface* interface) {
 }
 
 bool GrGLContextInfo::isInitialized() const {
-    return kNone_GrGLBinding != fBindingInUse;    
+    return kNone_GrGLBinding != fBindingInUse;
 }
 
 void GrGLContextInfo::reset() {
diff --git a/src/gpu/gl/GrGLContext.h b/src/gpu/gl/GrGLContext.h
index 05647cc9fa..1091ab9906 100644
--- a/src/gpu/gl/GrGLContext.h
+++ b/src/gpu/gl/GrGLContext.h
@@ -18,7 +18,7 @@
 #include "SkString.h"
 
 /**
- * Encapsulates information about an OpenGL context including the OpenGL 
+ * Encapsulates information about an OpenGL context including the OpenGL
  * version, the GrGLBinding type of the context, and GLSL version.
  */
 class GrGLContextInfo {
@@ -32,7 +32,7 @@ public:
      * Copies a GrGLContextInfo
      */
     GrGLContextInfo& operator= (const GrGLContextInfo& ctxInfo);
-    
+
     /**
      * Initializes a GrGLContextInfo from a GrGLInterface and the currently
      * bound OpenGL context accessible by the GrGLInterface.
diff --git a/src/gpu/gl/GrGLShaderBuilder.cpp b/src/gpu/gl/GrGLShaderBuilder.cpp
index c4339b81fc..021f56d59b 100644
--- a/src/gpu/gl/GrGLShaderBuilder.cpp
+++ b/src/gpu/gl/GrGLShaderBuilder.cpp
@@ -81,7 +81,7 @@ void append_swizzle(SkString* outAppend,
 // varying by stage, if we use 1D textures for gradients!
 //const int GrGLShaderBuilder::fCoordDims = 2;
 
-GrGLShaderBuilder::GrGLShaderBuilder(const GrGLContextInfo& ctxInfo, 
+GrGLShaderBuilder::GrGLShaderBuilder(const GrGLContextInfo& ctxInfo,
                                      GrGLUniformManager& uniformManager)
     : fUniforms(kVarsPerBlock)
     , fVSAttrs(kVarsPerBlock)
diff --git a/src/ports/SkFontConfigInterface_direct.cpp b/src/ports/SkFontConfigInterface_direct.cpp
index d073747f60..a9e1f5ea02 100644
--- a/src/ports/SkFontConfigInterface_direct.cpp
+++ b/src/ports/SkFontConfigInterface_direct.cpp
@@ -433,5 +433,3 @@ SkStream* SkFontConfigInterfaceDirect::openStream(const FontIdentity& identity)
     int fd = open(identity.fString.c_str(), O_RDONLY);
     return (fd >= 0) ? SkNEW_ARGS(SkFDStream, (fd, true)) : NULL;
 }
-
-
diff --git a/src/ports/SkFontHost_fontconfig.cpp b/src/ports/SkFontHost_fontconfig.cpp
index 8144cc99ca..118d44c82c 100644
--- a/src/ports/SkFontHost_fontconfig.cpp
+++ b/src/ports/SkFontHost_fontconfig.cpp
@@ -214,11 +214,11 @@ SkTypeface* SkFontHost::Deserialize(SkStream* stream) {
 ///////////////////////////////////////////////////////////////////////////////
 
 SkStream* SkFontHost::OpenStream(uint32_t id) {
-    FontConfigTypeface* face = (FontConfigTypeface*)SkTypefaceCache::FindByID(id);    
+    FontConfigTypeface* face = (FontConfigTypeface*)SkTypefaceCache::FindByID(id);
     if (NULL == face) {
         return NULL;
     }
-    
+
     SkStream* stream = face->getLocalStream();
     if (stream) {
         stream->ref();
@@ -234,7 +234,7 @@ SkStream* SkFontHost::OpenStream(uint32_t id) {
 
 size_t SkFontHost::GetFileName(SkFontID fontID, char path[], size_t length,
                                int32_t* index) {
-    FontConfigTypeface* face = (FontConfigTypeface*)SkTypefaceCache::FindByID(fontID);    
+    FontConfigTypeface* face = (FontConfigTypeface*)SkTypefaceCache::FindByID(fontID);
     if (NULL == face || face->getLocalStream()) {
         return 0;
     }
@@ -251,5 +251,3 @@ size_t SkFontHost::GetFileName(SkFontID fontID, char path[], size_t length,
     }
     return filename.size();
 }
-
-