diff options
author | Mike Klein <mtklein@chromium.org> | 2016-09-27 09:34:10 -0400 |
---|---|---|
committer | Skia Commit-Bot <skia-commit-bot@chromium.org> | 2016-09-27 14:04:26 +0000 |
commit | fc6c37b981daeece7474ce61070c707c37eefa62 (patch) | |
tree | f805d76deeddc4a70a07126e0e78354ff4929258 /include | |
parent | 9766f0016669029fcdc49f00ceaaf66b01b03f4a (diff) |
Remove stray semicolons.
Turns out function declarations don't end in semicolons...
BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2720
No public API changes.
TBR=reed@google.com
Change-Id: I72b56d52e1ff7fa6e89c295b0de8c46599791ebb
Reviewed-on: https://skia-review.googlesource.com/2720
Reviewed-by: Mike Klein <mtklein@chromium.org>
Commit-Queue: Mike Klein <mtklein@chromium.org>
Diffstat (limited to 'include')
-rw-r--r-- | include/core/SkBBHFactory.h | 2 | ||||
-rw-r--r-- | include/core/SkPathEffect.h | 2 | ||||
-rw-r--r-- | include/core/SkPathRef.h | 4 | ||||
-rw-r--r-- | include/gpu/GrCaps.h | 12 | ||||
-rw-r--r-- | include/gpu/GrClip.h | 2 | ||||
-rw-r--r-- | include/gpu/GrContextOptions.h | 2 | ||||
-rw-r--r-- | include/gpu/GrGpuResource.h | 2 | ||||
-rw-r--r-- | include/private/SkRecords.h | 6 |
8 files changed, 16 insertions, 16 deletions
diff --git a/include/core/SkBBHFactory.h b/include/core/SkBBHFactory.h index ca7040409d..58bd754b2b 100644 --- a/include/core/SkBBHFactory.h +++ b/include/core/SkBBHFactory.h @@ -18,7 +18,7 @@ public: * Allocate a new SkBBoxHierarchy. Return NULL on failure. */ virtual SkBBoxHierarchy* operator()(const SkRect& bounds) const = 0; - virtual ~SkBBHFactory() {}; + virtual ~SkBBHFactory() {} }; class SK_API SkRTreeFactory : public SkBBHFactory { diff --git a/include/core/SkPathEffect.h b/include/core/SkPathEffect.h index c891f6db22..f5ca9183a3 100644 --- a/include/core/SkPathEffect.h +++ b/include/core/SkPathEffect.h @@ -66,7 +66,7 @@ public: fSize.set(SK_Scalar1, SK_Scalar1); // 'asPoints' needs to initialize/fill-in 'fClipRect' if it sets // the kUseClip flag - }; + } ~PointData() { delete [] fPoints; } diff --git a/include/core/SkPathRef.h b/include/core/SkPathRef.h index f84697fc1d..9b15c3e4f2 100644 --- a/include/core/SkPathRef.h +++ b/include/core/SkPathRef.h @@ -58,11 +58,11 @@ public: SkPoint* atPoint(int i) { SkASSERT((unsigned) i < (unsigned) fPathRef->fPointCnt); return this->points() + i; - }; + } const SkPoint* atPoint(int i) const { SkASSERT((unsigned) i < (unsigned) fPathRef->fPointCnt); return this->points() + i; - }; + } /** * Adds the verb and allocates space for the number of points indicated by the verb. The diff --git a/include/gpu/GrCaps.h b/include/gpu/GrCaps.h index 924546f91c..b7c91c4813 100644 --- a/include/gpu/GrCaps.h +++ b/include/gpu/GrCaps.h @@ -74,7 +74,7 @@ public: const PrecisionInfo& getFloatShaderPrecisionInfo(GrShaderType shaderType, GrSLPrecision precision) const { return fFloatPrecisions[shaderType][precision]; - }; + } /** * Is there any difference between the float shader variable precision types? If this is true @@ -84,7 +84,7 @@ public: bool floatPrecisionVaries() const { return fShaderPrecisionVaries; } /** - * PLS storage size in bytes (0 when not supported). The PLS spec defines a minimum size of 16 + * PLS storage size in bytes (0 when not supported). The PLS spec defines a minimum size of 16 * bytes whenever PLS is supported. */ int pixelLocalStorageSize() const { return fPixelLocalStorageSize; } @@ -93,7 +93,7 @@ public: * True if this context supports the necessary extensions and features to enable the PLS path * renderer. */ - bool plsPathRenderingSupport() const { + bool plsPathRenderingSupport() const { #if GR_ENABLE_PLS_PATH_RENDERING return fPLSPathRenderingSupport; #else @@ -120,7 +120,7 @@ protected: bool fPLSPathRenderingSupport; private: - virtual void onApplyOptionsOverrides(const GrContextOptions&) {}; + virtual void onApplyOptionsOverrides(const GrContextOptions&) {} typedef SkRefCnt INHERITED; }; @@ -280,7 +280,7 @@ public: bool fullClearIsFree() const { return fFullClearIsFree; } - /** True in environments that will issue errors if memory uploaded to buffers + /** True in environments that will issue errors if memory uploaded to buffers is not initialized (even if not read by draw calls). */ bool mustClearUploadedBufferData() const { return fMustClearUploadedBufferData; } @@ -344,7 +344,7 @@ protected: int fMaxWindowRectangles; private: - virtual void onApplyOptionsOverrides(const GrContextOptions&) {}; + virtual void onApplyOptionsOverrides(const GrContextOptions&) {} bool fSuppressPrints : 1; bool fImmediateFlush: 1; diff --git a/include/gpu/GrClip.h b/include/gpu/GrClip.h index a7505f99b2..12a13438db 100644 --- a/include/gpu/GrClip.h +++ b/include/gpu/GrClip.h @@ -137,7 +137,7 @@ private: bool apply(GrContext*, GrDrawContext*, bool, bool, GrAppliedClip*) const final { return true; } - bool isRRect(const SkRect&, SkRRect*, bool*) const override { return false; }; + bool isRRect(const SkRect&, SkRRect*, bool*) const override { return false; } }; #endif diff --git a/include/gpu/GrContextOptions.h b/include/gpu/GrContextOptions.h index 85e1e42844..0522b9d20b 100644 --- a/include/gpu/GrContextOptions.h +++ b/include/gpu/GrContextOptions.h @@ -11,7 +11,7 @@ #include "SkTypes.h" struct GrContextOptions { - GrContextOptions() {}; + GrContextOptions() {} // Suppress prints for the GrContext. bool fSuppressPrints = false; diff --git a/include/gpu/GrGpuResource.h b/include/gpu/GrGpuResource.h index 46e48fc4ee..364a886408 100644 --- a/include/gpu/GrGpuResource.h +++ b/include/gpu/GrGpuResource.h @@ -260,7 +260,7 @@ private: * resources and populate the scratchKey with the key. * By default resources are not recycled as scratch. **/ - virtual void computeScratchKey(GrScratchKey*) const { }; + virtual void computeScratchKey(GrScratchKey*) const { } /** * Frees the object in the underlying 3D API. Called by CacheAccess. diff --git a/include/private/SkRecords.h b/include/private/SkRecords.h index f2cade5657..e08bf772ea 100644 --- a/include/private/SkRecords.h +++ b/include/private/SkRecords.h @@ -101,7 +101,7 @@ public: } ~Optional() { if (fPtr) fPtr->~T(); } - ACT_AS_PTR(fPtr); + ACT_AS_PTR(fPtr) private: T* fPtr; }; @@ -118,7 +118,7 @@ public: } ~Adopted() { if (fPtr) fPtr->~T(); } - ACT_AS_PTR(fPtr); + ACT_AS_PTR(fPtr) private: T* fPtr; }; @@ -131,7 +131,7 @@ public: PODArray(T* ptr) : fPtr(ptr) {} // Default copy and assign. - ACT_AS_PTR(fPtr); + ACT_AS_PTR(fPtr) private: T* fPtr; }; |