From 884e60be30e20f38b3466a4697081187d2f1f814 Mon Sep 17 00:00:00 2001 From: "skia.committer@gmail.com" Date: Fri, 16 Nov 2012 02:01:17 +0000 Subject: Sanitizing source files in Skia_Periodic_House_Keeping git-svn-id: http://skia.googlecode.com/svn/trunk@6447 2bbb7eff-a529-9590-31e7-b0007b416f81 --- bench/RectBench.cpp | 2 +- debugger/QT/SkDebuggerGUI.cpp | 18 +++++++++--------- gm/srcmode.cpp | 2 +- samplecode/GMSampleView.h | 2 +- src/effects/SkBlurMask.cpp | 2 +- 5 files changed, 13 insertions(+), 13 deletions(-) diff --git a/bench/RectBench.cpp b/bench/RectBench.cpp index 2674232053..a7375334a4 100644 --- a/bench/RectBench.cpp +++ b/bench/RectBench.cpp @@ -78,7 +78,7 @@ public: SrcModeRectBench(void* param) : INHERITED(param, 1, 0) { fMode = SkXfermode::Create(SkXfermode::kSrc_Mode); } - + virtual ~SrcModeRectBench() { SkSafeUnref(fMode); } diff --git a/debugger/QT/SkDebuggerGUI.cpp b/debugger/QT/SkDebuggerGUI.cpp index 994bb3f735..17f7ce225c 100644 --- a/debugger/QT/SkDebuggerGUI.cpp +++ b/debugger/QT/SkDebuggerGUI.cpp @@ -132,7 +132,7 @@ class SkTimedPicturePlayback : public SkPicturePlayback { public: SkTimedPicturePlayback(SkStream* stream, const SkPictInfo& info, bool* isValid, SkSerializationHelpers::DecodeBitmap decoder, - const SkTDArray& offsets) + const SkTDArray& offsets) : INHERITED(stream, info, isValid, decoder) , fTot(0.0) , fCurCommand(0) @@ -156,9 +156,9 @@ protected: int fCurCommand; // the current command being executed/timed virtual void preDraw(size_t offset, int type) { - // This search isn't as bad as it seems. In normal playback mode, the + // This search isn't as bad as it seems. In normal playback mode, the // base class steps through the commands in order and can only skip ahead - // a bit on a clip. This class is only used during profiling so we + // a bit on a clip. This class is only used during profiling so we // don't have to worry about forward/backward scrubbing through commands. for (int i = 0; offset != fOffsets[fCurCommand]; ++i) { fCurCommand = (fCurCommand+1) % fOffsets.count(); @@ -208,7 +208,7 @@ public: if (stream->readBool()) { bool isValid = false; - fPlayback = SkNEW_ARGS(SkTimedPicturePlayback, + fPlayback = SkNEW_ARGS(SkTimedPicturePlayback, (stream, info, &isValid, decoder, offsets)); if (!isValid) { SkDELETE(fPlayback); @@ -237,7 +237,7 @@ private: void SkDebuggerGUI::actionProfile() { // In order to profile we pass the command offsets (that were read-in // in loadPicture by the SkOffsetPicture) to an SkTimedPlaybackPicture. - // The SkTimedPlaybackPicture in turn passes the offsets to an + // The SkTimedPlaybackPicture in turn passes the offsets to an // SkTimedPicturePlayback object which uses them to track the performance // of individual commands. if (fFileName.isEmpty()) { @@ -776,8 +776,8 @@ private: // Picture to wrap an SkOffsetPicturePlayback. class SkOffsetPicture : public SkPicture { public: - SkOffsetPicture(SkStream* stream, - bool* success, + SkOffsetPicture(SkStream* stream, + bool* success, SkSerializationHelpers::DecodeBitmap decoder) { if (success) { *success = false; @@ -813,8 +813,8 @@ public: } } - const SkTDArray& offsets() const { - return ((SkOffsetPicturePlayback*) fPlayback)->offsets(); + const SkTDArray& offsets() const { + return ((SkOffsetPicturePlayback*) fPlayback)->offsets(); } private: diff --git a/gm/srcmode.cpp b/gm/srcmode.cpp index 39f209be57..1cda7c2ee3 100644 --- a/gm/srcmode.cpp +++ b/gm/srcmode.cpp @@ -123,7 +123,7 @@ protected: surf->getCanvas()->drawColor(SK_ColorWHITE); this->drawContent(surf->getCanvas()); surf->draw(canvas, 0, 0, NULL); - + } private: diff --git a/samplecode/GMSampleView.h b/samplecode/GMSampleView.h index 5c7729a306..93bafca85c 100644 --- a/samplecode/GMSampleView.h +++ b/samplecode/GMSampleView.h @@ -42,7 +42,7 @@ protected: } return this->INHERITED::onQuery(evt); } - + virtual bool onEvent(const SkEvent& evt) SK_OVERRIDE { if (evt.isType("GMSampleView::showSize")) { fShowSize = SkToBool(evt.getFast32()); diff --git a/src/effects/SkBlurMask.cpp b/src/effects/SkBlurMask.cpp index 54423ef555..41f4b5b992 100644 --- a/src/effects/SkBlurMask.cpp +++ b/src/effects/SkBlurMask.cpp @@ -14,7 +14,7 @@ /** * This function performs a box blur in X, of the given radius. If the - * "transpose" parameter is true, it will transpose the pixels on write, + * "transpose" parameter is true, it will transpose the pixels on write, * such that X and Y are swapped. Reads are always performed from contiguous * memory in X, for speed. The destination buffer (dst) must be at least * (width + radius * 2) * height bytes in size. -- cgit v1.2.3