diff options
author | skia.committer@gmail.com <skia.committer@gmail.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2013-05-24 07:01:26 +0000 |
---|---|---|
committer | skia.committer@gmail.com <skia.committer@gmail.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2013-05-24 07:01:26 +0000 |
commit | 3e2345a8d56cb76bc43e4421a3e9e3681ecd9eba (patch) | |
tree | fff057f8bf6968fa52925bca60e56db7a674a40b | |
parent | 932105ae4be6684c4967d7c496f6f88b3692bda6 (diff) |
Sanitizing source files in Housekeeper-Nightly
git-svn-id: http://skia.googlecode.com/svn/trunk@9266 2bbb7eff-a529-9590-31e7-b0007b416f81
-rw-r--r-- | debugger/QT/SkDebuggerGUI.cpp | 2 | ||||
-rw-r--r-- | gm/cubicpaths.cpp | 14 | ||||
-rw-r--r-- | src/core/SkBitmapProcBicubic.cpp | 2 | ||||
-rw-r--r-- | src/core/SkBitmapProcState.cpp | 2 | ||||
-rw-r--r-- | src/core/SkBitmapProcState.h | 4 | ||||
-rw-r--r-- | src/effects/gradients/SkGradientShaderPriv.h | 2 |
6 files changed, 13 insertions, 13 deletions
diff --git a/debugger/QT/SkDebuggerGUI.cpp b/debugger/QT/SkDebuggerGUI.cpp index f1423c1854..a64870d12f 100644 --- a/debugger/QT/SkDebuggerGUI.cpp +++ b/debugger/QT/SkDebuggerGUI.cpp @@ -144,7 +144,7 @@ void SkDebuggerGUI::showDeletes() { class SkTimedPicturePlayback : public SkPicturePlayback { public: SkTimedPicturePlayback(SkStream* stream, const SkPictInfo& info, - SkPicture::InstallPixelRefProc proc, + SkPicture::InstallPixelRefProc proc, const SkTDArray<bool>& deletedCommands) : INHERITED(stream, info, proc) , fSkipCommands(deletedCommands) diff --git a/gm/cubicpaths.cpp b/gm/cubicpaths.cpp index e0d72b44b4..15f611a9ee 100644 --- a/gm/cubicpaths.cpp +++ b/gm/cubicpaths.cpp @@ -14,22 +14,22 @@ class ClippedCubicGM : public skiagm::GM { public: ClippedCubicGM() {} - + protected: SkString onShortName() { return SkString("clippedcubic"); } - + SkISize onISize() { return SkISize::Make(1240, 390); } - + virtual void onDraw(SkCanvas* canvas) { SkPath path; path.moveTo(0, 0); path.cubicTo(140, 150, 40, 10, 170, 150); - + SkPaint paint; SkRect bounds = path.getBounds(); - + for (SkScalar dy = -1; dy <= 1; dy += 1) { canvas->save(); for (SkScalar dx = -1; dx <= 1; dx += 1) { @@ -38,14 +38,14 @@ protected: canvas->translate(dx, dy); canvas->drawPath(path, paint); canvas->restore(); - + canvas->translate(bounds.width(), 0); } canvas->restore(); canvas->translate(0, bounds.height()); } } - + private: typedef skiagm::GM INHERITED; }; diff --git a/src/core/SkBitmapProcBicubic.cpp b/src/core/SkBitmapProcBicubic.cpp index a8de9caa9e..de2b0ff9a4 100644 --- a/src/core/SkBitmapProcBicubic.cpp +++ b/src/core/SkBitmapProcBicubic.cpp @@ -100,7 +100,7 @@ SkBitmapProcState::chooseBicubicFilterProc(const SkPaint& paint) { if (fBitmap->config() != SkBitmap::kARGB_8888_Config) { return NULL; } - + // TODO: consider supporting repeat and mirror if (SkShader::kClamp_TileMode != fTileModeX || SkShader::kClamp_TileMode != fTileModeY) { return NULL; diff --git a/src/core/SkBitmapProcState.cpp b/src/core/SkBitmapProcState.cpp index 9f370c0898..2a79f2f490 100644 --- a/src/core/SkBitmapProcState.cpp +++ b/src/core/SkBitmapProcState.cpp @@ -301,7 +301,7 @@ bool SkBitmapProcState::chooseProcs(const SkMatrix& inv, const SkPaint& paint) { if (NULL == fShaderProc32) { fShaderProc32 = this->chooseShaderProc32(); } - + // see if our platform has any accelerated overrides this->platformProcs(); diff --git a/src/core/SkBitmapProcState.h b/src/core/SkBitmapProcState.h index 3020334f19..7d754fe509 100644 --- a/src/core/SkBitmapProcState.h +++ b/src/core/SkBitmapProcState.h @@ -143,9 +143,9 @@ private: /** test method for choosing a bicubic shading filter */ - + ShaderProc32 chooseBicubicFilterProc(const SkPaint &paint); - + // Return false if we failed to setup for fast translate (e.g. overflow) bool setupForTranslate(); diff --git a/src/effects/gradients/SkGradientShaderPriv.h b/src/effects/gradients/SkGradientShaderPriv.h index 2f41bebbce..d792c420b8 100644 --- a/src/effects/gradients/SkGradientShaderPriv.h +++ b/src/effects/gradients/SkGradientShaderPriv.h @@ -87,7 +87,7 @@ public: sk_bzero(this, sizeof(*this)); fTileMode = SkShader::kClamp_TileMode; } - + const SkColor* fColors; const SkScalar* fPos; int fCount; |