Sanitizing source files in Skia_Periodic_House_Keeping
git-svn-id: http://skia.googlecode.com/svn/trunk@6872 2bbb7eff-a529-9590-31e7-b0007b416f81
diff --git a/experimental/Intersection/Simplify.cpp b/experimental/Intersection/Simplify.cpp
index 09ce420..6c6f5cb 100644
--- a/experimental/Intersection/Simplify.cpp
+++ b/experimental/Intersection/Simplify.cpp
@@ -1027,7 +1027,7 @@
fDefer[0] = fDefer[1] = pt2;
fEmpty = false;
}
-
+
bool someAssemblyRequired() const {
return fCloses < fMoves;
}
@@ -2456,7 +2456,7 @@
const Angle* nextAngle = sorted[nextIndex];
nextSegment = nextAngle->segment();
int maxWinding;
- bool activeAngle = nextSegment->activeWinding(nextAngle->start(), nextAngle->end(),
+ bool activeAngle = nextSegment->activeWinding(nextAngle->start(), nextAngle->end(),
maxWinding, sumWinding);
if (activeAngle && (!foundAngle || foundDone) && outside != (sumWinding & 1)) {
foundAngle = nextAngle;
@@ -3569,7 +3569,7 @@
return fVerb;
}
- int windingAtT(double tHit, int tIndex, bool crossOpp) const {
+ int windingAtT(double tHit, int tIndex, bool crossOpp) const {
if (approximately_zero(tHit - t(tIndex))) { // if we hit the end of a span, disregard
return SK_MinS32;
}
diff --git a/gm/rrect.cpp b/gm/rrect.cpp
index 0106ec7..b07e3c0 100644
--- a/gm/rrect.cpp
+++ b/gm/rrect.cpp
@@ -20,7 +20,7 @@
dst->setEmpty();
return;
}
-
+
SkVector radii[4];
for (int i = 0; i < 4; ++i) {
radii[i] = src.radii((SkRRect::Corner)i);
@@ -40,7 +40,7 @@
dst->setEmpty();
return;
}
-
+
SkVector radii[4];
for (int i = 0; i < 4; ++i) {
radii[i] = src.radii((SkRRect::Corner)i);
@@ -50,13 +50,13 @@
static void inset2(const SkRRect& src, SkScalar dx, SkScalar dy, SkRRect* dst) {
SkRect r = src.rect();
-
+
r.inset(dx, dy);
if (r.isEmpty()) {
dst->setEmpty();
return;
}
-
+
SkVector radii[4];
for (int i = 0; i < 4; ++i) {
radii[i] = src.radii((SkRRect::Corner)i);
@@ -78,13 +78,13 @@
static void inset3(const SkRRect& src, SkScalar dx, SkScalar dy, SkRRect* dst) {
SkRect r = src.rect();
-
+
r.inset(dx, dy);
if (r.isEmpty()) {
dst->setEmpty();
return;
}
-
+
SkVector radii[4];
for (int i = 0; i < 4; ++i) {
radii[i] = src.radii((SkRRect::Corner)i);
@@ -124,16 +124,16 @@
class RRectGM : public skiagm::GM {
public:
RRectGM() {}
-
+
protected:
virtual SkString onShortName() {
return SkString("rrect");
}
-
+
virtual SkISize onISize() {
return SkISize::Make(820, 710);
}
-
+
virtual void onDraw(SkCanvas* canvas) {
static const InsetProc insetProcs[] = {
inset0, inset1, inset2, inset3
@@ -144,7 +144,7 @@
SkVector radii[4] = {
{ 0, 0 }, { 30, 1 }, { 10, 40 }, { 40, 40 }
};
-
+
rrect[0].setRect(r);
rrect[1].setOval(r);
rrect[2].setRectXY(r, 20, 20);
@@ -161,7 +161,7 @@
canvas->translate(0, 170);
}
}
-
+
private:
typedef GM INHERITED;
};
diff --git a/gm/rrects.cpp b/gm/rrects.cpp
index 413d946..cccece9 100644
--- a/gm/rrects.cpp
+++ b/gm/rrects.cpp
@@ -40,7 +40,7 @@
SkPaint paint;
// when clipping the AA is pushed into the clip operation
- paint.setAntiAlias(fDoClip ? false : fDoAA);
+ paint.setAntiAlias(fDoClip ? false : fDoAA);
static const SkRect kMaxTileBound = SkRect::MakeWH(SkIntToScalar(kTileX), SkIntToScalar(kTileY));
@@ -67,7 +67,7 @@
}
void setUpRRects() {
- // each RRect must fit in a 0x0 -> (kTileX-2)x(kTileY-2) block. These will be tiled across
+ // each RRect must fit in a 0x0 -> (kTileX-2)x(kTileY-2) block. These will be tiled across
// the screen in kTileX x kTileY tiles. The extra empty pixels on each side are for AA.
// simple cases
diff --git a/src/core/SkBBoxRecord.cpp b/src/core/SkBBoxRecord.cpp
index 2014c56..e48a1ea 100644
--- a/src/core/SkBBoxRecord.cpp
+++ b/src/core/SkBBoxRecord.cpp
@@ -53,7 +53,7 @@
// Note: The device coordinate outset in SkBBoxHierarchyRecord::handleBBox is currently
// done in the recording coordinate space, which is wrong.
// http://code.google.com/p/skia/issues/detail?id=1021
- static const SkScalar kMinWidth = SkFloatToScalar(0.01f);
+ static const SkScalar kMinWidth = SkFloatToScalar(0.01f);
SkScalar halfStrokeWidth = SkMaxScalar(paint.getStrokeWidth(), kMinWidth) / 2;
bbox.outset(halfStrokeWidth, halfStrokeWidth);
if (this->transformBounds(bbox, &paint)) {
diff --git a/src/core/SkDraw.cpp b/src/core/SkDraw.cpp
index 77c20a9..3326b55 100644
--- a/src/core/SkDraw.cpp
+++ b/src/core/SkDraw.cpp
@@ -701,7 +701,7 @@
}
if (fDevice) {
- fDevice->drawPoints(*this,
+ fDevice->drawPoints(*this,
SkCanvas::kPoints_PointMode,
pointData.fNumPoints,
pointData.fPoints,
@@ -716,7 +716,7 @@
break;
} else {
// The rest of the dashed line must be drawn as rects
- SkASSERT(!(SkPathEffect::PointData::kCircles_PointFlag &
+ SkASSERT(!(SkPathEffect::PointData::kCircles_PointFlag &
pointData.fFlags));
SkRect r;
diff --git a/src/core/SkPath.cpp b/src/core/SkPath.cpp
index b9f3286..89150a3 100644
--- a/src/core/SkPath.cpp
+++ b/src/core/SkPath.cpp
@@ -1035,9 +1035,9 @@
static void add_corner_arc(SkPath* path, const SkRect& rect,
SkScalar rx, SkScalar ry, int startAngle,
SkPath::Direction dir, bool forceMoveTo) {
- // These two asserts are not sufficient, since really we want to know
- // that the pair of radii (e.g. left and right, or top and bottom) sum
- // to <= dimension, but we don't have that data here, so we just have
+ // These two asserts are not sufficient, since really we want to know
+ // that the pair of radii (e.g. left and right, or top and bottom) sum
+ // to <= dimension, but we don't have that data here, so we just have
// these conservative asserts.
SkASSERT(0 <= rx && rx <= rect.width());
SkASSERT(0 <= ry && ry <= rect.height());
diff --git a/src/effects/SkDashPathEffect.cpp b/src/effects/SkDashPathEffect.cpp
index 2252a1b..f205977 100644
--- a/src/effects/SkDashPathEffect.cpp
+++ b/src/effects/SkDashPathEffect.cpp
@@ -267,7 +267,7 @@
// Additionally, they do not necessarily need to be integers.
// We cannot allow arbitrary intervals since we want the returned points
// to be uniformly sized.
- if (fCount != 2 ||
+ if (fCount != 2 ||
!SkScalarNearlyEqual(fIntervals[0], fIntervals[1]) ||
!SkScalarIsInt(fIntervals[0]) ||
!SkScalarIsInt(fIntervals[1])) {
@@ -275,7 +275,7 @@
}
// TODO: this next test could be eased up. The rescaling should not impact
- // the equality of the ons & offs. However, we would need to remove the
+ // the equality of the ons & offs. However, we would need to remove the
// integer intervals restriction first
if (fScaleToFit) {
return false;
@@ -319,7 +319,7 @@
}
if (NULL != results) {
- results->fFlags = 0;
+ results->fFlags = 0;
if (SkPaint::kRound_Cap == rec.getCap()) {
results->fFlags |= PointData::kCircles_PointFlag;
@@ -352,7 +352,7 @@
bool partialLast = false;
if (len2 > 0) {
if (len2 < fIntervals[0]) {
- partialLast = true;
+ partialLast = true;
} else {
++numMidPoints;
++results->fNumPoints;