Sanitizing source files in Housekeeper-Nightly

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

diff --git a/bench/benchmain.cpp b/bench/benchmain.cpp
index 8b824f3..4bdc044 100644 (file)
--- a/bench/benchmain.cpp
+++ b/bench/benchmain.cpp
@@ -506,15 +506,15 @@ int tool_main(int argc, char** argv) {
                         canvas.reset(SkDeferredCanvas::Create(surface.get()));
                         break;
                     case kRecord_BenchMode:
-                        canvas.reset(SkRef(recorderTo.beginRecording(dim.fX, dim.fY, 
+                        canvas.reset(SkRef(recorderTo.beginRecording(dim.fX, dim.fY,
                                                                      NULL, kRecordFlags)));
                         break;
                     case kPictureRecord_BenchMode: {
                         SkPictureRecorder recorderFrom;
-                        bench->draw(1, recorderFrom.beginRecording(dim.fX, dim.fY, 
+                        bench->draw(1, recorderFrom.beginRecording(dim.fX, dim.fY,
                                                                    NULL, kRecordFlags));
                         recordFrom.reset(recorderFrom.endRecording());
-                        canvas.reset(SkRef(recorderTo.beginRecording(dim.fX, dim.fY, 
+                        canvas.reset(SkRef(recorderTo.beginRecording(dim.fX, dim.fY,
                                                                      NULL, kRecordFlags)));
                         break;
                     }
@@ -581,7 +581,7 @@ int tool_main(int argc, char** argv) {
 
                     if ((benchMode == kRecord_BenchMode || benchMode == kPictureRecord_BenchMode)) {
                         // Clear the recorded commands so that they do not accumulate.
-                        canvas.reset(SkRef(recorderTo.beginRecording(dim.fX, dim.fY, 
+                        canvas.reset(SkRef(recorderTo.beginRecording(dim.fX, dim.fY,
                                                                      NULL, kRecordFlags)));
                     }
 

diff --git a/include/core/SkPicture.h b/include/core/SkPicture.h
index 3f893e8..14296e9 100644 (file)
--- a/include/core/SkPicture.h
+++ b/include/core/SkPicture.h
@@ -484,8 +484,8 @@ public:
         @return the canvas.
     */
     // TODO: allow default parameters once the other beginRecoding entry point is gone
-    SkCanvas* beginRecording(int width, int height, 
-                             SkBBHFactory* bbhFactory /* = NULL */, 
+    SkCanvas* beginRecording(int width, int height,
+                             SkBBHFactory* bbhFactory /* = NULL */,
                              uint32_t recordFlags /* = 0 */) {
         fPicture.reset(SkNEW(SkPicture));
         return fPicture->beginRecording(width, height, bbhFactory, recordFlags);

diff --git a/src/core/SkPicture.cpp b/src/core/SkPicture.cpp
index d6f05b1..85e018f 100644 (file)
--- a/src/core/SkPicture.cpp
+++ b/src/core/SkPicture.cpp
@@ -256,7 +256,7 @@ SkCanvas* SkPicture::beginRecording(int width, int height,
 
 #endif
 
-SkCanvas* SkPicture::beginRecording(int width, int height, 
+SkCanvas* SkPicture::beginRecording(int width, int height,
                                     SkBBHFactory* bbhFactory,
                                     uint32_t recordingFlags) {
     if (fPlayback) {
@@ -276,7 +276,7 @@ SkCanvas* SkPicture::beginRecording(int width, int height,
     if (NULL != bbhFactory) {
         SkAutoTUnref<SkBBoxHierarchy> tree((*bbhFactory)(width, height));
         SkASSERT(NULL != tree);
-        fRecord = SkNEW_ARGS(SkBBoxHierarchyRecord, (size, 
+        fRecord = SkNEW_ARGS(SkBBoxHierarchyRecord, (size,
                                                      recordingFlags|
                                                      kOptimizeForClippedPlayback_RecordingFlag,
                                                      tree.get()));

diff --git a/src/core/SkTileGridPicture.cpp b/src/core/SkTileGridPicture.cpp
index 501346a..f2f44a0 100644 (file)
--- a/src/core/SkTileGridPicture.cpp
+++ b/src/core/SkTileGridPicture.cpp
@@ -26,7 +26,7 @@ SkBBoxHierarchy* SkTileGridFactory::operator()(int width, int height) const {
 
 #ifdef SK_SUPPORT_LEGACY_DERIVED_PICTURE_CLASSES
 
-SkTileGridPicture::SkTileGridPicture(int width, int height, 
+SkTileGridPicture::SkTileGridPicture(int width, int height,
                                      const SkTileGridFactory::TileGridInfo& info) {
     SkASSERT(info.fMargin.width() >= 0);
     SkASSERT(info.fMargin.height() >= 0);

diff --git a/src/core/SkXfermode.cpp b/src/core/SkXfermode.cpp
index fb17268..53c431b 100644 (file)
--- a/src/core/SkXfermode.cpp
+++ b/src/core/SkXfermode.cpp
@@ -1391,9 +1391,9 @@ void SkProcCoeffXfermode::xfer32(SkPMColor* SK_RESTRICT dst,
                                  const SkPMColor* SK_RESTRICT src, int count,
                                  const SkAlpha* SK_RESTRICT aa) const {
     SkASSERT(dst && src && count >= 0);
-    
+
     SkXfermodeProc proc = fProc;
-    
+
     if (NULL != proc) {
         if (NULL == aa) {
             for (int i = count - 1; i >= 0; --i) {
@@ -1419,9 +1419,9 @@ void SkProcCoeffXfermode::xfer16(uint16_t* SK_RESTRICT dst,
                                  const SkPMColor* SK_RESTRICT src, int count,
                                  const SkAlpha* SK_RESTRICT aa) const {
     SkASSERT(dst && src && count >= 0);
-    
+
     SkXfermodeProc proc = fProc;
-    
+
     if (NULL != proc) {
         if (NULL == aa) {
             for (int i = count - 1; i >= 0; --i) {
@@ -1448,9 +1448,9 @@ void SkProcCoeffXfermode::xferA8(SkAlpha* SK_RESTRICT dst,
                                  const SkPMColor* SK_RESTRICT src, int count,
                                  const SkAlpha* SK_RESTRICT aa) const {
     SkASSERT(dst && src && count >= 0);
-    
+
     SkXfermodeProc proc = fProc;
-    
+
     if (NULL != proc) {
         if (NULL == aa) {
             for (int i = count - 1; i >= 0; --i) {

diff --git a/src/utils/debugger/SkDebugCanvas.cpp b/src/utils/debugger/SkDebugCanvas.cpp
index 22eef6f..18affcb 100644 (file)
--- a/src/utils/debugger/SkDebugCanvas.cpp
+++ b/src/utils/debugger/SkDebugCanvas.cpp
@@ -109,13 +109,13 @@ public:
             SkPackARGB32(0xFF, 255,  50, 0),
             SkPackARGB32(0xFF, 255,  0, 0)
         };
-        
+
         for (size_t i = 0; i < SK_ARRAY_COUNT(gTable)-1; ++i) {
             if (gTable[i] == dst) {
                 return gTable[i+1];
             }
         }
-        
+
         return gTable[SK_ARRAY_COUNT(gTable)-1];
     }
 

diff --git a/tests/CanvasTest.cpp b/tests/CanvasTest.cpp
index 9f70e46..da3c136 100644 (file)
--- a/tests/CanvasTest.cpp
+++ b/tests/CanvasTest.cpp
@@ -724,12 +724,12 @@ public:
         // are flattened during the second execution
         testStep->setAssertMessageFormat(kPictureDrawAssertMessageFormat);
         SkPictureRecorder referenceRecorder;
-        SkCanvas* referenceCanvas = referenceRecorder.beginRecording(kWidth, kHeight, 
+        SkCanvas* referenceCanvas = referenceRecorder.beginRecording(kWidth, kHeight,
                                                                      NULL, recordFlags);
         testStep->draw(referenceCanvas, reporter);
 
         SkPictureRecorder testRecorder;
-        SkCanvas* testCanvas = testRecorder.beginRecording(kWidth, kHeight, 
+        SkCanvas* testCanvas = testRecorder.beginRecording(kWidth, kHeight,
                                                            NULL, recordFlags);
         testStep->draw(testCanvas, reporter);
         testStep->setAssertMessageFormat(kPictureSecondDrawAssertMessageFormat);