Sanitizing source files in Skia_Periodic_House_Keeping

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

15 files changed, 41 insertions, 44 deletions

diff --git a/experimental/Intersection/CubicIntersection.cpp b/experimental/Intersection/CubicIntersection.cpp
index 02310a3be7..f25a046858 100644
--- a/experimental/Intersection/CubicIntersection.cpp
+++ b/experimental/Intersection/CubicIntersection.cpp
@@ -327,7 +327,7 @@ static bool intersectEnd(const Cubic& cubic1, bool start, const Cubic& cubic2, c
             cubic2, tMin, tMax, 1, i);
 }
 
-// this flavor centers potential intersections recursively. In contrast, '2' may inadvertently 
+// this flavor centers potential intersections recursively. In contrast, '2' may inadvertently
 // chase intersections near quadratic ends, requiring odd hacks to find them.
 static bool intersect3(const Cubic& cubic1, double t1s, double t1e, const Cubic& cubic2,
         double t2s, double t2e, double precisionScale, Intersections& i) {
diff --git a/experimental/Intersection/CubicIntersection_Test.cpp b/experimental/Intersection/CubicIntersection_Test.cpp
index 381881cbf8..bdbf3de60f 100644
--- a/experimental/Intersection/CubicIntersection_Test.cpp
+++ b/experimental/Intersection/CubicIntersection_Test.cpp
@@ -70,7 +70,7 @@ static const Cubic testSet[] = {
 {{0,1}, {1,2}, {1,0}, {6,1}},
 {{0,1}, {1,6}, {1,0}, {2,1}},
 
-{{0,1}, {0,5}, {1,0}, {4,0}}, 
+{{0,1}, {0,5}, {1,0}, {4,0}},
 {{0,1}, {0,4}, {1,0}, {5,0}},
 
 {{0,1}, {3,4}, {1,0}, {3,0}},
diff --git a/experimental/Intersection/CubicUtilities.cpp b/experimental/Intersection/CubicUtilities.cpp
index 0c7f2c1cb5..1c9b9e486c 100644
--- a/experimental/Intersection/CubicUtilities.cpp
+++ b/experimental/Intersection/CubicUtilities.cpp
@@ -325,4 +325,3 @@ void xy_at_t(const Cubic& cubic, double t, double& x, double& y) {
         y = xy.y;
     }
 }
-
diff --git a/experimental/Intersection/DataTypes.h b/experimental/Intersection/DataTypes.h
index 09c43785e1..c6b24861e3 100644
--- a/experimental/Intersection/DataTypes.h
+++ b/experimental/Intersection/DataTypes.h
@@ -12,7 +12,7 @@
 
 #include "SkPoint.h"
 
-#define ONE_OFF_DEBUG 0 
+#define ONE_OFF_DEBUG 0
 
 // FIXME: move these into SkTypes.h
 template <typename T> inline T SkTMax(T a, T b) {
@@ -234,7 +234,7 @@ struct _Point {
         double inv = 1 / denom;
         return approximately_equal(x * inv, a.x * inv) && approximately_equal(y * inv, a.y * inv);
     }
-    
+
     bool approximatelyEqualHalf(const _Point& a) const {
         double denom = SkTMax(fabs(x), SkTMax(fabs(y), SkTMax(fabs(a.x), fabs(a.y))));
         if (denom == 0) {
@@ -248,7 +248,7 @@ struct _Point {
     bool approximatelyZero() const {
         return approximately_zero(x) && approximately_zero(y);
     }
-    
+
     SkPoint asSkPoint() const {
         SkPoint pt = {SkDoubleToScalar(x), SkDoubleToScalar(y)};
         return pt;
diff --git a/experimental/Intersection/EdgeWalker_TestUtility.cpp b/experimental/Intersection/EdgeWalker_TestUtility.cpp
index 00d70116c6..8afc09f3cc 100644
--- a/experimental/Intersection/EdgeWalker_TestUtility.cpp
+++ b/experimental/Intersection/EdgeWalker_TestUtility.cpp
@@ -259,7 +259,7 @@ int comparePaths(const SkPath& one, const SkPath& two, SkBitmap& bitmap) {
 }
 
 static void showShapeOpPath(const SkPath& one, const SkPath& two, const SkPath& a, const SkPath& b,
-        const SkPath& scaledOne, const SkPath& scaledTwo, const ShapeOp shapeOp, 
+        const SkPath& scaledOne, const SkPath& scaledTwo, const ShapeOp shapeOp,
         const SkMatrix& scale) {
     SkASSERT((unsigned) shapeOp < sizeof(opStrs) / sizeof(opStrs[0]));
     showPath(a, "minuend:");
diff --git a/experimental/Intersection/Intersections.cpp b/experimental/Intersection/Intersections.cpp
index 01026df55a..26fcc3f728 100644
--- a/experimental/Intersection/Intersections.cpp
+++ b/experimental/Intersection/Intersections.cpp
@@ -48,7 +48,7 @@ void Intersections::insertCoincidentPair(double s1, double e1, double s2, double
         SkASSERT(iEnd2 < fUsed);
         double cs2 = fT[fSwap ^ 1][i2];
         double ce2 = fT[fSwap ^ 1][iEnd2];
-        bool s2in = between(cs2, s2, ce2) || startPt.approximatelyEqual(fPt[i2]) 
+        bool s2in = between(cs2, s2, ce2) || startPt.approximatelyEqual(fPt[i2])
                 || startPt.approximatelyEqual(fPt[iEnd2]);
         bool e2in = between(cs2, e2, ce2) || endPt.approximatelyEqual(fPt[i2])
                 || endPt.approximatelyEqual(fPt[iEnd2]);
diff --git a/experimental/Intersection/Intersections.h b/experimental/Intersection/Intersections.h
index d339116b79..449849c143 100644
--- a/experimental/Intersection/Intersections.h
+++ b/experimental/Intersection/Intersections.h
@@ -63,7 +63,7 @@ public:
         fIsCoincident[0] |= bit;
         fIsCoincident[1] |= bit;
     }
-    
+
     void insertCoincidentPair(double s1, double e1, double s2, double e2,
             const _Point& startPt, const _Point& endPt);
 
@@ -74,7 +74,7 @@ public:
             return insert(one, two, pt);
         }
     }
-    
+
     bool intersected() const {
         return fUsed > 0;
     }
diff --git a/experimental/Intersection/LogoPlay.cpp b/experimental/Intersection/LogoPlay.cpp
index 3c9b75d86a..718da38bd3 100644
--- a/experimental/Intersection/LogoPlay.cpp
+++ b/experimental/Intersection/LogoPlay.cpp
@@ -351,4 +351,3 @@ void parseSVG() {
         data += 3;
     }
 }
-
diff --git a/experimental/Intersection/LogoPlay.h b/experimental/Intersection/LogoPlay.h
index 70e74da852..75800b04ba 100644
--- a/experimental/Intersection/LogoPlay.h
+++ b/experimental/Intersection/LogoPlay.h
@@ -6,4 +6,3 @@
  *  Copyright 2013 __MyCompanyName__. All rights reserved.
  *
  */
-
diff --git a/experimental/Intersection/Simplify.cpp b/experimental/Intersection/Simplify.cpp
index ed7c62e724..0a75f2a1e4 100644
--- a/experimental/Intersection/Simplify.cpp
+++ b/experimental/Intersection/Simplify.cpp
@@ -2255,7 +2255,7 @@ public:
     bool done(const Angle* angle) const {
         return done(SkMin32(angle->start(), angle->end()));
     }
-    
+
     SkPoint dxdy(int index) const {
         return (*SegmentDXDYAtT[fVerb])(fPts, fTs[index].fT);
     }
diff --git a/include/utils/SkDebugUtils.h b/include/utils/SkDebugUtils.h
index 64e2935d76..2fa6d41313 100644
--- a/include/utils/SkDebugUtils.h
+++ b/include/utils/SkDebugUtils.h
@@ -12,7 +12,7 @@
 
 #include "SkTypes.h"
 
-// These functions dump 0, 1, and 2d arrays of data in a format that's 
+// These functions dump 0, 1, and 2d arrays of data in a format that's
 // compatible with Mathematica for quick visualization
 
 
@@ -21,7 +21,7 @@ inline void SkDebugDumpMathematica( const T val ) {
     SkDEBUGFAIL("Need to specialize SkDebugDumpMathematica for your type, sorry.");
 }
 
-template<class T> 
+template<class T>
 inline void SkDebugDumpMathematica(const char *name, const T *array, int size) {
     SkDebugf(name);
     SkDebugf(" = {");
@@ -32,7 +32,7 @@ inline void SkDebugDumpMathematica(const char *name, const T *array, int size) {
     SkDebugf("};\n");
 }
 
-template<class T> 
+template<class T>
 inline void SkDebugDumpMathematica(const char *name, const T *array, int width, int height) {
     SkDebugf(name);
     SkDebugf(" = {\n");
@@ -52,7 +52,7 @@ inline void SkDebugDumpMathematica(const char *name, const T *array, int width,
     SkDebugf("\n};\n");
 }
 
-template<class T> 
+template<class T>
 inline void SkDebugDumpMathematica( const char *name, const T val ) {
     SkDebugf(name);
     SkDebugf(" = ");
@@ -60,32 +60,32 @@ inline void SkDebugDumpMathematica( const char *name, const T val ) {
     SkDebugf(";\n");
 }
 
-template<> 
+template<>
 inline void SkDebugDumpMathematica<uint8_t>( const uint8_t val ) {
     SkDebugf("%u", val);
 }
 
-template<> 
+template<>
 inline void SkDebugDumpMathematica<unsigned int>( const unsigned int val ) {
     SkDebugf("%u", val);
 }
 
-template<> 
+template<>
 inline void SkDebugDumpMathematica<int>( const int val ) {
     SkDebugf("%d", val);
 }
 
-template<> 
+template<>
 inline void SkDebugDumpMathematica<size_t>( const size_t val ) {
     SkDebugf("%u", val);
 }
 
-template<> 
+template<>
 void SkDebugDumpMathematica<const char *>( const char * val ) {
     SkDebugf("%s", val);
 }
 
-template<> 
+template<>
 inline void SkDebugDumpMathematica<float>( float val ) {
     SkDebugf("%f", val);
 }
diff --git a/src/gpu/GrDrawState.cpp b/src/gpu/GrDrawState.cpp
index 3ff8a97f55..8c74c4a4bd 100644
--- a/src/gpu/GrDrawState.cpp
+++ b/src/gpu/GrDrawState.cpp
@@ -50,10 +50,10 @@ namespace {
 
 /**
  * This function generates a mask that we like to have known at compile
- * time. When the number of stages is bumped or the way bits are defined in 
- * GrDrawState.h changes this function should be rerun to generate the new mask. 
- * (We attempted to force the compiler to generate the mask using recursive 
- * templates but always wound up with static initializers under gcc, even if 
+ * time. When the number of stages is bumped or the way bits are defined in
+ * GrDrawState.h changes this function should be rerun to generate the new mask.
+ * (We attempted to force the compiler to generate the mask using recursive
+ * templates but always wound up with static initializers under gcc, even if
  * they were just a series of immediate->memory moves.)
  *
  */
@@ -97,7 +97,7 @@ size_t GrDrawState::VertexSize(GrVertexLayout vertexLayout) {
  *
  * Order of vertex components:
  * Position
- * Tex Coord 
+ * Tex Coord
  * Color
  * Coverage
  */
diff --git a/src/gpu/GrDrawState.h b/src/gpu/GrDrawState.h
index ad31e0d5fc..05492a73ae 100644
--- a/src/gpu/GrDrawState.h
+++ b/src/gpu/GrDrawState.h
@@ -113,16 +113,16 @@ public:
     /**
      * The format of vertices is represented as a bitfield of flags.
      * Flags that indicate the layout of vertex data. Vertices always contain
-     * positions and may also contain texture coordinates, per-vertex colors, 
+     * positions and may also contain texture coordinates, per-vertex colors,
      * and per-vertex coverage. Each stage can use any texture coordinates as
-     * its input texture coordinates or it may use the positions as texture 
+     * its input texture coordinates or it may use the positions as texture
      * coordinates.
      *
      * If no texture coordinates are specified for a stage then the stage is
      * disabled.
      *
-     * The order in memory is always (position, texture coords, color, coverage) 
-     * with any unused fields omitted. 
+     * The order in memory is always (position, texture coords, color, coverage)
+     * with any unused fields omitted.
      */
 
     /**
@@ -229,7 +229,7 @@ public:
 
     /**
      * Helper function to compute the size of each vertex and the offsets of
-     * texture coordinates and color. 
+     * texture coordinates and color.
      *
      * @param vertexLayout          the layout to query
      * @param texCoordOffset        after return it is the offset of the
diff --git a/src/gpu/GrDrawTarget.h b/src/gpu/GrDrawTarget.h
index aad819c92b..a371a9bde2 100644
--- a/src/gpu/GrDrawTarget.h
+++ b/src/gpu/GrDrawTarget.h
@@ -385,22 +385,22 @@ public:
      * have changed. They should be reestablished before the next drawIndexed
      * or drawNonIndexed. This cannot be called between reserving and releasing
      * geometry.
-     * 
+     *
      * A subclass may override this to perform more optimal rect rendering. Its
      * draws should be funneled through one of the public GrDrawTarget draw methods
      * (e.g. drawNonIndexed, drawIndexedInstances, ...). The base class draws a two
      * triangle fan using drawNonIndexed from reserved vertex space.
-     * 
+     *
      * @param rect      the rect to draw
      * @param matrix    optional matrix applied to rect (before viewMatrix)
      * @param srcRects  specifies rect for explicit texture coordinates.
      *                  if srcRect is non-NULL then that rect will be used
      *                  as the coordinates for the given stage.
      * @param srcMatrix   optional matrix applied to srcRect. If
-     *                    srcRect is non-NULL and srcMatrix is non-NULL 
-     *                    then srcRect will be transformed by srcMatrix. 
+     *                    srcRect is non-NULL and srcMatrix is non-NULL
+     *                    then srcRect will be transformed by srcMatrix.
      *                    srcMatrix can be NULL when no srcMatrix is desired.
-     * @param stage     the stage to be given explicit texture coordinates. 
+     * @param stage     the stage to be given explicit texture coordinates.
      *                  Ignored if srcRect is NULL.
      */
     virtual void drawRect(const GrRect& rect,
diff --git a/src/gpu/gl/mac/SkNativeGLContext_mac.cpp b/src/gpu/gl/mac/SkNativeGLContext_mac.cpp
index bcdc7ab9f2..460fad7e26 100644
--- a/src/gpu/gl/mac/SkNativeGLContext_mac.cpp
+++ b/src/gpu/gl/mac/SkNativeGLContext_mac.cpp
@@ -33,7 +33,7 @@ void SkNativeGLContext::destroyGLContext() {
 
 const GrGLInterface* SkNativeGLContext::createGLContext() {
     SkASSERT(NULL == fContext);
-    
+
     CGLPixelFormatAttribute attributes[] = {
 #if 0
         kCGLPFAOpenGLProfile, kCGLOGLPVersion_3_2_Core,
@@ -42,22 +42,22 @@ const GrGLInterface* SkNativeGLContext::createGLContext() {
     };
     CGLPixelFormatObj pixFormat;
     GLint npix;
-    
+
     CGLChoosePixelFormat(attributes, &pixFormat, &npix);
-    
+
     if (NULL == pixFormat) {
         SkDebugf("CGLChoosePixelFormat failed.");
         return NULL;
     }
-    
+
     CGLCreateContext(pixFormat, NULL, &fContext);
     CGLReleasePixelFormat(pixFormat);
-    
+
     if (NULL == fContext) {
         SkDebugf("CGLCreateContext failed.");
         return NULL;
     }
-    
+
     CGLSetCurrentContext(fContext);
 
     const GrGLInterface* interface = GrGLCreateNativeInterface();