aboutsummaryrefslogtreecommitdiffhomepage
path: root/include/effects
diff options
context:
space:
mode:
authorGravatar Brian Salomon <bsalomon@google.com>2017-03-22 12:05:03 -0400
committerGravatar Skia Commit-Bot <skia-commit-bot@chromium.org>2017-03-22 16:06:18 +0000
commitd3b65972aad96453ff4510caa3e25a2b847c6d1e (patch)
treeb79341c2266afe3b529aa1f4cd80c97b9a9e71ae /include/effects
parent30a38ff737c61799b0f36d2e6ba412f7e612f617 (diff)
Mark overridden destructors with 'override' and remove 'virtual'
This silences a new warning in clang 5.0 Change-Id: Ieb5b75a6ffed60107c3fd16075d2ecfd515b55e8 Reviewed-on: https://skia-review.googlesource.com/10006 Commit-Queue: Brian Salomon <bsalomon@google.com> Reviewed-by: Mike Klein <mtklein@chromium.org>
Diffstat (limited to 'include/effects')
-rw-r--r--include/effects/SkCornerPathEffect.h2
-rw-r--r--include/effects/SkDashPathEffect.h2
-rw-r--r--include/effects/SkLayerDrawLooper.h2
-rw-r--r--include/effects/SkLayerRasterizer.h2
-rw-r--r--include/effects/SkPerlinNoiseShader.h4
-rw-r--r--include/effects/SkTableMaskFilter.h2
6 files changed, 7 insertions, 7 deletions
diff --git a/include/effects/SkCornerPathEffect.h b/include/effects/SkCornerPathEffect.h
index 593f4bea2b..c252943fbe 100644
--- a/include/effects/SkCornerPathEffect.h
+++ b/include/effects/SkCornerPathEffect.h
@@ -35,7 +35,7 @@ public:
#endif
protected:
- virtual ~SkCornerPathEffect();
+ ~SkCornerPathEffect() override;
explicit SkCornerPathEffect(SkScalar radius);
void flatten(SkWriteBuffer&) const override;
diff --git a/include/effects/SkDashPathEffect.h b/include/effects/SkDashPathEffect.h
index 045bb25d05..13cbb4def0 100644
--- a/include/effects/SkDashPathEffect.h
+++ b/include/effects/SkDashPathEffect.h
@@ -55,7 +55,7 @@ public:
#endif
protected:
- virtual ~SkDashPathEffect();
+ ~SkDashPathEffect() override;
SkDashPathEffect(const SkScalar intervals[], int count, SkScalar phase);
void flatten(SkWriteBuffer&) const override;
diff --git a/include/effects/SkLayerDrawLooper.h b/include/effects/SkLayerDrawLooper.h
index c0a95345d4..3a3514091f 100644
--- a/include/effects/SkLayerDrawLooper.h
+++ b/include/effects/SkLayerDrawLooper.h
@@ -15,7 +15,7 @@
class SK_API SkLayerDrawLooper : public SkDrawLooper {
public:
- virtual ~SkLayerDrawLooper();
+ ~SkLayerDrawLooper() override;
/**
* Bits specifies which aspects of the layer's paint should replace the
diff --git a/include/effects/SkLayerRasterizer.h b/include/effects/SkLayerRasterizer.h
index a1b7e2dc0c..7fcfd6b2f0 100644
--- a/include/effects/SkLayerRasterizer.h
+++ b/include/effects/SkLayerRasterizer.h
@@ -16,7 +16,7 @@ class SkPaint;
class SK_API SkLayerRasterizer : public SkRasterizer {
public:
- virtual ~SkLayerRasterizer();
+ ~SkLayerRasterizer() override;
class SK_API Builder {
public:
diff --git a/include/effects/SkPerlinNoiseShader.h b/include/effects/SkPerlinNoiseShader.h
index 4e648f31b1..a86c89ba39 100644
--- a/include/effects/SkPerlinNoiseShader.h
+++ b/include/effects/SkPerlinNoiseShader.h
@@ -65,7 +65,7 @@ public:
class PerlinNoiseShaderContext : public SkShader::Context {
public:
PerlinNoiseShaderContext(const SkPerlinNoiseShader& shader, const ContextRec&);
- virtual ~PerlinNoiseShaderContext();
+ ~PerlinNoiseShaderContext() override;
void shadeSpan(int x, int y, SkPMColor[], int count) override;
@@ -98,7 +98,7 @@ private:
SkPerlinNoiseShader(SkPerlinNoiseShader::Type type, SkScalar baseFrequencyX,
SkScalar baseFrequencyY, int numOctaves, SkScalar seed,
const SkISize* tileSize);
- virtual ~SkPerlinNoiseShader();
+ ~SkPerlinNoiseShader() override;
const SkPerlinNoiseShader::Type fType;
const SkScalar fBaseFrequencyX;
diff --git a/include/effects/SkTableMaskFilter.h b/include/effects/SkTableMaskFilter.h
index 757ddf2084..f226dd1760 100644
--- a/include/effects/SkTableMaskFilter.h
+++ b/include/effects/SkTableMaskFilter.h
@@ -50,7 +50,7 @@ public:
SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(SkTableMaskFilter)
protected:
- virtual ~SkTableMaskFilter();
+ ~SkTableMaskFilter() override;
void flatten(SkWriteBuffer&) const override;