From 6b919c353727f72342a20a7aa4ded9c022f5d816 Mon Sep 17 00:00:00 2001 From: "mike@reedtribe.org" Date: Wed, 20 Apr 2011 11:17:30 +0000 Subject: [PATCH] code style git-svn-id: http://skia.googlecode.com/svn/trunk@1159 2bbb7eff-a529-9590-31e7-b0007b416f81 --- include/effects/Sk2DPathEffect.h | 6 +++--- include/effects/SkEmbossMaskFilter.h | 3 ++- include/effects/SkKernel33MaskFilter.h | 3 +-- include/effects/SkLayerRasterizer.h | 3 +-- include/effects/SkTransparentShader.h | 6 ++---- 5 files changed, 9 insertions(+), 12 deletions(-) diff --git a/include/effects/Sk2DPathEffect.h b/include/effects/Sk2DPathEffect.h index 6e54d0a..02ec760 100644 --- a/include/effects/Sk2DPathEffect.h +++ b/include/effects/Sk2DPathEffect.h @@ -27,14 +27,14 @@ public: // overrides // This method is not exported to java. - virtual bool filterPath(SkPath* dst, const SkPath& src, SkScalar* width); + virtual bool filterPath(SkPath* dst, const SkPath& src, SkScalar* width); // overrides from SkFlattenable // This method is not exported to java. - virtual void flatten(SkFlattenableWriteBuffer&); + virtual void flatten(SkFlattenableWriteBuffer&); // This method is not exported to java. - virtual Factory getFactory(); + virtual Factory getFactory(); protected: /** New virtual, to be overridden by subclasses. diff --git a/include/effects/SkEmbossMaskFilter.h b/include/effects/SkEmbossMaskFilter.h index 042a2a6..b0c12c5 100644 --- a/include/effects/SkEmbossMaskFilter.h +++ b/include/effects/SkEmbossMaskFilter.h @@ -38,7 +38,8 @@ public: // This method is not exported to java. virtual SkMask::Format getFormat(); // This method is not exported to java. - virtual bool filterMask(SkMask* dst, const SkMask& src, const SkMatrix& matrix, SkIPoint* margin); + virtual bool filterMask(SkMask* dst, const SkMask& src, const SkMatrix&, + SkIPoint* margin); // overrides from SkFlattenable diff --git a/include/effects/SkKernel33MaskFilter.h b/include/effects/SkKernel33MaskFilter.h index 84136e2..45aaef8 100644 --- a/include/effects/SkKernel33MaskFilter.h +++ b/include/effects/SkKernel33MaskFilter.h @@ -47,8 +47,7 @@ private: class SkKernel33MaskFilter : public SkKernel33ProcMaskFilter { public: SkKernel33MaskFilter(const int coeff[3][3], int shift, int percent256 = 256) - : SkKernel33ProcMaskFilter(percent256) - { + : SkKernel33ProcMaskFilter(percent256) { memcpy(fKernel, coeff, 9 * sizeof(int)); fShift = shift; } diff --git a/include/effects/SkLayerRasterizer.h b/include/effects/SkLayerRasterizer.h index 820f6fc..0373b05 100644 --- a/include/effects/SkLayerRasterizer.h +++ b/include/effects/SkLayerRasterizer.h @@ -28,8 +28,7 @@ public: SkLayerRasterizer(); virtual ~SkLayerRasterizer(); - void addLayer(const SkPaint& paint) - { + void addLayer(const SkPaint& paint) { this->addLayer(paint, 0, 0); } diff --git a/include/effects/SkTransparentShader.h b/include/effects/SkTransparentShader.h index 8bc60ff..5e87609 100644 --- a/include/effects/SkTransparentShader.h +++ b/include/effects/SkTransparentShader.h @@ -31,8 +31,7 @@ public: // overrides for SkFlattenable virtual Factory getFactory() { return Create; } - virtual void flatten(SkFlattenableWriteBuffer& buffer) - { + virtual void flatten(SkFlattenableWriteBuffer& buffer) { this->INHERITED::flatten(buffer); } @@ -43,8 +42,7 @@ private: SkTransparentShader(SkFlattenableReadBuffer& buffer) : INHERITED(buffer) {} - static SkFlattenable* Create(SkFlattenableReadBuffer& buffer) - { + static SkFlattenable* Create(SkFlattenableReadBuffer& buffer) { return SkNEW_ARGS(SkTransparentShader, (buffer)); } -- 2.7.4