Sanitizing source files in Housekeeper-Nightly

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

src/gpu/GrRectanizer_skyline.cpp

@@ -104,13 +104,13 @@ bool GrRectanizerSkyline::rectangleFits(int skylineIndex, int width, int height,
     int i = skylineIndex;
     int y = fSkyline[skylineIndex].fY;
     while (widthLeft > 0) {
-	y = SkMax32(y, fSkyline[i].fY);
+    y = SkMax32(y, fSkyline[i].fY);
         if (y + height > this->height()) {
             return false;
         }
-	widthLeft -= fSkyline[i].fWidth;
-	++i;
-	SkASSERT(i < fSkyline.count() || widthLeft <= 0);
+    widthLeft -= fSkyline[i].fWidth;
+    ++i;
+    SkASSERT(i < fSkyline.count() || widthLeft <= 0);
     }
 
     *ypos = y;
@@ -163,4 +163,3 @@ void GrRectanizerSkyline::addSkylineLevel(int skylineIndex, int x, int y, int wi
 GrRectanizer* GrRectanizer::Factory(int width, int height) {
     return SkNEW_ARGS(GrRectanizerSkyline, (width, height));
 }
-

src/pathops/SkDQuadIntersection.cpp

@@ -250,7 +250,7 @@ static bool is_linear(const SkDQuad& q1, const SkDQuad& q2, SkIntersections* i)
 
 // FIXME: if flat measure is sufficiently large, then probably the quartic solution failed
 // avoid imprecision incurred with chopAt
-static void relaxed_is_linear(const SkDQuad* q1, double s1, double e1, const SkDQuad* q2, 
+static void relaxed_is_linear(const SkDQuad* q1, double s1, double e1, const SkDQuad* q2,
         double s2, double e2, SkIntersections* i) {
     double m1 = flat_measure(*q1);
     double m2 = flat_measure(*q2);

src/pathops/SkPathOpsDebug.cpp

@@ -157,4 +157,3 @@ void Dump(const SkTArray<class SkOpAngle* , true>* angles) {
 }
 
 #endif
-

tests/PathOpsCubicIntersectionTest.cpp

@@ -164,8 +164,8 @@ static const SkDCubic testSet[] = {
 const size_t testSetCount = SK_ARRAY_COUNT(testSet);
 
 static const SkDCubic newTestSet[] = {
-#if 0  // FIXME: asserts coincidence, not working yet
-{{{195, 785}, {124.30755615234375, 785}, {67, 841.85986328125}, {67, 912}}},
+#if 0  // FIXME: asserts coincidence, not working yet
+{{{195, 785}, {124.30755615234375, 785}, {67, 841.85986328125}, {67, 912}}},
 {{{67, 913}, {67, 842.30755615234375}, {123.85984039306641, 785}, {194, 785}}},
 #endif
 
@@ -585,9 +585,9 @@ static void cubicIntersectionSelfTest(skiatest::Reporter* reporter) {
 }
 
 static const SkDCubic coinSet[] = {
-    {{{317, 711}, {322.52285766601562, 711}, {327, 715.4771728515625}, {327, 721}}},
-    {{{324.07107543945312, 713.928955078125}, {324.4051513671875, 714.26300048828125},
-            {324.71566772460937, 714.62060546875}, {325, 714.9990234375}}},
+    {{{317, 711}, {322.52285766601562, 711}, {327, 715.4771728515625}, {327, 721}}},
+    {{{324.07107543945312, 713.928955078125}, {324.4051513671875, 714.26300048828125},
+            {324.71566772460937, 714.62060546875}, {325, 714.9990234375}}},
 
     {{{2, 3}, {0, 4}, {3, 2}, {5, 3}}},
     {{{2, 3}, {0, 4}, {3, 2}, {5, 3}}},

tests/PathOpsCubicLineIntersectionTest.cpp

@@ -15,8 +15,8 @@ static struct lineCubic {
     SkDCubic cubic;
     SkDLine line;
 } lineCubicTests[] = {
-    {{{{0,1}, {1,6}, {4,1}, {4,3}}},
-            {{{6,1}, {1,4}}}},
+    {{{{0,1}, {1,6}, {4,1}, {4,3}}},
+            {{{6,1}, {1,4}}}},
 
     {{{{0,1}, {2,6}, {4,1}, {5,4}}},
             {{{6,2}, {1,4}}}},

tests/PathOpsCubicQuadIntersectionTest.cpp

@@ -17,7 +17,7 @@ static struct lineCubic {
     int answerCount;
     SkDPoint answers[2];
 } quadCubicTests[] = {
-    {{{{49, 47}, {49, 74.614250183105469}, {26.614250183105469, 97}, {-1, 97}}},
+    {{{{49, 47}, {49, 74.614250183105469}, {26.614250183105469, 97}, {-1, 97}}},
      {{{-8.659739592076221e-015, 96.991401672363281}, {20.065492630004883, 96.645187377929688},
        {34.355339050292969, 82.355339050292969}}}, 2,
       {{34.355339050292969,82.355339050292969}, {34.306797674910243,82.403823585863449}}},

tests/PathOpsQuadIntersectionTest.cpp

@@ -53,13 +53,13 @@ static void standardTestCases(skiatest::Reporter* reporter) {
 }
 
 static const SkDQuad testSet[] = {
-{{{2.9999997378517067, 1.9737872594345709}, {2.9999997432230918, 1.9739647181863822}, {1.2414155459263587e-163, 5.2957833941332142e-315}}},
-{{{2.9999047485265304, 1.9739164225694723}, {3.0000947268526112, 1.9738379076623633}, {0.61149411077591886, 0.0028382324376270418}}},
-
-    {{{2.9999996843656502, 1.9721416019045801}, {2.9999997725237835, 1.9749798343422071},
-            {5.3039068214821359e-315, 8.9546185262775165e-307}}},
-    {{{2.9984791443874976, 1.974505741312242}, {2.9999992702127476, 1.9738772171479178},
-            {3.0015187977319759, 1.9732495027303418}}},
+{{{2.9999997378517067, 1.9737872594345709}, {2.9999997432230918, 1.9739647181863822}, {1.2414155459263587e-163, 5.2957833941332142e-315}}},
+{{{2.9999047485265304, 1.9739164225694723}, {3.0000947268526112, 1.9738379076623633}, {0.61149411077591886, 0.0028382324376270418}}},
+
+    {{{2.9999996843656502, 1.9721416019045801}, {2.9999997725237835, 1.9749798343422071},
+            {5.3039068214821359e-315, 8.9546185262775165e-307}}},
+    {{{2.9984791443874976, 1.974505741312242}, {2.9999992702127476, 1.9738772171479178},
+            {3.0015187977319759, 1.9732495027303418}}},
 
     {{{0.647069409,2.97691634}, {0.946860918,3.17625612}, {1.46875407,2.65105457}}},
     {{{0,1}, {0.723699095,2.82756208}, {1.08907197,2.97497449}}},

tests/PathOpsSimplifyTest.cpp

@@ -3905,17 +3905,17 @@ static void testQuad8(skiatest::Reporter* reporter) {
     testSimplify(reporter, path);
 }
 
-static void testTriangles4x(skiatest::Reporter* reporter) {
-    SkPath path;
-    path.setFillType(SkPath::kEvenOdd_FillType);
-    path.moveTo(0, 0);
-    path.quadTo(2, 0, 0, 3);
-    path.lineTo(2, 3);
-    path.close();
-    path.moveTo(0, 0);
-    path.lineTo(0, 1);
-    path.quadTo(3, 2, 2, 3);
-    path.close();
+static void testTriangles4x(skiatest::Reporter* reporter) {
+    SkPath path;
+    path.setFillType(SkPath::kEvenOdd_FillType);
+    path.moveTo(0, 0);
+    path.quadTo(2, 0, 0, 3);
+    path.lineTo(2, 3);
+    path.close();
+    path.moveTo(0, 0);
+    path.lineTo(0, 1);
+    path.quadTo(3, 2, 2, 3);
+    path.close();
     testSimplify(reporter, path);
 }
 

tests/PathOpsSkpTest.cpp

@@ -700,4 +700,3 @@ static void PathOpsSkpTest(skiatest::Reporter* reporter) {
 #include "TestClassDef.h"
 
 DEFINE_TESTCLASS_SHORT(PathOpsSkpTest)
-