Result of running tools/sanitize_source_files.py (which was added in https://codereview.appspot.com/6465078/)

This CL is part I of IV (I broke down the 1280 files into 4 CLs).
Review URL: https://codereview.appspot.com/6485054

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

19 files changed, 78 insertions, 78 deletions

diff --git a/include/gpu/GrAARectRenderer.h b/include/gpu/GrAARectRenderer.h
index fdaa30a47e..e8b9f158bc 100644
--- a/include/gpu/GrAARectRenderer.h
+++ b/include/gpu/GrAARectRenderer.h
@@ -23,7 +23,7 @@ class GrAARectRenderer : public GrRefCnt {
 public:
     SK_DECLARE_INST_COUNT(GrAARectRenderer)
 
-    GrAARectRenderer() 
+    GrAARectRenderer()
     : fAAFillRectIndexBuffer(NULL)
     , fAAStrokeRectIndexBuffer(NULL) {
     }
diff --git a/include/gpu/GrCacheID.h b/include/gpu/GrCacheID.h
index e6f5f752d1..e593d7ee3f 100644
--- a/include/gpu/GrCacheID.h
+++ b/include/gpu/GrCacheID.h
@@ -45,18 +45,18 @@
  *      the resource-specific portion - which is filled in by each GrResource-
  *              derived class.
  *
- * For the public portion each client of the cache makes up its own 
- * unique-per-resource identifier (e.g., bitmap genID). A public ID of 
- * 'kScratch_CacheID' indicates that the resource is a "scratch" resource. 
- * When used to acquire a resource it indicates the cache user is 
- * looking for a resource that matches a resource-subclass-specific set of 
- * “dimensions” such as width, height, buffer size, or pixel config, but not 
- * for particular resource contents (e.g., texel or vertex values). The public 
- * IDs are unique within a private ID value but not necessarily across 
+ * For the public portion each client of the cache makes up its own
+ * unique-per-resource identifier (e.g., bitmap genID). A public ID of
+ * 'kScratch_CacheID' indicates that the resource is a "scratch" resource.
+ * When used to acquire a resource it indicates the cache user is
+ * looking for a resource that matches a resource-subclass-specific set of
+ * “dimensions” such as width, height, buffer size, or pixel config, but not
+ * for particular resource contents (e.g., texel or vertex values). The public
+ * IDs are unique within a private ID value but not necessarily across
  * private IDs.
  *
  * The domain portion identifies the cache client while the type field
- * indicates the resource type. When the public portion indicates that the 
+ * indicates the resource type. When the public portion indicates that the
  * resource is a scratch resource, the domain field should be kUnrestricted
  * so that scratch resources can be recycled across domains.
  */
diff --git a/include/gpu/GrClipData.h b/include/gpu/GrClipData.h
index c9d934d96e..0cf702234c 100644
--- a/include/gpu/GrClipData.h
+++ b/include/gpu/GrClipData.h
@@ -19,7 +19,7 @@ class GrSurface;
 /**
  * GrClipData encapsulates the information required to construct the clip
  * masks. 'fOrigin' is only non-zero when saveLayer has been called
- * with an offset bounding box. The clips in 'fClipStack' are in 
+ * with an offset bounding box. The clips in 'fClipStack' are in
  * device coordinates (i.e., they have been translated by -fOrigin w.r.t.
  * the canvas' device coordinates).
  */
@@ -28,7 +28,7 @@ public:
     const SkClipStack*  fClipStack;
     SkIPoint            fOrigin;
 
-    GrClipData() 
+    GrClipData()
         : fClipStack(NULL) {
         fOrigin.setZero();
     }
@@ -45,11 +45,11 @@ public:
         return fClipStack == other.fClipStack;
     }
 
-    bool operator!=(const GrClipData& other) const { 
-        return !(*this == other); 
+    bool operator!=(const GrClipData& other) const {
+        return !(*this == other);
     }
 
-    void getConservativeBounds(const GrSurface* surface, 
+    void getConservativeBounds(const GrSurface* surface,
                                GrIRect* devResult,
                                bool* isIntersectionOfRects = NULL) const;
 };
diff --git a/include/gpu/GrConfig.h b/include/gpu/GrConfig.h
index ffab237f41..327dbb44b1 100644
--- a/include/gpu/GrConfig.h
+++ b/include/gpu/GrConfig.h
@@ -118,7 +118,7 @@ typedef unsigned __int64 uint64_t;
 #else
 /*
  *  Include stdint.h with defines that trigger declaration of C99 limit/const
- *  macros here before anyone else has a chance to include stdint.h without 
+ *  macros here before anyone else has a chance to include stdint.h without
  *  these.
  */
 #define __STDC_LIMIT_MACROS
diff --git a/include/gpu/GrContext.h b/include/gpu/GrContext.h
index 8dd81d9d8f..8ee326c974 100644
--- a/include/gpu/GrContext.h
+++ b/include/gpu/GrContext.h
@@ -15,7 +15,7 @@
 #include "GrClipData.h"
 // not strictly needed but requires WK change in LayerTextureUpdaterCanvas to
 // remove.
-#include "GrRenderTarget.h" 
+#include "GrRenderTarget.h"
 #include "SkClipStack.h"
 
 class GrAutoScratchTexture;
@@ -164,12 +164,12 @@ public:
      * unlocked. Call must be balanced with an unlockTexture() call.
      *
      * Textures created by createAndLockTexture() hide the complications of
-     * tiling non-power-of-two textures on APIs that don't support this (e.g. 
+     * tiling non-power-of-two textures on APIs that don't support this (e.g.
      * unextended GLES2). Tiling a npot texture created by lockScratchTexture on
      * such an API will create gaps in the tiling pattern. This includes clamp
      * mode. (This may be addressed in a future update.)
      */
-    GrTexture* lockScratchTexture(const GrTextureDesc& desc, 
+    GrTexture* lockScratchTexture(const GrTextureDesc& desc,
                                   ScratchTexMatch match);
 
     /**
@@ -223,7 +223,7 @@ public:
     int getMaxTextureSize() const;
 
     /**
-     * Return the max width or height of a render target supported by the 
+     * Return the max width or height of a render target supported by the
      * current gpu
      */
     int getMaxRenderTargetSize() const;
@@ -326,7 +326,7 @@ public:
      * @param target if non-NULL, the render target to clear otherwise clear
      *               the current render target
      */
-    void clear(const GrIRect* rect, GrColor color, 
+    void clear(const GrIRect* rect, GrColor color,
                GrRenderTarget* target = NULL);
 
     /**
@@ -667,7 +667,7 @@ public:
 
     class AutoClip : GrNoncopyable {
     public:
-        AutoClip(GrContext* context, const GrRect& newClipRect) 
+        AutoClip(GrContext* context, const GrRect& newClipRect)
         : fContext(context)
         , fNewClipStack(newClipRect) {
             fNewClipData.fClipStack = &fNewClipStack;
@@ -794,7 +794,7 @@ public:
       , fTexture(NULL) {
       this->set(context, desc, match);
     }
-    
+
     ~GrAutoScratchTexture() {
         this->reset();
     }
@@ -808,11 +808,11 @@ public:
 
     /*
      * When detaching a texture we do not unlock it in the texture cache but
-     * we do set the returnToCache flag. In this way the texture remains 
-     * "locked" in the texture cache until it is freed and recycled in 
-     * GrTexture::internal_dispose. In reality, the texture has been removed 
-     * from the cache (because this is in AutoScratchTexture) and by not 
-     * calling unlockTexture we simply don't re-add it. It will be reattached 
+     * we do set the returnToCache flag. In this way the texture remains
+     * "locked" in the texture cache until it is freed and recycled in
+     * GrTexture::internal_dispose. In reality, the texture has been removed
+     * from the cache (because this is in AutoScratchTexture) and by not
+     * calling unlockTexture we simply don't re-add it. It will be reattached
      * in GrTexture::internal_dispose.
      *
      * Note that the caller is assumed to accept and manage the ref to the
diff --git a/include/gpu/GrContextFactory.h b/include/gpu/GrContextFactory.h
index 409c7fa15f..600bedae66 100644
--- a/include/gpu/GrContextFactory.h
+++ b/include/gpu/GrContextFactory.h
@@ -22,7 +22,7 @@
 #include "SkTArray.h"
 
 /**
- * This is a simple class that is useful in test apps that use different 
+ * This is a simple class that is useful in test apps that use different
  * GrContexts backed by different types of GL contexts. It manages creating the
  * GL context and a GrContext that uses it. The GL/Gr contexts persist until the
  * factory is destroyed (though the caller can always grab a ref on the returned
diff --git a/include/gpu/GrCustomStage.h b/include/gpu/GrCustomStage.h
index 0ac7a76205..fd5d7e00dc 100644
--- a/include/gpu/GrCustomStage.h
+++ b/include/gpu/GrCustomStage.h
@@ -38,7 +38,7 @@ private:
 };
 
 /** Provides custom vertex shader, fragment shader, uniform data for a
-    particular stage of the Ganesh shading pipeline. 
+    particular stage of the Ganesh shading pipeline.
     Subclasses must have a function that produces a human-readable name:
         static const char* Name();
     GrCustomStage objects *must* be immutable: after being constructed,
@@ -71,7 +71,7 @@ public:
         Example:
         class MyCustomStage : public GrCustomStage {
         ...
-            virtual const GrProgramStageFactory& getFactory() const 
+            virtual const GrProgramStageFactory& getFactory() const
                                                             SK_OVERRIDE {
                 return GrTProgramStageFactory<MyCustomStage>::getInstance();
             }
diff --git a/include/gpu/GrGlyph.h b/include/gpu/GrGlyph.h
index f79de7cb33..956404ec11 100644
--- a/include/gpu/GrGlyph.h
+++ b/include/gpu/GrGlyph.h
@@ -38,40 +38,40 @@ struct GrGlyph {
         fBounds.set(bounds);
         fAtlasLocation.set(0, 0);
     }
-    
+
     void free() {
         if (fPath) {
             delete fPath;
             fPath = NULL;
         }
     }
-    
+
     int width() const { return fBounds.width(); }
     int height() const { return fBounds.height(); }
     bool isEmpty() const { return fBounds.isEmpty(); }
     uint16_t glyphID() const { return UnpackID(fPackedID); }
 
     ///////////////////////////////////////////////////////////////////////////
-    
+
     static inline unsigned ExtractSubPixelBitsFromFixed(GrFixed pos) {
         // two most significant fraction bits from fixed-point
         return (pos >> 14) & 3;
     }
-    
+
     static inline PackedID Pack(uint16_t glyphID, GrFixed x, GrFixed y) {
         x = ExtractSubPixelBitsFromFixed(x);
         y = ExtractSubPixelBitsFromFixed(y);
         return (x << 18) | (y << 16) | glyphID;
     }
-    
+
     static inline GrFixed UnpackFixedX(PackedID packed) {
         return ((packed >> 18) & 3) << 14;
     }
-    
+
     static inline GrFixed UnpackFixedY(PackedID packed) {
         return ((packed >> 16) & 3) << 14;
     }
-    
+
     static inline uint16_t UnpackID(PackedID packed) {
         return (uint16_t)packed;
     }
diff --git a/include/gpu/GrPaint.h b/include/gpu/GrPaint.h
index 90bd9a7c73..f9573bba93 100644
--- a/include/gpu/GrPaint.h
+++ b/include/gpu/GrPaint.h
@@ -151,7 +151,7 @@ public:
         if (fColorMatrixEnabled) {
             memcpy(fColorMatrix, paint.fColorMatrix, sizeof(fColorMatrix));
         }
-        
+
         for (int i = 0; i < kMaxTextures; ++i) {
             if (paint.isTextureStageEnabled(i)) {
                 fTextureSamplers[i] = paint.fTextureSamplers[i];
diff --git a/include/gpu/GrPoint.h b/include/gpu/GrPoint.h
index b32123b568..fd2c5a7cc1 100644
--- a/include/gpu/GrPoint.h
+++ b/include/gpu/GrPoint.h
@@ -20,7 +20,7 @@
 
 struct GrIPoint16 {
     int16_t fX, fY;
-    
+
     void set(intptr_t x, intptr_t y) {
         fX = GrToS16(x);
         fY = GrToS16(y);
diff --git a/include/gpu/GrRect.h b/include/gpu/GrRect.h
index 60a4773820..42ddd8e8fe 100644
--- a/include/gpu/GrRect.h
+++ b/include/gpu/GrRect.h
@@ -19,12 +19,12 @@ typedef SkRect  GrRect;
 
 struct GrIRect16 {
     int16_t fLeft, fTop, fRight, fBottom;
-    
+
     int width() const { return fRight - fLeft; }
     int height() const { return fBottom - fTop; }
     int area() const { return this->width() * this->height(); }
     bool isEmpty() const { return fLeft >= fRight || fTop >= fBottom; }
-    
+
     void set(const GrIRect& r) {
         fLeft   = SkToS16(r.fLeft);
         fTop    = SkToS16(r.fTop);
diff --git a/include/gpu/GrRenderTarget.h b/include/gpu/GrRenderTarget.h
index 33df8c6329..d6e8ee0be8 100644
--- a/include/gpu/GrRenderTarget.h
+++ b/include/gpu/GrRenderTarget.h
@@ -49,8 +49,8 @@ public:
      * @return this render target.
      */
     virtual GrRenderTarget* asRenderTarget() SK_OVERRIDE { return this; }
-    virtual const GrRenderTarget* asRenderTarget() const  SK_OVERRIDE { 
-        return this; 
+    virtual const GrRenderTarget* asRenderTarget() const  SK_OVERRIDE {
+        return this;
     }
 
     virtual bool readPixels(int left, int top, int width, int height,
@@ -132,7 +132,7 @@ public:
     void resolve();
 
     // a MSAA RT may require explicit resolving , it may auto-resolve (e.g. FBO
-    // 0 in GL), or be unresolvable because the client didn't give us the 
+    // 0 in GL), or be unresolvable because the client didn't give us the
     // resolve destination.
     enum ResolveType {
         kCanResolve_ResolveType,
@@ -159,7 +159,7 @@ protected:
 
     friend class GrTexture;
     // When a texture unrefs an owned rendertarget this func
-    // removes the back pointer. This could be called from 
+    // removes the back pointer. This could be called from
     // texture's destructor but would have to be done in derived
     // classes. By the time of texture base destructor it has already
     // lost its pointer to the rt.
diff --git a/include/gpu/GrSamplerState.h b/include/gpu/GrSamplerState.h
index f87b9b4e10..12c0937dfd 100644
--- a/include/gpu/GrSamplerState.h
+++ b/include/gpu/GrSamplerState.h
@@ -103,7 +103,7 @@ public:
     bool operator ==(const GrSamplerState& s) const {
         /* We must be bit-identical as far as the CustomStage;
            there may be multiple CustomStages that will produce
-           the same shader code and so are equivalent. 
+           the same shader code and so are equivalent.
            Can't take the address of fWrapX because it's :8 */
         int bitwiseRegion = (intptr_t) &fCustomStage - (intptr_t) this;
         GrAssert(sizeof(GrSamplerState) ==
@@ -157,7 +157,7 @@ public:
      *
      *  After this call M' = M*m where M is the old matrix, m is the parameter
      *  to this function, and M' is the new matrix. (We consider points to
-     *  be column vectors so tex cood vector t is transformed by matrix X as 
+     *  be column vectors so tex cood vector t is transformed by matrix X as
      *  t' = X*t.)
      *
      *  @param matrix   the matrix used to modify the matrix.
diff --git a/include/gpu/GrTexture.h b/include/gpu/GrTexture.h
index c7bfb8c363..5f6d53522a 100644
--- a/include/gpu/GrTexture.h
+++ b/include/gpu/GrTexture.h
@@ -42,16 +42,16 @@ public:
     void resetFlag(GrTextureFlags flags) {
         fDesc.fFlags = fDesc.fFlags & ~flags;
     }
-    bool isSetFlag(GrTextureFlags flags) const { 
-        return 0 != (fDesc.fFlags & flags); 
+    bool isSetFlag(GrTextureFlags flags) const {
+        return 0 != (fDesc.fFlags & flags);
     }
 
     /**
      *  Approximate number of bytes used by the texture
      */
     virtual size_t sizeInBytes() const SK_OVERRIDE {
-        return (size_t) fDesc.fWidth * 
-                        fDesc.fHeight * 
+        return (size_t) fDesc.fWidth *
+                        fDesc.fHeight *
                         GrBytesPerPixel(fDesc.fConfig);
     }
 
@@ -81,11 +81,11 @@ public:
      * @return    handle to render target or NULL if the texture is not a
      *            render target
      */
-    virtual GrRenderTarget* asRenderTarget() SK_OVERRIDE { 
-        return fRenderTarget; 
+    virtual GrRenderTarget* asRenderTarget() SK_OVERRIDE {
+        return fRenderTarget;
     }
-    virtual const GrRenderTarget* asRenderTarget() const SK_OVERRIDE { 
-        return fRenderTarget; 
+    virtual const GrRenderTarget* asRenderTarget() const SK_OVERRIDE {
+        return fRenderTarget;
     }
 
     // GrTexture
@@ -93,13 +93,13 @@ public:
      * Convert from texels to normalized texture coords for POT textures
      * only.
      */
-    GrFixed normalizeFixedX(GrFixed x) const { 
+    GrFixed normalizeFixedX(GrFixed x) const {
         GrAssert(GrIsPow2(fDesc.fWidth));
-        return x >> fShiftFixedX; 
+        return x >> fShiftFixedX;
     }
-    GrFixed normalizeFixedY(GrFixed y) const { 
+    GrFixed normalizeFixedY(GrFixed y) const {
         GrAssert(GrIsPow2(fDesc.fHeight));
-        return y >> fShiftFixedY; 
+        return y >> fShiftFixedY;
     }
 
     /**
@@ -117,7 +117,7 @@ public:
 
     /**
      *  Call this when the state of the native API texture object is
-     *  altered directly, without being tracked by skia. 
+     *  altered directly, without being tracked by skia.
      */
     virtual void invalidateCachedState() = 0;
 
diff --git a/include/gpu/GrTypes.h b/include/gpu/GrTypes.h
index 58f8968530..6888f5c33b 100644
--- a/include/gpu/GrTypes.h
+++ b/include/gpu/GrTypes.h
@@ -298,7 +298,7 @@ enum GrPixelConfig {
     kGrPixelConfigCount
 };
 
-// Aliases for pixel configs that match skia's byte order. 
+// Aliases for pixel configs that match skia's byte order.
 #ifndef SK_CPU_LENDIAN
     #error "Skia gpu currently assumes little endian"
 #endif
@@ -404,7 +404,7 @@ enum GrTextureFlags {
      * Creates a texture that can be rendered to as a GrRenderTarget. Use
      * GrTexture::asRenderTarget() to access.
      */
-    kRenderTarget_GrTextureFlagBit  = 0x1,  
+    kRenderTarget_GrTextureFlagBit  = 0x1,
     /**
      * By default all render targets have an associated stencil buffer that
      * may be required for path filling. This flag overrides stencil buffer
@@ -435,7 +435,7 @@ enum {
  * Describes a texture to be created.
  */
 struct GrTextureDesc {
-    GrTextureDesc() 
+    GrTextureDesc()
     : fFlags(kNone_GrTextureFlags)
     , fWidth(0)
     , fHeight(0)
@@ -464,7 +464,7 @@ struct GrTextureDesc {
 };
 
 /**
- * GrCacheData holds user-provided cache-specific data. It is used in 
+ * GrCacheData holds user-provided cache-specific data. It is used in
  * combination with the GrTextureDesc to construct a cache key for texture
  * resources.
  */
@@ -484,7 +484,7 @@ struct GrCacheData {
     // No default constructor is provided since, if you are creating one
     // of these, you should definitely have a key (or be using the scratch
     // key).
-    GrCacheData(uint64_t key) 
+    GrCacheData(uint64_t key)
     : fClientCacheID(key)
     , fResourceDomain(kScratch_ResourceDomain) {
     }
@@ -600,8 +600,8 @@ typedef intptr_t GrPlatform3DObject;
 /**
  * Gr can wrap an existing texture created by the client with a GrTexture
  * object. The client is responsible for ensuring that the texture lives at
- * least as long as the GrTexture object wrapping it. We require the client to 
- * explicitly provide information about the texture, such as width, height, 
+ * least as long as the GrTexture object wrapping it. We require the client to
+ * explicitly provide information about the texture, such as width, height,
  * and pixel config, rather than querying the 3D APIfor these values. We expect
  * these to be immutable even if the 3D API doesn't require this (OpenGL).
  *
@@ -658,7 +658,7 @@ struct GrPlatformTextureDesc {
  * Gr can wrap an existing render target created by the client in the 3D API
  * with a GrRenderTarget object. The client is responsible for ensuring that the
  * underlying 3D API object lives at least as long as the GrRenderTarget object
- * wrapping it. We require the client to explicitly provide information about 
+ * wrapping it. We require the client to explicitly provide information about
  * the target, such as width, height, and pixel config rather than querying the
  * 3D API for these values. We expect these properties to be immutable even if
  * the 3D API doesn't require this (OpenGL).
diff --git a/include/gpu/gl/GrGLConfig.h b/include/gpu/gl/GrGLConfig.h
index dd38283e25..20d9031264 100644
--- a/include/gpu/gl/GrGLConfig.h
+++ b/include/gpu/gl/GrGLConfig.h
@@ -49,7 +49,7 @@
  * GR_GL_NO_CONSTANT_ATTRIBUTES: if this evaluates to true then the GL backend
  * will use uniforms instead of attributes in all cases when there is not
  * per-vertex data. This is important when the underlying GL implementation
- * doesn't actually support immediate style attribute values (e.g. when 
+ * doesn't actually support immediate style attribute values (e.g. when
  * the GL stream is converted to DX as in ANGLE on Chrome). Defaults to 0.
  *
  * GR_GL_USE_BUFFER_DATA_NULL_HINT: When specifing new data for a vertex/index
diff --git a/include/gpu/gl/GrGLFunctions.h b/include/gpu/gl/GrGLFunctions.h
index 626d904726..b0b3b16313 100644
--- a/include/gpu/gl/GrGLFunctions.h
+++ b/include/gpu/gl/GrGLFunctions.h
@@ -103,7 +103,7 @@ extern "C" {
     typedef GrGLvoid (GR_GL_FUNCTION_TYPE* GrGLGetQueryObjecti64vProc)(GrGLuint id, GrGLenum pname, GrGLint64 *params);
     typedef GrGLvoid (GR_GL_FUNCTION_TYPE* GrGLGetQueryObjectivProc)(GrGLuint id, GrGLenum pname, GrGLint *params);
     typedef GrGLvoid (GR_GL_FUNCTION_TYPE* GrGLGetQueryObjectui64vProc)(GrGLuint id, GrGLenum pname, GrGLuint64 *params);
-    typedef GrGLvoid (GR_GL_FUNCTION_TYPE* GrGLGetQueryObjectuivProc)(GrGLuint id, GrGLenum pname, GrGLuint *params);    
+    typedef GrGLvoid (GR_GL_FUNCTION_TYPE* GrGLGetQueryObjectuivProc)(GrGLuint id, GrGLenum pname, GrGLuint *params);
     typedef GrGLvoid (GR_GL_FUNCTION_TYPE* GrGLGetRenderbufferParameterivProc)(GrGLenum target, GrGLenum pname, GrGLint* params);
     typedef GrGLvoid (GR_GL_FUNCTION_TYPE* GrGLGetShaderInfoLogProc)(GrGLuint shader, GrGLsizei bufsize, GrGLsizei* length, char* infolog);
     typedef GrGLvoid (GR_GL_FUNCTION_TYPE* GrGLGetShaderivProc)(GrGLuint shader, GrGLenum pname, GrGLint* params);
@@ -160,7 +160,7 @@ extern "C" {
     typedef GrGLvoid (GR_GL_FUNCTION_TYPE* GrGLViewportProc)(GrGLint x, GrGLint y, GrGLsizei width, GrGLsizei height);
 
     // Experimental: Functions for GL_NV_path_rendering. These will be
-    // alphabetized with the above functions once this is fully supported 
+    // alphabetized with the above functions once this is fully supported
     // (and functions we are unlikely to use will possibly be omitted).
     typedef GrGLvoid (GR_GL_FUNCTION_TYPE* GrGLMatrixModeProc)(GrGLenum);
     typedef GrGLvoid (GR_GL_FUNCTION_TYPE* GrGLLoadIdentityProc)();
diff --git a/include/gpu/gl/GrGLInterface.h b/include/gpu/gl/GrGLInterface.h
index c627b90fd6..e1ca40e391 100644
--- a/include/gpu/gl/GrGLInterface.h
+++ b/include/gpu/gl/GrGLInterface.h
@@ -45,7 +45,7 @@ enum GrGLBinding {
  * whether the same GrGLInterface is returned or whether a new one is created
  * at each call. Some platforms may not be able to use a single GrGLInterface
  * because extension function ptrs vary across contexts. Note that GrGLInterface
- * is ref-counted. So if the same object is returned by multiple calls to 
+ * is ref-counted. So if the same object is returned by multiple calls to
  * GrGLDefaultInterface, each should bump the ref count.
  *
  * By defining GR_GL_PER_GL_CALL_IFACE_CALLBACK to 1 the client can specify a
@@ -60,7 +60,7 @@ const GrGLInterface* GrGLDefaultInterface();
 /**
  * Creates a GrGLInterface for a "native" GL context (e.g. WGL on windows,
  * GLX on linux, AGL on Mac). On platforms that have context-specific function
- * pointers for GL extensions (e.g. windows) the returned interface is only 
+ * pointers for GL extensions (e.g. windows) the returned interface is only
  * valid for the context that was current at creation.
  */
 const GrGLInterface* GrGLCreateNativeInterface();
@@ -86,7 +86,7 @@ const GrGLInterface* GrGLCreateANGLEInterface();
 const GrGLInterface* GrGLCreateNullInterface();
 
 /**
- * Creates a debugging GrGLInterface that doesn't draw anything. Used for 
+ * Creates a debugging GrGLInterface that doesn't draw anything. Used for
  * finding memory leaks and invalid memory accesses.
  */
 const GrGLInterface* GrGLCreateDebugInterface();
@@ -255,7 +255,7 @@ public:
     GLPtr<GrGLViewportProc> fViewport;
 
     // Experimental: Functions for GL_NV_path_rendering. These will be
-    // alphabetized with the above functions once this is fully supported 
+    // alphabetized with the above functions once this is fully supported
     // (and functions we are unlikely to use will possibly be omitted).
     GLPtr<GrGLMatrixModeProc> fMatrixMode;
     GLPtr<GrGLLoadIdentityProc> fLoadIdentity;
diff --git a/include/gpu/gl/SkGLContext.h b/include/gpu/gl/SkGLContext.h
index b8b6b6e85d..3f99eaeb6a 100644
--- a/include/gpu/gl/SkGLContext.h
+++ b/include/gpu/gl/SkGLContext.h
@@ -38,8 +38,8 @@ public:
 
 protected:
     /**
-     * Subclass implements this to make a GL context. The returned GrGLInterface 
-     * should be populated with functions compatible with the context. The 
+     * Subclass implements this to make a GL context. The returned GrGLInterface
+     * should be populated with functions compatible with the context. The
      * format and size of backbuffers does not matter since an FBO will be
      * created.
      */