Sanitizing source files in Housekeeper-Nightly
git-svn-id: http://skia.googlecode.com/svn/trunk@14172 2bbb7eff-a529-9590-31e7-b0007b416f81
diff --git a/bench/benchmain.cpp b/bench/benchmain.cpp
index eb3947a..ef83d19 100644
--- a/bench/benchmain.cpp
+++ b/bench/benchmain.cpp
@@ -525,14 +525,14 @@
if (NULL != canvas) {
canvas->clear(SK_ColorWHITE);
- if (FLAGS_clip) {
- perform_clip(canvas, dim.fX, dim.fY);
+ if (FLAGS_clip) {
+ perform_clip(canvas, dim.fX, dim.fY);
}
- if (FLAGS_scale) {
- perform_scale(canvas, dim.fX, dim.fY);
+ if (FLAGS_scale) {
+ perform_scale(canvas, dim.fX, dim.fY);
}
- if (FLAGS_rotate) {
- perform_rotate(canvas, dim.fX, dim.fY);
+ if (FLAGS_rotate) {
+ perform_rotate(canvas, dim.fX, dim.fY);
}
}
diff --git a/dm/DMTileGridTask.cpp b/dm/DMTileGridTask.cpp
index bc76b80..e34ac74 100644
--- a/dm/DMTileGridTask.cpp
+++ b/dm/DMTileGridTask.cpp
@@ -30,8 +30,8 @@
SkIPoint::Make(0,0), // Offset.
};
SkAutoTUnref<SkPictureFactory> factory(SkNEW_ARGS(SkTileGridPictureFactory, (info)));
- SkAutoTUnref<SkPicture> recorded(RecordPicture(fGM.get(),
- SkPicture::kUsePathBoundsForClip_RecordingFlag,
+ SkAutoTUnref<SkPicture> recorded(RecordPicture(fGM.get(),
+ SkPicture::kUsePathBoundsForClip_RecordingFlag,
factory));
SkBitmap full;
diff --git a/dm/DMUtil.h b/dm/DMUtil.h
index 803e440..7c112b3 100644
--- a/dm/DMUtil.h
+++ b/dm/DMUtil.h
@@ -16,8 +16,8 @@
SkString UnderJoin(const char* a, const char* b);
// Draw gm to picture. Passes recordFlags to SkPictureRecorder::beginRecording().
-SkPicture* RecordPicture(skiagm::GM* gm,
- uint32_t recordFlags = 0,
+SkPicture* RecordPicture(skiagm::GM* gm,
+ uint32_t recordFlags = 0,
SkPictureFactory* factory = NULL);
// Prepare bitmap to have gm or bench draw into it with this config.
diff --git a/include/core/SkPicture.h b/include/core/SkPicture.h
index c298b3d..8d3061c 100644
--- a/include/core/SkPicture.h
+++ b/include/core/SkPicture.h
@@ -445,9 +445,9 @@
}
/** Signal that the caller is done recording. This invalidates the canvas
- returned by beginRecording/getRecordingCanvas, and returns the
+ returned by beginRecording/getRecordingCanvas, and returns the
created SkPicture. Note that the returned picture has its creation
- ref which the caller must take ownership of.
+ ref which the caller must take ownership of.
*/
SkPicture* endRecording() {
if (NULL != fPicture.get()) {
diff --git a/include/core/SkTileGridPicture.h b/include/core/SkTileGridPicture.h
index c1929f4..b6fd01d 100644
--- a/include/core/SkTileGridPicture.h
+++ b/include/core/SkTileGridPicture.h
@@ -60,7 +60,7 @@
SkTileGridPictureFactory(const SkTileGridPicture::TileGridInfo& info) : fInfo(info) { }
virtual SkPicture* create(int width, int height) SK_OVERRIDE {
- return SkNEW_ARGS(SkTileGridPicture, (width, height, fInfo));
+ return SkNEW_ARGS(SkTileGridPicture, (width, height, fInfo));
}
protected:
diff --git a/samplecode/SamplePicture.cpp b/samplecode/SamplePicture.cpp
index a786750..51e8f0b 100644
--- a/samplecode/SamplePicture.cpp
+++ b/samplecode/SamplePicture.cpp
@@ -83,7 +83,7 @@
fPicture = recorder.endRecording();
- // fPicture now has (4) references to fSubPicture. We can release our ref,
+ // fPicture now has (4) references to fSubPicture. We can release our ref,
// and just unref fPicture in our destructor, and it will in turn take care of
// the other references to fSubPicture
fSubPicture->unref();
diff --git a/tools/PictureRenderer.cpp b/tools/PictureRenderer.cpp
index a1098d9..59e4948 100644
--- a/tools/PictureRenderer.cpp
+++ b/tools/PictureRenderer.cpp
@@ -991,7 +991,7 @@
class SkRTreePictureFactory : public SkPictureFactory {
private:
virtual SkPicture* create(int width, int height) SK_OVERRIDE {
- return SkNEW(RTreePicture);
+ return SkNEW(RTreePicture);
}
private:
diff --git a/tools/bench_record.cpp b/tools/bench_record.cpp
index 283ba6c..19bff78 100644
--- a/tools/bench_record.cpp
+++ b/tools/bench_record.cpp
@@ -59,21 +59,21 @@
}
static PictureFactory parse_FLAGS_bbh() {
- if (FLAGS_bbh.isEmpty()) {
- return &vanilla_factory;
+ if (FLAGS_bbh.isEmpty()) {
+ return &vanilla_factory;
}
if (FLAGS_bbh.count() != 1) {
SkDebugf("Multiple bbh arguments supplied.\n");
return NULL;
}
- if (FLAGS_bbh.contains("rtree")) {
- return rtree_factory;
+ if (FLAGS_bbh.contains("rtree")) {
+ return rtree_factory;
}
- if (FLAGS_bbh.contains("tilegrid")) {
- return tilegrid_factory;
+ if (FLAGS_bbh.contains("tilegrid")) {
+ return tilegrid_factory;
}
- if (FLAGS_bbh.contains("quadtree")) {
- return quadtree_factory;
+ if (FLAGS_bbh.contains("quadtree")) {
+ return quadtree_factory;
}
SkDebugf("Invalid bbh type %s, must be one of rtree, tilegrid, quadtree.\n", FLAGS_bbh[0]);
return NULL;