diff options
Diffstat (limited to 'src')
35 files changed, 60 insertions, 60 deletions
diff --git a/src/core/SkChunkAlloc.cpp b/src/core/SkChunkAlloc.cpp index bb52c46c7a..90650a7ad8 100644 --- a/src/core/SkChunkAlloc.cpp +++ b/src/core/SkChunkAlloc.cpp @@ -45,7 +45,7 @@ struct SkChunkAlloc::Block { sk_free(block); block = next; } - }; + } bool contains(const void* addr) const { const char* ptr = reinterpret_cast<const char*>(addr); diff --git a/src/core/SkColorMatrixFilterRowMajor255.h b/src/core/SkColorMatrixFilterRowMajor255.h index 79709b3282..c1158859f8 100644 --- a/src/core/SkColorMatrixFilterRowMajor255.h +++ b/src/core/SkColorMatrixFilterRowMajor255.h @@ -12,7 +12,7 @@ class SK_API SkColorMatrixFilterRowMajor255 : public SkColorFilter { public: - SkColorMatrixFilterRowMajor255() {}; + SkColorMatrixFilterRowMajor255() {} explicit SkColorMatrixFilterRowMajor255(const SkScalar array[20]); /** Creates a color matrix filter that returns the same value in all four channels. */ diff --git a/src/core/SkFindAndPlaceGlyph.h b/src/core/SkFindAndPlaceGlyph.h index 48cc0fa144..257528cd03 100644 --- a/src/core/SkFindAndPlaceGlyph.h +++ b/src/core/SkFindAndPlaceGlyph.h @@ -405,7 +405,7 @@ private: template<typename ProcessOneGlyph> class GlyphFindAndPlaceInterface : SkNoncopyable { public: - virtual ~GlyphFindAndPlaceInterface() { }; + virtual ~GlyphFindAndPlaceInterface() { } // findAndPositionGlyph calculates the position of the glyph, finds the glyph, and // returns the position of where the next glyph will be using the glyph's advance and @@ -419,7 +419,7 @@ private: const char** text, SkPoint position, ProcessOneGlyph&& processOneGlyph) { SkFAIL("Should never get here."); return {0.0f, 0.0f}; - }; + } }; // GlyphFindAndPlaceSubpixel handles finding and placing glyphs when sub-pixel positioning is diff --git a/src/core/SkLinearBitmapPipeline.cpp b/src/core/SkLinearBitmapPipeline.cpp index 44a3d77195..401eb41b79 100644 --- a/src/core/SkLinearBitmapPipeline.cpp +++ b/src/core/SkLinearBitmapPipeline.cpp @@ -413,7 +413,7 @@ private: const uint32_t* src = this->pixelAddress(x, y); SkOpts::srcover_srgb_srgb(fDest, src, 1, 1); fDest += 1; - }; + } const uint32_t* const fSrc; const int32_t fWidth; diff --git a/src/core/SkLinearBitmapPipeline_sample.h b/src/core/SkLinearBitmapPipeline_sample.h index 78e8d673ed..5f9948c644 100644 --- a/src/core/SkLinearBitmapPipeline_sample.h +++ b/src/core/SkLinearBitmapPipeline_sample.h @@ -207,7 +207,7 @@ public: void get4Pixels( const void* src, int index, Sk4f* px0, Sk4f* px1, Sk4f* px2, Sk4f* px3) const { fPixelAccessor->get4Pixels(src, index, px0, px1, px2, px3); - }; + } Sk4f getPixelFromRow(const void* row, int index) const { return fPixelAccessor->getPixelFromRow(row, index); diff --git a/src/core/SkLinearBitmapPipeline_tile.h b/src/core/SkLinearBitmapPipeline_tile.h index 39d79a0061..1e07c22cf5 100644 --- a/src/core/SkLinearBitmapPipeline_tile.h +++ b/src/core/SkLinearBitmapPipeline_tile.h @@ -410,7 +410,7 @@ public: SkScalar answer = SkMinScalar(SkScalarAbs(unbias), fYsCap[0]); SkASSERT(0 <= answer && answer < fYMax); return answer; - }; + } private: SkScalar fYMax; diff --git a/src/core/SkModeColorFilter.h b/src/core/SkModeColorFilter.h index 01d1eaa347..7d4d4cc3ef 100644 --- a/src/core/SkModeColorFilter.h +++ b/src/core/SkModeColorFilter.h @@ -45,7 +45,7 @@ protected: fColor = color; fMode = mode; this->updateCache(); - }; + } void flatten(SkWriteBuffer&) const override; diff --git a/src/core/SkNormalSource.h b/src/core/SkNormalSource.h index 84aa9c4466..32ef08ce52 100644 --- a/src/core/SkNormalSource.h +++ b/src/core/SkNormalSource.h @@ -33,7 +33,7 @@ public: class Provider { public: - virtual ~Provider() {}; + virtual ~Provider() {} /** Called for each span of the object being drawn on the CPU. Your subclass should set the appropriate normals that correspond to the specified device coordinates. diff --git a/src/core/SkRWBuffer.cpp b/src/core/SkRWBuffer.cpp index 8f50c25c2a..07a537a640 100644 --- a/src/core/SkRWBuffer.cpp +++ b/src/core/SkRWBuffer.cpp @@ -19,7 +19,7 @@ struct SkBufferBlock { SkBufferBlock(size_t capacity) : fNext(nullptr), fUsed(0), fCapacity(capacity) {} - const void* startData() const { return this + 1; }; + const void* startData() const { return this + 1; } size_t avail() const { return fCapacity - fUsed; } void* availData() { return (char*)this->startData() + fUsed; } diff --git a/src/core/SkResourceCache.h b/src/core/SkResourceCache.h index a8da4bd58b..5919336312 100644 --- a/src/core/SkResourceCache.h +++ b/src/core/SkResourceCache.h @@ -243,7 +243,7 @@ public: } DiscardableFactory discardableFactory() const { return fDiscardableFactory; } - SkBitmap::Allocator* allocator() const { return fAllocator; }; + SkBitmap::Allocator* allocator() const { return fAllocator; } SkCachedData* newCachedData(size_t bytes); diff --git a/src/core/SkTypeface.cpp b/src/core/SkTypeface.cpp index 3c4f5cb7e7..8747c6e54a 100644 --- a/src/core/SkTypeface.cpp +++ b/src/core/SkTypeface.cpp @@ -61,8 +61,8 @@ protected: } return 0; } - int onCountGlyphs() const override { return 0; }; - int onGetUPEM() const override { return 0; }; + int onCountGlyphs() const override { return 0; } + int onGetUPEM() const override { return 0; } class EmptyLocalizedStrings : public SkTypeface::LocalizedStrings { public: bool next(SkTypeface::LocalizedString*) override { return false; } @@ -72,7 +72,7 @@ protected: } SkTypeface::LocalizedStrings* onCreateFamilyNameIterator() const override { return new EmptyLocalizedStrings; - }; + } int onGetTableTags(SkFontTableTag tags[]) const override { return 0; } size_t onGetTableData(SkFontTableTag, size_t, size_t, void*) const override { return 0; diff --git a/src/effects/GrCircleBlurFragmentProcessor.h b/src/effects/GrCircleBlurFragmentProcessor.h index 7754a2eda4..66072887da 100644 --- a/src/effects/GrCircleBlurFragmentProcessor.h +++ b/src/effects/GrCircleBlurFragmentProcessor.h @@ -22,7 +22,7 @@ class GrTextureProvider; // profile that is just rotated about the origin of the circle. class GrCircleBlurFragmentProcessor : public GrFragmentProcessor { public: - ~GrCircleBlurFragmentProcessor() override {}; + ~GrCircleBlurFragmentProcessor() override {} const char* name() const override { return "CircleBlur"; } diff --git a/src/effects/SkArithmeticMode_gpu.cpp b/src/effects/SkArithmeticMode_gpu.cpp index 50c46ad243..d20ebbe42b 100644 --- a/src/effects/SkArithmeticMode_gpu.cpp +++ b/src/effects/SkArithmeticMode_gpu.cpp @@ -219,7 +219,7 @@ private: const ArithmeticXP& arith = processor.cast<ArithmeticXP>(); pdman.set4f(fKUni, arith.k1(), arith.k2(), arith.k3(), arith.k4()); fEnforcePMColor = arith.enforcePMColor(); - }; + } GrGLSLProgramDataManager::UniformHandle fKUni; bool fEnforcePMColor; diff --git a/src/effects/SkArithmeticMode_gpu.h b/src/effects/SkArithmeticMode_gpu.h index 98cbaf90a5..4704399d24 100644 --- a/src/effects/SkArithmeticMode_gpu.h +++ b/src/effects/SkArithmeticMode_gpu.h @@ -37,7 +37,7 @@ public: std::move(dst))); } - ~GrArithmeticFP() override {}; + ~GrArithmeticFP() override {} const char* name() const override { return "Arithmetic"; } diff --git a/src/effects/SkBlurMaskFilter.cpp b/src/effects/SkBlurMaskFilter.cpp index 9d6600fe2f..c32e111f29 100644 --- a/src/effects/SkBlurMaskFilter.cpp +++ b/src/effects/SkBlurMaskFilter.cpp @@ -125,7 +125,7 @@ private: const SkScalar SkBlurMaskFilterImpl::kMAX_BLUR_SIGMA = SkIntToScalar(128); -sk_sp<SkMaskFilter> SkBlurMaskFilter::Make(SkBlurStyle style, SkScalar sigma, +sk_sp<SkMaskFilter> SkBlurMaskFilter::Make(SkBlurStyle style, SkScalar sigma, const SkRect& occluder, uint32_t flags) { if (!SkScalarIsFinite(sigma) || sigma <= 0) { return nullptr; @@ -184,7 +184,7 @@ static uint32_t insert_into_arrays(SkScalar* array1, SkScalar* array2, (*num)++; } break; - } + } } return skipMask; @@ -1072,7 +1072,7 @@ public: float sigma, float xformedSigma, const SkRRect& srcRRect, const SkRRect& devRRect); - virtual ~GrRRectBlurEffect() {}; + virtual ~GrRRectBlurEffect() {} const char* name() const override { return "GrRRectBlur"; } const SkRRect& getRRect() const { return fRRect; } @@ -1128,7 +1128,7 @@ static sk_sp<GrTexture> find_or_create_rrect_blur_mask(GrContext* context, if (!dc) { return nullptr; } - + GrPaint grPaint; grPaint.setAntiAlias(doAA); @@ -1175,13 +1175,13 @@ sk_sp<GrFragmentProcessor> GrRRectBlurEffect::Make(GrContext* context, int ignoredSize; uint32_t ignored32; - bool ninePatchable = SkBlurMaskFilter::ComputeBlurredRRectParams(srcRRect, devRRect, + bool ninePatchable = SkBlurMaskFilter::ComputeBlurredRRectParams(srcRRect, devRRect, SkRect::MakeEmpty(), sigma, xformedSigma, &rrectToDraw, &size, ignored, ignored, - ignored, ignored, - &ignoredSize, &ignoredSize, + ignored, ignored, + &ignoredSize, &ignoredSize, &ignored32); if (!ninePatchable) { return nullptr; @@ -1423,7 +1423,7 @@ bool SkBlurMaskFilterImpl::directFilterRRectMaskGPU(GrContext* context, static const uint16_t fullI[6] = { 0, 1, 2, 0, 2, 3 }; memcpy(indices, fullI, sizeof(fullI)); numIndices = 6; - } + } drawContext->drawVertices(clip, newPaint, viewMatrix, kTriangles_GrPrimitiveType, numPoints, points, nullptr, nullptr, indices, numIndices); diff --git a/src/effects/SkLightingImageFilter.cpp b/src/effects/SkLightingImageFilter.cpp index 66d3a17883..56275743d7 100644 --- a/src/effects/SkLightingImageFilter.cpp +++ b/src/effects/SkLightingImageFilter.cpp @@ -357,7 +357,7 @@ protected: } #if SK_SUPPORT_GPU - sk_sp<SkSpecialImage> filterImageGPU(SkSpecialImage* source, + sk_sp<SkSpecialImage> filterImageGPU(SkSpecialImage* source, SkSpecialImage* input, const SkIRect& bounds, const SkMatrix& matrix, @@ -802,7 +802,7 @@ public: SkPoint3 surfaceToLight(int x, int y, int z, SkScalar surfaceScale) const { return fDirection; - }; + } const SkPoint3& lightColor(const SkPoint3&) const { return this->color(); } LightType type() const override { return kDistant_LightType; } const SkPoint3& direction() const { return fDirection; } @@ -861,7 +861,7 @@ public: surfaceScale)); fast_normalize(&direction); return direction; - }; + } const SkPoint3& lightColor(const SkPoint3&) const { return this->color(); } LightType type() const override { return kPoint_LightType; } const SkPoint3& location() const { return fLocation; } @@ -966,7 +966,7 @@ public: surfaceScale)); fast_normalize(&direction); return direction; - }; + } SkPoint3 lightColor(const SkPoint3& surfaceToLight) const { SkScalar cosAngle = -surfaceToLight.dot(fS); SkScalar scale = 0; @@ -1118,7 +1118,7 @@ sk_sp<SkImageFilter> SkLightingImageFilter::MakeDistantLitDiffuse(const SkPoint3 sk_sp<SkImageFilter> input, const CropRect* cropRect) { sk_sp<SkImageFilterLight> light(new SkDistantLight(direction, lightColor)); - return SkDiffuseLightingImageFilter::Make(std::move(light), surfaceScale, kd, + return SkDiffuseLightingImageFilter::Make(std::move(light), surfaceScale, kd, std::move(input), cropRect); } @@ -1212,7 +1212,7 @@ sk_sp<SkImageFilter> SkDiffuseLightingImageFilter::Make(sk_sp<SkImageFilterLight if (kd < 0) { return nullptr; } - return sk_sp<SkImageFilter>(new SkDiffuseLightingImageFilter(std::move(light), surfaceScale, + return sk_sp<SkImageFilter>(new SkDiffuseLightingImageFilter(std::move(light), surfaceScale, kd, std::move(input), cropRect)); } diff --git a/src/effects/SkMagnifierImageFilter.cpp b/src/effects/SkMagnifierImageFilter.cpp index 4b03125739..c546730e80 100644 --- a/src/effects/SkMagnifierImageFilter.cpp +++ b/src/effects/SkMagnifierImageFilter.cpp @@ -42,7 +42,7 @@ public: xInvInset, yInvInset)); } - ~GrMagnifierEffect() override {}; + ~GrMagnifierEffect() override {} const char* name() const override { return "Magnifier"; } @@ -311,9 +311,9 @@ sk_sp<SkSpecialImage> SkMagnifierImageFilter::onFilterImage(SkSpecialImage* sour offset->fY = bounds.top(); bounds.offset(-inputOffset); - SkScalar yOffset = inputTexture->origin() == kTopLeft_GrSurfaceOrigin + SkScalar yOffset = inputTexture->origin() == kTopLeft_GrSurfaceOrigin ? fSrcRect.y() - : inputTexture->height() - + : inputTexture->height() - fSrcRect.height() * inputTexture->height() / bounds.height() - fSrcRect.y(); int boundsY = inputTexture->origin() == kTopLeft_GrSurfaceOrigin ? bounds.y() diff --git a/src/gpu/GrAllocator.h b/src/gpu/GrAllocator.h index 3305fb00c2..5b9bd5bab9 100644 --- a/src/gpu/GrAllocator.h +++ b/src/gpu/GrAllocator.h @@ -229,7 +229,7 @@ template <typename T> void* operator new(size_t, GrTAllocator<T>*); template <typename T> class GrTAllocator : SkNoncopyable { public: - virtual ~GrTAllocator() { this->reset(); }; + virtual ~GrTAllocator() { this->reset(); } /** * Create an allocator diff --git a/src/gpu/GrOvalRenderer.cpp b/src/gpu/GrOvalRenderer.cpp index 90b2d8e4f1..68b3f11d1d 100644 --- a/src/gpu/GrOvalRenderer.cpp +++ b/src/gpu/GrOvalRenderer.cpp @@ -62,7 +62,7 @@ inline bool circle_stays_circle(const SkMatrix& m) { * p is the position in the normalized space. * outerRad is the outerRadius in device space. * innerRad is the innerRadius in normalized space (ignored if not stroking). - * If fUsesDistanceVectorField is set in fragment processors in the same program, then + * If fUsesDistanceVectorField is set in fragment processors in the same program, then * an additional vertex attribute is available via args.fFragBuilder->distanceVectorName(): * vec4f : (v.xy, outerDistance, innerDistance) * v is a normalized vector pointing to the outer edge @@ -103,7 +103,7 @@ public: fStroke = stroke; } - bool implementsDistanceVector() const override { return !fInClipPlane; }; + bool implementsDistanceVector() const override { return !fInClipPlane; } virtual ~CircleGeometryProcessor() {} @@ -1324,7 +1324,7 @@ private: /////////////////////////////////////////////////////////////////////////////// -// We have three possible cases for geometry for a roundrect. +// We have three possible cases for geometry for a roundrect. // // In the case of a normal fill or a stroke, we draw the roundrect as a 9-patch: // ____________ diff --git a/src/gpu/GrPathUtils.h b/src/gpu/GrPathUtils.h index cb2da30803..fcc32c89c4 100644 --- a/src/gpu/GrPathUtils.h +++ b/src/gpu/GrPathUtils.h @@ -56,7 +56,7 @@ namespace GrPathUtils { // points of the quadratic. class QuadUVMatrix { public: - QuadUVMatrix() {}; + QuadUVMatrix() {} // Initialize the matrix from the control pts QuadUVMatrix(const SkPoint controlPts[3]) { this->set(controlPts); } void set(const SkPoint controlPts[3]); diff --git a/src/gpu/GrPendingProgramElement.h b/src/gpu/GrPendingProgramElement.h index 69e459f08e..ab1f437893 100644 --- a/src/gpu/GrPendingProgramElement.h +++ b/src/gpu/GrPendingProgramElement.h @@ -18,7 +18,7 @@ */ template <typename T> class GrPendingProgramElement : SkNoncopyable { public: - GrPendingProgramElement() : fObj(nullptr) { }; + GrPendingProgramElement() : fObj(nullptr) { } // Adds a pending execution on obj. explicit GrPendingProgramElement(T* obj) : fObj(obj) { diff --git a/src/gpu/GrPrimitiveProcessor.h b/src/gpu/GrPrimitiveProcessor.h index c147bb5058..00b4df01ed 100644 --- a/src/gpu/GrPrimitiveProcessor.h +++ b/src/gpu/GrPrimitiveProcessor.h @@ -226,7 +226,7 @@ protected: size_t fVertexStride; private: - void notifyRefCntIsZero() const final {}; + void notifyRefCntIsZero() const final {} virtual bool hasExplicitLocalCoords() const = 0; typedef GrProcessor INHERITED; diff --git a/src/gpu/GrTraceMarker.h b/src/gpu/GrTraceMarker.h index a0e9625a51..037112168b 100644 --- a/src/gpu/GrTraceMarker.h +++ b/src/gpu/GrTraceMarker.h @@ -67,7 +67,7 @@ private: class GrTraceMarkerSet::Iter { public: - Iter() {}; + Iter() {} Iter& operator=(const Iter& i) { fCurrentIndex = i.fCurrentIndex; fMarkers = i.fMarkers; diff --git a/src/gpu/batches/GrAAConvexPathRenderer.cpp b/src/gpu/batches/GrAAConvexPathRenderer.cpp index 224567acff..c71f46de66 100644 --- a/src/gpu/batches/GrAAConvexPathRenderer.cpp +++ b/src/gpu/batches/GrAAConvexPathRenderer.cpp @@ -55,11 +55,11 @@ struct Segment { const SkPoint& endPt() const { GR_STATIC_ASSERT(0 == kLine && 1 == kQuad); return fPts[fType]; - }; + } const SkPoint& endNorm() const { GR_STATIC_ASSERT(0 == kLine && 1 == kQuad); return fNorms[fType]; - }; + } }; typedef SkTArray<Segment, true> SegmentArray; diff --git a/src/gpu/batches/GrAnalyticRectBatch.cpp b/src/gpu/batches/GrAnalyticRectBatch.cpp index 8c0f419178..311c652137 100644 --- a/src/gpu/batches/GrAnalyticRectBatch.cpp +++ b/src/gpu/batches/GrAnalyticRectBatch.cpp @@ -63,7 +63,7 @@ public: fInWidthHeight = &this->addVertexAttrib("inWidthHeight", kVec2f_GrVertexAttribType); } - bool implementsDistanceVector() const override { return true; }; + bool implementsDistanceVector() const override { return true; } const Attribute* inPosition() const { return fInPosition; } const Attribute* inColor() const { return fInColor; } diff --git a/src/gpu/effects/Gr1DKernelEffect.h b/src/gpu/effects/Gr1DKernelEffect.h index d300f2d523..d7402e8c45 100644 --- a/src/gpu/effects/Gr1DKernelEffect.h +++ b/src/gpu/effects/Gr1DKernelEffect.h @@ -35,7 +35,7 @@ public: , fDirection(direction) , fRadius(radius) {} - virtual ~Gr1DKernelEffect() {}; + virtual ~Gr1DKernelEffect() {} static int WidthFromRadius(int radius) { return 2 * radius + 1; } diff --git a/src/gpu/effects/GrCoverageSetOpXP.cpp b/src/gpu/effects/GrCoverageSetOpXP.cpp index 90657ea2b1..c6abc696c2 100644 --- a/src/gpu/effects/GrCoverageSetOpXP.cpp +++ b/src/gpu/effects/GrCoverageSetOpXP.cpp @@ -68,7 +68,7 @@ public: const CoverageSetOpXP& xp = processor.cast<CoverageSetOpXP>(); uint32_t key = xp.invertCoverage() ? 0x0 : 0x1; b->add32(key); - }; + } private: void emitOutputsForBlendState(const EmitArgs& args) override { @@ -82,7 +82,7 @@ private: } } - void onSetData(const GrGLSLProgramDataManager&, const GrXferProcessor&) override {}; + void onSetData(const GrGLSLProgramDataManager&, const GrXferProcessor&) override {} typedef GrGLSLXferProcessor INHERITED; }; diff --git a/src/gpu/effects/GrDisableColorXP.cpp b/src/gpu/effects/GrDisableColorXP.cpp index 1ff8ad66a4..35009e1a07 100644 --- a/src/gpu/effects/GrDisableColorXP.cpp +++ b/src/gpu/effects/GrDisableColorXP.cpp @@ -20,7 +20,7 @@ class DisableColorXP : public GrXferProcessor { public: static GrXferProcessor* Create() { return new DisableColorXP; } - ~DisableColorXP() override {}; + ~DisableColorXP() override {} const char* name() const override { return "Disable Color"; } diff --git a/src/gpu/effects/GrDitherEffect.cpp b/src/gpu/effects/GrDitherEffect.cpp index abce5ca6c7..1fddec6629 100644 --- a/src/gpu/effects/GrDitherEffect.cpp +++ b/src/gpu/effects/GrDitherEffect.cpp @@ -20,7 +20,7 @@ public: return sk_sp<GrFragmentProcessor>(new DitherEffect); } - virtual ~DitherEffect() {}; + virtual ~DitherEffect() {} const char* name() const override { return "Dither"; } diff --git a/src/gpu/effects/GrOvalEffect.cpp b/src/gpu/effects/GrOvalEffect.cpp index a288537d50..97ea1e6d0a 100644 --- a/src/gpu/effects/GrOvalEffect.cpp +++ b/src/gpu/effects/GrOvalEffect.cpp @@ -22,7 +22,7 @@ public: static sk_sp<GrFragmentProcessor> Make(GrPrimitiveEdgeType, const SkPoint& center, SkScalar radius); - virtual ~CircleEffect() {}; + virtual ~CircleEffect() {} const char* name() const override { return "Circle"; } @@ -187,7 +187,7 @@ public: static sk_sp<GrFragmentProcessor> Make(GrPrimitiveEdgeType, const SkPoint& center, SkScalar rx, SkScalar ry); - virtual ~EllipseEffect() {}; + virtual ~EllipseEffect() {} const char* name() const override { return "Ellipse"; } diff --git a/src/gpu/effects/GrPorterDuffXferProcessor.cpp b/src/gpu/effects/GrPorterDuffXferProcessor.cpp index 7f804bb60f..f51e94ba82 100644 --- a/src/gpu/effects/GrPorterDuffXferProcessor.cpp +++ b/src/gpu/effects/GrPorterDuffXferProcessor.cpp @@ -439,7 +439,7 @@ public: b->add32(xp.getBlendFormula().fPrimaryOutputType | (xp.getBlendFormula().fSecondaryOutputType << 3)); GR_STATIC_ASSERT(BlendFormula::kLast_OutputType < 8); - }; + } private: void emitOutputsForBlendState(const EmitArgs& args) override { @@ -641,7 +641,7 @@ private: args.fInputCoverage); } - void onSetData(const GrGLSLProgramDataManager&, const GrXferProcessor&) override {}; + void onSetData(const GrGLSLProgramDataManager&, const GrXferProcessor&) override {} typedef GrGLSLXferProcessor INHERITED; }; diff --git a/src/gpu/effects/GrRRectEffect.cpp b/src/gpu/effects/GrRRectEffect.cpp index 14d03dd9ed..37bb3f8848 100644 --- a/src/gpu/effects/GrRRectEffect.cpp +++ b/src/gpu/effects/GrRRectEffect.cpp @@ -48,7 +48,7 @@ public: static sk_sp<GrFragmentProcessor> Make(GrPrimitiveEdgeType, uint32_t circularCornerFlags, const SkRRect&); - virtual ~CircularRRectEffect() {}; + virtual ~CircularRRectEffect() {} const char* name() const override { return "CircularRRect"; } @@ -390,7 +390,7 @@ class EllipticalRRectEffect : public GrFragmentProcessor { public: static sk_sp<GrFragmentProcessor> Make(GrPrimitiveEdgeType, const SkRRect&); - virtual ~EllipticalRRectEffect() {}; + virtual ~EllipticalRRectEffect() {} const char* name() const override { return "EllipticalRRect"; } diff --git a/src/gpu/gl/GrGLCreateNullInterface.cpp b/src/gpu/gl/GrGLCreateNullInterface.cpp index b70ca44cb0..61f638b682 100644 --- a/src/gpu/gl/GrGLCreateNullInterface.cpp +++ b/src/gpu/gl/GrGLCreateNullInterface.cpp @@ -676,7 +676,7 @@ public: SkFAIL("Unexpected pname to GetBufferParamateriv"); break; } - }; + } // NV_path_rendering GrGLuint genPaths(GrGLsizei range) override { diff --git a/src/ports/SkFontMgr_android_parser.cpp b/src/ports/SkFontMgr_android_parser.cpp index f4f74074ac..306c6ffdb7 100644 --- a/src/ports/SkFontMgr_android_parser.cpp +++ b/src/ports/SkFontMgr_android_parser.cpp @@ -98,7 +98,7 @@ struct FamilyData { , fDepth(1) , fSkip(0) , fHandler(&topLevelHandler, 1) - { }; + { } XML_Parser fParser; // The expat parser doing the work, owned by caller SkTDArray<FontFamily*>& fFamilies; // The array to append families, owned by caller diff --git a/src/ports/SkFontMgr_fontconfig.cpp b/src/ports/SkFontMgr_fontconfig.cpp index 1e17cb6774..1f00558709 100644 --- a/src/ports/SkFontMgr_fontconfig.cpp +++ b/src/ports/SkFontMgr_fontconfig.cpp @@ -409,7 +409,7 @@ public: SkTypeface_stream(std::unique_ptr<SkFontData> data, const SkFontStyle& style, bool fixedWidth) : INHERITED(style, fixedWidth) , fData(std::move(data)) - { }; + { } void onGetFamilyName(SkString* familyName) const override { familyName->reset(); @@ -512,7 +512,7 @@ private: : INHERITED(skfontstyle_from_fcpattern(pattern), FC_PROPORTIONAL != get_int(pattern, FC_SPACING, FC_PROPORTIONAL)) , fPattern(pattern) - { }; + { } typedef SkTypeface_FreeType INHERITED; }; |