Sanitizing source files in Housekeeper-Nightly

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

9 files changed, 36 insertions, 38 deletions

diff --git a/samplecode/SamplePatch.cpp b/samplecode/SamplePatch.cpp
index 88bd06f7f0..09eb42f6aa 100644
--- a/samplecode/SamplePatch.cpp
+++ b/samplecode/SamplePatch.cpp
@@ -311,7 +311,7 @@ protected:
         }
         patch.setBounds(fSize1.fX, fSize1.fY);
         drawpatches(canvas, paint, 10, 10, &patch);
-        
+
         this->inval(NULL);
     }
 
diff --git a/src/core/SkLocalMatrixShader.cpp b/src/core/SkLocalMatrixShader.cpp
index 63a1cedad0..802e72ef3f 100644
--- a/src/core/SkLocalMatrixShader.cpp
+++ b/src/core/SkLocalMatrixShader.cpp
@@ -15,44 +15,44 @@ public:
         : fProxyShader(SkRef(proxy))
         , fProxyLocalMatrix(localMatrix)
     {}
-    
+
     virtual size_t contextSize() const SK_OVERRIDE {
         return fProxyShader->contextSize();
     }
-    
+
     virtual BitmapType asABitmap(SkBitmap* bitmap, SkMatrix* matrix,
                                  TileMode* mode) const SK_OVERRIDE {
         return fProxyShader->asABitmap(bitmap, matrix, mode);
     }
-    
+
     virtual GradientType asAGradient(GradientInfo* info) const SK_OVERRIDE {
         return fProxyShader->asAGradient(info);
     }
-    
+
     // TODO: need to augment this API to pass in a localmatrix (which we can augment)
     virtual GrEffectRef* asNewEffect(GrContext* ctx, const SkPaint& paint) const SK_OVERRIDE {
         return fProxyShader->asNewEffect(ctx, paint);
     }
-    
+
     virtual SkShader* refAsALocalMatrixShader(SkMatrix* localMatrix) const SK_OVERRIDE {
         if (localMatrix) {
             *localMatrix = fProxyLocalMatrix;
         }
         return SkRef(fProxyShader.get());
     }
-    
+
     SK_TO_STRING_OVERRIDE()
     SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(SkLocalMatrixShader)
-    
+
 protected:
     SkLocalMatrixShader(SkReadBuffer&);
     virtual void flatten(SkWriteBuffer&) const SK_OVERRIDE;
     virtual Context* onCreateContext(const ContextRec&, void*) const SK_OVERRIDE;
-    
+
 private:
     SkAutoTUnref<SkShader> fProxyShader;
     SkMatrix  fProxyLocalMatrix;
-    
+
     typedef SkShader INHERITED;
 };
 
