Sanitizing source files in Housekeeper-Nightly

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

diff --git a/gm/peekpixels.cpp b/gm/peekpixels.cpp
index c6744d3..bf9c8fa 100644 (file)
--- a/gm/peekpixels.cpp
+++ b/gm/peekpixels.cpp
@@ -37,10 +37,10 @@ protected:
         SkAutoTUnref<SkSurface> surface(canvas->newSurface(info));
         if (surface.get()) {
             SkCanvas* surfCanvas = surface->getCanvas();
-            
+
             draw_content(surfCanvas);
             SkBitmap bitmap;
-            
+
             // test peekPixels
             {
                 SkImageInfo info;
@@ -51,14 +51,14 @@ protected:
                     canvas->drawBitmap(bitmap, 0, 0, NULL);
                 }
             }
-            
+
             // test ROCanvasPixels
             canvas->translate(120, 0);
             SkAutoROCanvasPixels ropixels(surfCanvas);
             if (ropixels.asROBitmap(&bitmap)) {
                 canvas->drawBitmap(bitmap, 0, 0, NULL);
             }
-            
+
             // test Surface
             canvas->translate(120, 0);
             surface->draw(canvas, 0, 0, NULL);

diff --git a/include/core/SkCanvas.h b/include/core/SkCanvas.h
index d2e3705..ef2f0b9 100644 (file)
--- a/include/core/SkCanvas.h
+++ b/include/core/SkCanvas.h
@@ -1258,10 +1258,10 @@ public:
 
     // returns NULL on failure
     const void* addr() const { return fAddr; }
-    
+
     // undefined if addr() == NULL
     size_t rowBytes() const { return fRowBytes; }
-    
+
     // undefined if addr() == NULL
     const SkImageInfo& info() const { return fInfo; }
 

diff --git a/include/core/SkDevice.h b/include/core/SkDevice.h
index e3a23be..fab4a41 100644 (file)
--- a/include/core/SkDevice.h
+++ b/include/core/SkDevice.h
@@ -375,10 +375,10 @@ protected:
 protected:
     // default impl returns NULL
     virtual SkSurface* newSurface(const SkImageInfo&);
-    
+
     // default impl returns NULL
     virtual const void* peekPixels(SkImageInfo*, size_t* rowBytes);
-    
+
     /**
      *  Leaky properties are those which the device should be applying but it isn't.
      *  These properties will be applied by the draw, when and as it can.

diff --git a/src/core/SkBitmap.cpp b/src/core/SkBitmap.cpp
index 951bb6f..3e53cd7 100644 (file)
--- a/src/core/SkBitmap.cpp
+++ b/src/core/SkBitmap.cpp
@@ -260,7 +260,7 @@ bool SkBitmap::setConfig(const SkImageInfo& origInfo, size_t rowBytes) {
                             &info.fAlphaType)) {
         return reset_return_false(this);
     }
-    
+
     // require that rowBytes fit in 31bits
     int64_t mrb = info.minRowBytes64();
     if ((int32_t)mrb != mrb) {

diff --git a/src/image/SkSurface.cpp b/src/image/SkSurface.cpp
index 4b5fb68..ecb8042 100644 (file)
--- a/src/image/SkSurface.cpp
+++ b/src/image/SkSurface.cpp
@@ -125,4 +125,3 @@ void SkSurface::draw(SkCanvas* canvas, SkScalar x, SkScalar y,
 const void* SkSurface::peekPixels(SkImageInfo* info, size_t* rowBytes) {
     return this->getCanvas()->peekPixels(info, rowBytes);
 }
-

diff --git a/tests/ReadPixelsTest.cpp b/tests/ReadPixelsTest.cpp
index 50f55fd..8f1e0d6 100644 (file)
--- a/tests/ReadPixelsTest.cpp
+++ b/tests/ReadPixelsTest.cpp
@@ -244,7 +244,7 @@ static void init_bitmap(SkBitmap* bitmap, const SkIRect& rect, BitmapInit init)
             SkASSERT(0);
             break;
     }
-    
+
     if (alloc) {
         bitmap->allocPixels(info);
     } else {

diff --git a/tests/SkpSkGrTest.cpp b/tests/SkpSkGrTest.cpp
index d1d38df..8ca75dc 100644 (file)
--- a/tests/SkpSkGrTest.cpp
+++ b/tests/SkpSkGrTest.cpp
@@ -457,7 +457,7 @@ void TestResult::testOne() {
         SkBitmap grBitmap;
         grBitmap.allocPixels(grCanvas.imageInfo());
         grCanvas.readPixels(&grBitmap, 0, 0);
-        
+
         if (fTestStep == kCompareBits) {
             fPixelError = similarBits(grBitmap, bitmap);
             int skTime = timePict(pic, &skCanvas);

diff --git a/tests/SurfaceTest.cpp b/tests/SurfaceTest.cpp
index fcd0986..7029ef2 100644 (file)
--- a/tests/SurfaceTest.cpp
+++ b/tests/SurfaceTest.cpp
@@ -127,14 +127,14 @@ static void test_imagepeek(skiatest::Reporter* reporter) {
         { kPicture_ImageType,       false   },
         { kCodec_ImageType,         false   },
     };
-    
+
     const SkColor color = SK_ColorRED;
     const SkPMColor pmcolor = SkPreMultiplyColor(color);
-    
+
     for (size_t i = 0; i < SK_ARRAY_COUNT(gRec); ++i) {
         SkImageInfo info;
         size_t rowBytes;
-        
+
         SkAutoTUnref<SkImage> image(createImage(gRec[i].fType, NULL, color));
         if (!image.get()) {
             continue;   // gpu may not be enabled