From eb849e5fd10cbe00cbc31307ba97fd9efca0b41b Mon Sep 17 00:00:00 2001 From: "skia.committer@gmail.com" Date: Mon, 17 Mar 2014 03:02:17 +0000 Subject: [PATCH] Sanitizing source files in Housekeeper-Nightly git-svn-id: http://skia.googlecode.com/svn/trunk@13825 2bbb7eff-a529-9590-31e7-b0007b416f81 --- include/core/SkDevice.h | 2 +- include/core/SkPicture.h | 10 +++++----- src/core/SkCanvas.cpp | 6 ++---- src/core/SkPicture.cpp | 2 +- tools/render_pictures_main.cpp | 2 +- 5 files changed, 10 insertions(+), 12 deletions(-) diff --git a/include/core/SkDevice.h b/include/core/SkDevice.h index 7161bb1..3c67774 100644 --- a/include/core/SkDevice.h +++ b/include/core/SkDevice.h @@ -435,7 +435,7 @@ protected: * of 'picture'. If optimization data is available (due to an earlier * 'optimize' call) this entry point should make use of it and return true * if all rendering has been done. If false is returned, SkCanvas will - * perform its own rendering pass. It is acceptable for the backend + * perform its own rendering pass. It is acceptable for the backend * to perform some device-specific warm up tasks and then let SkCanvas * perform the main rendering loop (by return false from here). */ diff --git a/include/core/SkPicture.h b/include/core/SkPicture.h index 8fa7777..3718d3a 100644 --- a/include/core/SkPicture.h +++ b/include/core/SkPicture.h @@ -35,7 +35,7 @@ public: SK_DECLARE_INST_COUNT(SkPicture) // AccelData provides a base class for device-specific acceleration - // data. It is added to the picture via a call to a device's optimize + // data. It is added to the picture via a call to a device's optimize // method. class AccelData : public SkRefCnt { public: @@ -66,13 +66,13 @@ public: SkPicture(const SkPicture& src); /** PRIVATE / EXPERIMENTAL -- do not call */ - void EXPERIMENTAL_addAccelData(const AccelData* data) { - SkRefCnt_SafeAssign(fAccelData, data); + void EXPERIMENTAL_addAccelData(const AccelData* data) { + SkRefCnt_SafeAssign(fAccelData, data); } /** PRIVATE / EXPERIMENTAL -- do not call */ - const AccelData* EXPERIMENTAL_getAccelData(AccelData::Key key) const { + const AccelData* EXPERIMENTAL_getAccelData(AccelData::Key key) const { if (NULL != fAccelData && fAccelData->getKey() == key) { - return fAccelData; + return fAccelData; } return NULL; } diff --git a/src/core/SkCanvas.cpp b/src/core/SkCanvas.cpp index 1bc5e2f..d637405 100644 --- a/src/core/SkCanvas.cpp +++ b/src/core/SkCanvas.cpp @@ -2569,17 +2569,15 @@ SkCanvas* SkCanvas::NewRasterDirect(const SkImageInfo& info, void* pixels, size_ if (!supported_for_raster_canvas(info)) { return NULL; } - + SkBitmap bitmap; if (!bitmap.installPixels(info, pixels, rowBytes)) { return NULL; } - + // should this functionality be moved into allocPixels()? if (!bitmap.info().isOpaque()) { bitmap.eraseColor(0); } return SkNEW_ARGS(SkCanvas, (bitmap)); } - - diff --git a/src/core/SkPicture.cpp b/src/core/SkPicture.cpp index 92311f3..1285ff1 100644 --- a/src/core/SkPicture.cpp +++ b/src/core/SkPicture.cpp @@ -120,7 +120,7 @@ SkPicture::SkPicture() { fAccelData = NULL; } -SkPicture::SkPicture(const SkPicture& src) +SkPicture::SkPicture(const SkPicture& src) : INHERITED() , fAccelData(NULL) { fWidth = src.fWidth; diff --git a/tools/render_pictures_main.cpp b/tools/render_pictures_main.cpp index 245f995..a8c393f 100644 --- a/tools/render_pictures_main.cpp +++ b/tools/render_pictures_main.cpp @@ -190,7 +190,7 @@ static bool render_picture_internal(const SkString& inputPath, const SkString* o inputPath.c_str()); renderer.init(picture); - + if (FLAGS_preprocess) { if (NULL != renderer.getCanvas()) { renderer.getCanvas()->EXPERIMENTAL_optimize(picture); -- 2.7.4