Sanitizing source files in Housekeeper-Nightly
git-svn-id: http://skia.googlecode.com/svn/trunk@11513 2bbb7eff-a529-9590-31e7-b0007b416f81
diff --git a/src/core/SkGeometry.cpp b/src/core/SkGeometry.cpp
index 45658a0..5d0707a 100644
--- a/src/core/SkGeometry.cpp
+++ b/src/core/SkGeometry.cpp
@@ -1205,7 +1205,7 @@
}
/* given a quad-curve and a point (x,y), chop the quad at that point and place
- the new off-curve point and endpoint into 'dest'.
+ the new off-curve point and endpoint into 'dest'.
Should only return false if the computed pos is the start of the curve
(i.e. root == 0)
*/
diff --git a/src/core/SkPath.cpp b/src/core/SkPath.cpp
index 2520467..d5c8d98 100644
--- a/src/core/SkPath.cpp
+++ b/src/core/SkPath.cpp
@@ -1230,7 +1230,7 @@
matrix.postTranslate(oval.centerX(), oval.centerY());
return SkBuildQuadArc(start, stop,
- sweepAngle > 0 ? kCW_SkRotationDirection :
+ sweepAngle > 0 ? kCW_SkRotationDirection :
kCCW_SkRotationDirection,
&matrix, pts);
}
diff --git a/src/core/SkPathRef.cpp b/src/core/SkPathRef.cpp
index f4cee23..dd18793 100644
--- a/src/core/SkPathRef.cpp
+++ b/src/core/SkPathRef.cpp
@@ -216,8 +216,8 @@
sizeof(SkRect));
}
-void SkPathRef::copy(const SkPathRef& ref,
- int additionalReserveVerbs,
+void SkPathRef::copy(const SkPathRef& ref,
+ int additionalReserveVerbs,
int additionalReservePoints) {
this->validate();
this->resetToSize(ref.fVerbCnt, ref.fPointCnt, ref.fConicWeights.count(),
diff --git a/src/gpu/GrAtlas.cpp b/src/gpu/GrAtlas.cpp
index e33ec65..ff14983 100644
--- a/src/gpu/GrAtlas.cpp
+++ b/src/gpu/GrAtlas.cpp
@@ -126,7 +126,7 @@
fPixelConfig = config;
gpu->ref();
fTexture = NULL;
-
+
// set up allocated plots
int bpp = GrBytesPerPixel(fPixelConfig);
fPlots = SkNEW_ARRAY(GrPlot, (GR_PLOT_WIDTH*GR_PLOT_HEIGHT));
@@ -137,11 +137,11 @@
currPlot->fAtlasMgr = this;
currPlot->fOffset.set(x, y);
currPlot->fBytesPerPixel = bpp;
-
+
// add to free list
currPlot->fNext = fFreePlots;
fFreePlots = currPlot;
-
+
++currPlot;
}
}
@@ -189,9 +189,9 @@
return NULL;
}
}
- // be sure to set texture for fast lookup
+ // be sure to set texture for fast lookup
newPlot->fTexture = fTexture;
-
+
if (!newPlot->addSubImage(width, height, image, loc)) {
this->freePlot(newPlot);
return NULL;
@@ -221,7 +221,7 @@
plot = plot->fNext;
}
}
-
+
return removed;
}
@@ -245,16 +245,16 @@
#endif
return alloc;
}
-
+
}
void GrAtlasMgr::freePlot(GrPlot* plot) {
SkASSERT(this == plot->fAtlasMgr);
-
+
plot->fRects->reset();
plot->fNext = fFreePlots;
fFreePlots = plot;
-
+
#ifdef SK_DEBUG
--gCounter;
// GrPrintf("~GrPlot %p [%d %d] %d\n", this, plot->fOffset.fX, plot->fOffset.fY, gCounter);
diff --git a/src/gpu/GrAtlas.h b/src/gpu/GrAtlas.h
index d06bba1..d3deba5 100644
--- a/src/gpu/GrAtlas.h
+++ b/src/gpu/GrAtlas.h
@@ -67,13 +67,13 @@
// add subimage of width, height dimensions to atlas
// returns the containing GrPlot and location relative to the backing texture
GrPlot* addToAtlas(GrAtlas*, int width, int height, const void*, GrIPoint16*);
-
+
// free up any plots that are not waiting on a draw call
bool removeUnusedPlots(GrAtlas* atlas);
-
+
// to be called by ~GrAtlas()
void deletePlotList(GrPlot* plot);
-
+
GrTexture* getTexture() const {
return fTexture;
}
@@ -81,11 +81,11 @@
private:
GrPlot* allocPlot();
void freePlot(GrPlot* plot);
-
+
GrGpu* fGpu;
GrPixelConfig fPixelConfig;
GrTexture* fTexture;
-
+
// allocated array of GrPlots
GrPlot* fPlots;
// linked list of free GrPlots
@@ -96,13 +96,13 @@
public:
GrAtlas(GrAtlasMgr* mgr) : fPlots(NULL), fAtlasMgr(mgr) { }
~GrAtlas() { fAtlasMgr->deletePlotList(fPlots); }
-
+
bool isEmpty() { return NULL == fPlots; }
-
+
private:
GrPlot* fPlots;
GrAtlasMgr* fAtlasMgr;
-
+
friend class GrAtlasMgr;
};
diff --git a/src/gpu/GrRectanizer.cpp b/src/gpu/GrRectanizer.cpp
index 418bf19..00803fe 100644
--- a/src/gpu/GrRectanizer.cpp
+++ b/src/gpu/GrRectanizer.cpp
@@ -27,7 +27,7 @@
virtual void reset() {
fNextStripY = 0;
fAreaSoFar = 0;
- sk_bzero(fRows, sizeof(fRows));
+ sk_bzero(fRows, sizeof(fRows));
}
virtual bool addRect(int w, int h, GrIPoint16* loc);
diff --git a/src/gpu/GrTextStrike.h b/src/gpu/GrTextStrike.h
index 2f52d98..e311f3f 100644
--- a/src/gpu/GrTextStrike.h
+++ b/src/gpu/GrTextStrike.h
@@ -62,7 +62,7 @@
GrFontCache* fFontCache;
GrAtlasMgr* fAtlasMgr;
- GrAtlas fAtlas;
+ GrAtlas fAtlas;
GrMaskFormat fMaskFormat;