Sanitizing source files in Skia_Periodic_House_Keeping
git-svn-id: http://skia.googlecode.com/svn/trunk@6699 2bbb7eff-a529-9590-31e7-b0007b416f81
diff --git a/experimental/Intersection/EdgeWalker_TestUtility.cpp b/experimental/Intersection/EdgeWalker_TestUtility.cpp
index 5489a8b..f07eebe 100644
--- a/experimental/Intersection/EdgeWalker_TestUtility.cpp
+++ b/experimental/Intersection/EdgeWalker_TestUtility.cpp
@@ -206,7 +206,7 @@
}
}
-static int pathsDrawTheSame(const SkPath& one, const SkPath& two,
+static int pathsDrawTheSame(const SkPath& one, const SkPath& two,
SkBitmap& bits, SkPath& scaledOne, SkPath& scaledTwo, int& error2x2) {
const int bitWidth = 64;
const int bitHeight = 64;
@@ -317,7 +317,7 @@
return true;
}
-static void showSimplifiedPath(const SkPath& one, const SkPath& two,
+static void showSimplifiedPath(const SkPath& one, const SkPath& two,
const SkPath& scaledOne, const SkPath& scaledTwo) {
showPath(one, "original:");
showPath(two, "simplified:");
@@ -343,7 +343,7 @@
return errors2x2 > MAX_ERRORS ? errors2x2 : 0;
}
-static void showShapeOpPath(const SkPath& one, const SkPath& two, const SkPath& a, const SkPath& b,
+static void showShapeOpPath(const SkPath& one, const SkPath& two, const SkPath& a, const SkPath& b,
const SkPath& scaledOne, const SkPath& scaledTwo, const ShapeOp shapeOp) {
SkASSERT((unsigned) shapeOp < sizeof(opStrs) / sizeof(opStrs[0]));
showPath(a, "minuend:");
diff --git a/experimental/Intersection/Simplify.cpp b/experimental/Intersection/Simplify.cpp
index 81fe79b..b3072f3 100644
--- a/experimental/Intersection/Simplify.cpp
+++ b/experimental/Intersection/Simplify.cpp
@@ -794,7 +794,7 @@
void add(const Bounds& toAdd) {
add(toAdd.fLeft, toAdd.fTop, toAdd.fRight, toAdd.fBottom);
}
-
+
bool isEmpty() {
return fLeft > fRight || fTop > fBottom
|| (fLeft == fRight && fTop == fBottom)
@@ -1134,7 +1134,7 @@
default:
SkASSERT(0);
}
-
+
}
bool oppNonZero = oppMaxWinding & oppMask;
return isActiveOp(operand(), oppNonZero, op);
@@ -2565,7 +2565,7 @@
}
}
}
-
+
void init(const SkPoint pts[], SkPath::Verb verb, bool operand, bool evenOdd) {
fDoneSpans = 0;
fOperand = operand;
@@ -2700,7 +2700,7 @@
Span* markAndChaseWinding(const Angle* angle, const int winding) {
int index = angle->start();
int endIndex = angle->end();
- int step = SkSign32(endIndex - index);
+ int step = SkSign32(endIndex - index);
int min = SkMin32(index, endIndex);
markWinding(min, winding);
Span* last;
@@ -3148,7 +3148,7 @@
*outsideTs.append() = start;
}
}
-
+
void undoneSpan(int& start, int& end) {
size_t tCount = fTs.count();
size_t index;
@@ -3921,7 +3921,7 @@
void setOperand(bool isOp) {
fOperand = isOp;
}
-
+
void setOppXor(bool isOppXor) {
fOppXor = isOppXor;
int segmentCount = fSegments.count();
diff --git a/src/gpu/GrClipMaskManager.cpp b/src/gpu/GrClipMaskManager.cpp
index d076ced..15dc7e3 100644
--- a/src/gpu/GrClipMaskManager.cpp
+++ b/src/gpu/GrClipMaskManager.cpp
@@ -81,7 +81,7 @@
bool useSW = false;
SkStroke stroke;
stroke.setDoFill(true);
-
+
for (ElementList::Iter iter(elements.headIter()); iter.get(); iter.next()) {
const Element* element = iter.get();
// rects can always be drawn directly w/o using the software path
@@ -915,7 +915,7 @@
GrAssert(Element::kPath_Type == element->getType());
SkPath clipPath = element->getPath();
clipPath.toggleInverseFillType();
- helper.draw(clipPath, stroke,
+ helper.draw(clipPath, stroke,
SkRegion::kReplace_Op,
element->isAA(),
0x00);
diff --git a/src/gpu/GrClipMaskManager.h b/src/gpu/GrClipMaskManager.h
index de16221..d4e6a8d 100644
--- a/src/gpu/GrClipMaskManager.h
+++ b/src/gpu/GrClipMaskManager.h
@@ -129,7 +129,7 @@
const GrReducedClip::ElementList& elements,
const SkIRect& clipSpaceIBounds);
- // Gets a texture to use for the clip mask. If true is returned then a cached mask was found
+ // Gets a texture to use for the clip mask. If true is returned then a cached mask was found
// that already contains the rasterization of the clip stack, otherwise an uninitialized texture
// is returned.
bool getMaskTexture(int32_t clipStackGenID,
diff --git a/src/gpu/GrReducedClip.cpp b/src/gpu/GrReducedClip.cpp
index 4745792..baa8533 100644
--- a/src/gpu/GrReducedClip.cpp
+++ b/src/gpu/GrReducedClip.cpp
@@ -122,7 +122,7 @@
}
SkRect scalarBounds = SkRect::MakeFromIRect(*bounds);
-
+
// Now that we have determined the bounds to use and filtered out the trivial cases, call the
// helper that actually walks the stack.
reduced_stack_walker(stack, scalarBounds, result, initialState, requiresAA);
diff --git a/tests/ClipCacheTest.cpp b/tests/ClipCacheTest.cpp
index ce879d1..1aeebb8 100644
--- a/tests/ClipCacheTest.cpp
+++ b/tests/ClipCacheTest.cpp
@@ -102,7 +102,7 @@
const SkClipStack& clip,
GrTexture* mask,
const GrIRect& bound) {
- SkClipStack cacheClip;
+ SkClipStack cacheClip;
REPORTER_ASSERT(reporter, clip.getTopmostGenID() == cache.getLastClipGenID());
REPORTER_ASSERT(reporter, mask == cache.getLastMask());