Sanitizing source files in Housekeeper-Nightly

git-svn-id: http://skia.googlecode.com/svn/trunk@14172 2bbb7eff-a529-9590-31e7-b0007b416f81
This commit is contained in:
skia.committer@gmail.com 2014-04-14 03:04:57 +00:00
parent 84b18c7e3e
commit 5199701acb
8 changed files with 23 additions and 23 deletions

View File

@ -525,14 +525,14 @@ int tool_main(int argc, char** argv) {
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);
}
}

View File

@ -30,8 +30,8 @@ void TileGridTask::draw() {
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;

View File

@ -16,8 +16,8 @@ namespace DM {
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.

View File

@ -445,9 +445,9 @@ public:
}
/** 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()) {

View File

@ -60,7 +60,7 @@ public:
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:

View File

@ -83,7 +83,7 @@ public:
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();

View File

@ -991,7 +991,7 @@ public:
class SkRTreePictureFactory : public SkPictureFactory {
private:
virtual SkPicture* create(int width, int height) SK_OVERRIDE {
return SkNEW(RTreePicture);
return SkNEW(RTreePicture);
}
private:

View File

@ -59,21 +59,21 @@ static SkPictureFactory* quadtree_factory(int* recordingFlags) {
}
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;