Sanitizing source files in Housekeeper-Nightly
authorskia.committer@gmail.com <skia.committer@gmail.com@2bbb7eff-a529-9590-31e7-b0007b416f81>
Wed, 7 May 2014 03:04:15 +0000 (03:04 +0000)
committerskia.committer@gmail.com <skia.committer@gmail.com@2bbb7eff-a529-9590-31e7-b0007b416f81>
Wed, 7 May 2014 03:04:15 +0000 (03:04 +0000)
git-svn-id: http://skia.googlecode.com/svn/trunk@14605 2bbb7eff-a529-9590-31e7-b0007b416f81

src/core/SkPaintPriv.cpp
src/gpu/GrPictureUtils.cpp
tests/PictureTest.cpp

index 65fd0e7..8021f7d 100644 (file)
@@ -96,4 +96,3 @@ bool NeedsDeepCopy(const SkPaint& paint) {
            paint.getLooper() || // needs to hide its addLayer...
            paint.getImageFilter();
 }
-
index 089e421..996a32d 100644 (file)
@@ -207,7 +207,7 @@ private:
         SkASSERT(kSaveLayer_Usage == usage);
 
         fInfo.fHasNestedLayers = true;
-        return SkNEW_ARGS(GrGatherDevice, (info.width(), info.height(), fPicture, 
+        return SkNEW_ARGS(GrGatherDevice, (info.width(), info.height(), fPicture,
                                            fAccelData, fSaveLayerDepth+1));
     }
 
index aa07191..071e6f4 100644 (file)
@@ -794,7 +794,7 @@ static void test_gpu_picture_optimization(skiatest::Reporter* reporter,
     //      Restore
     // 2)
     //      SaveLayer
-    //          Translate 
+    //          Translate
     //          SaveLayer w/ bound
     //          Restore
     //      Restore
@@ -852,7 +852,7 @@ static void test_gpu_picture_optimization(skiatest::Reporter* reporter,
 
         SkAutoTUnref<SkSurface> surface(SkSurface::NewScratchRenderTarget(context, info));
 
-        SkCanvas* canvas = surface->getCanvas();   
+        SkCanvas* canvas = surface->getCanvas();
 
         canvas->EXPERIMENTAL_optimize(pict);
 
@@ -886,7 +886,7 @@ static void test_gpu_picture_optimization(skiatest::Reporter* reporter,
         REPORTER_ASSERT(reporter, !info1.fIsNested && info1.fHasNestedLayers); // has a nested SL
 
         REPORTER_ASSERT(reporter, info2.fValid);
-        REPORTER_ASSERT(reporter, kWidth/2 == info2.fSize.fWidth && 
+        REPORTER_ASSERT(reporter, kWidth/2 == info2.fSize.fWidth &&
                                   kHeight/2 == info2.fSize.fHeight); // bound reduces size
         REPORTER_ASSERT(reporter, info2.fCTM.isIdentity());         // translated
         REPORTER_ASSERT(reporter, 0 == info2.fOffset.fX && 0 == info2.fOffset.fY);
@@ -901,7 +901,7 @@ static void test_gpu_picture_optimization(skiatest::Reporter* reporter,
         REPORTER_ASSERT(reporter, !info3.fIsNested && !info3.fHasNestedLayers);
 
         REPORTER_ASSERT(reporter, !info4.fValid);                 // paint is/was uncopyable
-        REPORTER_ASSERT(reporter, kWidth == info4.fSize.fWidth && kHeight == info4.fSize.fHeight); 
+        REPORTER_ASSERT(reporter, kWidth == info4.fSize.fWidth && kHeight == info4.fSize.fHeight);
         REPORTER_ASSERT(reporter, 0 == info4.fOffset.fX && 0 == info4.fOffset.fY);
         REPORTER_ASSERT(reporter, info4.fCTM.isIdentity());
         REPORTER_ASSERT(reporter, NULL == info4.fPaint);     // paint is/was uncopyable