@@ -86,11 +86,11 @@ SkShader::Context* SkLocalMatrixShader::onCreateContext(const ContextRec& rec,
 #ifndef SK_IGNORE_TO_STRING
 void SkLocalMatrixShader::toString(SkString* str) const {
     str->append("SkLocalMatrixShader: (");
-    
+
     fProxyShader->toString(str);
-    
+
     this->INHERITED::toString(str);
-    
+
     str->append(")");
 }
 #endif
@@ -99,9 +99,9 @@ SkShader* SkShader::CreateLocalMatrixShader(SkShader* proxy, const SkMatrix& loc
     if (localMatrix.isIdentity()) {
         return SkRef(proxy);
     }
-    
+
     const SkMatrix* lm = &localMatrix;
-    
+
     SkMatrix otherLocalMatrix;
     SkAutoTUnref<SkShader> otherProxy(proxy->refAsALocalMatrixShader(&otherLocalMatrix));
     if (otherProxy.get()) {
@@ -109,7 +109,6 @@ SkShader* SkShader::CreateLocalMatrixShader(SkShader* proxy, const SkMatrix& loc
         lm = &otherLocalMatrix;
         proxy = otherProxy.get();
     }
-    
+
     return SkNEW_ARGS(SkLocalMatrixShader, (proxy, *lm));
 }
-
diff --git a/src/core/SkPicturePlayback.cpp b/src/core/SkPicturePlayback.cpp
index 94fe421633..28ca689d01 100644
--- a/src/core/SkPicturePlayback.cpp
+++ b/src/core/SkPicturePlayback.cpp
@@ -23,10 +23,10 @@ template <typename T> int SafeCount(const T* obj) {
  */
 #define SPEW_CLIP_SKIPPINGx
 
-SkPicturePlayback::PlaybackReplacements::ReplacementInfo* 
-SkPicturePlayback::PlaybackReplacements::push() { 
+SkPicturePlayback::PlaybackReplacements::ReplacementInfo*
+SkPicturePlayback::PlaybackReplacements::push() {
     SkDEBUGCODE(this->validate());
-    return fReplacements.push(); 
+    return fReplacements.push();
 }
 
 void SkPicturePlayback::PlaybackReplacements::freeAll() {
@@ -776,7 +776,7 @@ private:
 };
 
 // TODO: Replace with hash or pass in "lastLookedUp" hint
-SkPicturePlayback::PlaybackReplacements::ReplacementInfo* 
+SkPicturePlayback::PlaybackReplacements::ReplacementInfo*
 SkPicturePlayback::PlaybackReplacements::lookupByStart(size_t start) {
     SkDEBUGCODE(this->validate());
     for (int i = 0; i < fReplacements.count(); ++i) {
@@ -891,7 +891,7 @@ void SkPicturePlayback::draw(SkCanvas& canvas, SkDrawPictureCallback* callback)
 
         if (NULL != fReplacements) {
             // Potentially replace a block of operations with a single drawBitmap call
-            SkPicturePlayback::PlaybackReplacements::ReplacementInfo* temp = 
+            SkPicturePlayback::PlaybackReplacements::ReplacementInfo* temp =
                                             fReplacements->lookupByStart(reader.offset());
             if (NULL != temp) {
                 SkASSERT(NULL != temp->fBM);
@@ -903,14 +903,14 @@ void SkPicturePlayback::draw(SkCanvas& canvas, SkDrawPictureCallback* callback)
                     // a restore to balanced the saveLayer we're skipping
                     canvas.save();
                     // Note: This skipping only works if the client only issues
-                    // well behaved saveLayer calls (i.e., doesn't use 
+                    // well behaved saveLayer calls (i.e., doesn't use
                     // kMatrix_SaveFlag or kClip_SaveFlag in isolation)
 
                     // At this point we know that the PictureStateTree was aiming
                     // for some draw op within temp's saveLayer (although potentially
                     // in a separate saveLayer nested inside it).
                     // We need to skip all the operations inside temp's range
-                    // along with all the associated state changes but update 
+                    // along with all the associated state changes but update
                     // the state tree to the first operation outside temp's range.
                     SkASSERT(it.peekDraw() >= temp->fStart && it.peekDraw() <= temp->fStop);
 
diff --git a/src/core/SkPicturePlayback.h b/src/core/SkPicturePlayback.h
index 7ac8dd8d61..37caa8a43d 100644
--- a/src/core/SkPicturePlayback.h
+++ b/src/core/SkPicturePlayback.h
@@ -280,7 +280,7 @@ private:
 
         ~PlaybackReplacements() { this->freeAll(); }
 
-        // Add a new replacement range. The replacement ranges should be 
+        // Add a new replacement range. The replacement ranges should be
         // sorted in increasing order and non-overlapping (esp. no nested
         // saveLayers).
         ReplacementInfo* push();
diff --git a/src/core/SkPictureStateTree.cpp b/src/core/SkPictureStateTree.cpp
index 39a1a47e14..8b5bc0aa2f 100644
--- a/src/core/SkPictureStateTree.cpp
+++ b/src/core/SkPictureStateTree.cpp
@@ -121,7 +121,7 @@ uint32_t SkPictureStateTree::Iterator::peekDraw() {
     }
 
     Draw* draw = static_cast<Draw*>((*fDraws)[fPlaybackIndex]);
-    return draw->fOffset;    
+    return draw->fOffset;
 }
 
 uint32_t SkPictureStateTree::Iterator::skipDraw() {
diff --git a/src/core/SkPictureStateTree.h b/src/core/SkPictureStateTree.h
index a77e09448c..f9e187a0cb 100644
--- a/src/core/SkPictureStateTree.h
+++ b/src/core/SkPictureStateTree.h
@@ -75,21 +75,21 @@ public:
     class Iterator {
     public:
         /** Returns the next op offset needed to create the drawing state
-            required by the queued up draw operation or the offset of the queued 
+            required by the queued up draw operation or the offset of the queued
             up draw operation itself. In the latter case, the next draw operation
             will move into the queued up slot.
-            It retuns kDrawComplete when done. 
+            It retuns kDrawComplete when done.
             TODO: this might be better named nextOp
         */
         uint32_t nextDraw();
         /** Peek at the currently queued up draw op's offset. Note that this can
             be different then what 'nextDraw' would return b.c. it is
             the offset of the next _draw_ op while 'nextDraw' can return
-            the offsets to saveLayer and clip ops while it is creating the proper 
+            the offsets to saveLayer and clip ops while it is creating the proper
             drawing context for the queued up draw op.
         */
         uint32_t peekDraw();
-        /** Stop trying to create the drawing context for the currently queued 
+        /** Stop trying to create the drawing context for the currently queued
             up _draw_ operation and queue up the next one. This call returns
             the offset of the skipped _draw_ operation. Obviously (since the
             correct drawing context has not been established), the skipped
diff --git a/src/gpu/SkGpuDevice.cpp b/src/gpu/SkGpuDevice.cpp
index 1a6a3e4c49..b279c43c10 100644
--- a/src/gpu/SkGpuDevice.cpp
+++ b/src/gpu/SkGpuDevice.cpp
@@ -1964,13 +1964,13 @@ bool SkGpuDevice::EXPERIMENTAL_drawPicture(SkCanvas* canvas, SkPicture* picture)
 
     if (ops.valid()) {
         // In this case the picture has been generated with a BBH so we use
-        // the BBH to limit the pre-rendering to just the layers needed to cover 
-        // the region being drawn 
+        // the BBH to limit the pre-rendering to just the layers needed to cover
+        // the region being drawn
         for (int i = 0; i < ops.numOps(); ++i) {
             uint32_t offset = ops.offset(i);
 
             // For now we're saving all the layers in the GPUAccelData so they
-            // can be nested. Additionally, the nested layers appear before 
+            // can be nested. Additionally, the nested layers appear before
             // their parent in the list.
             for (int j = 0 ; j < gpuData->numSaveLayers(); ++j) {
                 const GPUAccelData::SaveLayerInfo& info = gpuData->saveLayerInfo(j);
@@ -2012,7 +2012,7 @@ bool SkGpuDevice::EXPERIMENTAL_drawPicture(SkCanvas* canvas, SkPicture* picture)
                 continue;
             }
 
-            pullForward[j] = true;   
+            pullForward[j] = true;
         }
     }
 
@@ -2025,7 +2025,7 @@ bool SkGpuDevice::EXPERIMENTAL_drawPicture(SkCanvas* canvas, SkPicture* picture)
             const GPUAccelData::SaveLayerInfo& info = gpuData->saveLayerInfo(i);
 
             if (NULL != picture->fPlayback) {
-                SkPicturePlayback::PlaybackReplacements::ReplacementInfo* layerInfo = 
+                SkPicturePlayback::PlaybackReplacements::ReplacementInfo* layerInfo =
                                                                         replacements.push();
                 layerInfo->fStart = info.fSaveLayerOpID;
                 layerInfo->fStop = info.fRestoreOpID;
@@ -2043,7 +2043,7 @@ bool SkGpuDevice::EXPERIMENTAL_drawPicture(SkCanvas* canvas, SkPicture* picture)
                 // This just uses scratch textures and doesn't cache the texture.
                 // This can yield a lot of re-rendering
                 if (NULL == layer->getTexture()) {
-                    layer->setTexture(fContext->lockAndRefScratchTexture(desc, 
+                    layer->setTexture(fContext->lockAndRefScratchTexture(desc,
                                                         GrContext::kApprox_ScratchTexMatch));
                     if (NULL == layer->getTexture()) {
                         continue;
diff --git a/src/pipe/SkGPipeWrite.cpp b/src/pipe/SkGPipeWrite.cpp
index a3e839ad98..5b1257acfe 100644
--- a/src/pipe/SkGPipeWrite.cpp
+++ b/src/pipe/SkGPipeWrite.cpp
@@ -1230,4 +1230,3 @@ void BitmapShuttle::removeCanvas() {
     fCanvas->unref();
     fCanvas = NULL;
 }
-
diff --git a/tests/PathOpsCubicLineIntersectionIdeas.cpp b/tests/PathOpsCubicLineIntersectionIdeas.cpp
index 2887a2ccfc..6aec8b148a 100644
--- a/tests/PathOpsCubicLineIntersectionIdeas.cpp
+++ b/tests/PathOpsCubicLineIntersectionIdeas.cpp
@@ -42,7 +42,7 @@ double measuredSteps[] = {
     0.0351329803, 0.103964925,
 };
 
-/* last output : errors=3121 
+/* last output : errors=3121
     9.1796875e-007 8.59375e-007 7.5e-007 6.875e-007 8.4375e-007
     3.125e-007 5e-007 4.375e-007 0 0
     3.75e-006 1.09375e-006 2.1875e-006 1.640625e-005 3.0859375e-005