diff options
author | 2017-03-22 12:05:03 -0400 | |
---|---|---|
committer | 2017-03-22 16:06:18 +0000 | |
commit | d3b65972aad96453ff4510caa3e25a2b847c6d1e (patch) | |
tree | b79341c2266afe3b529aa1f4cd80c97b9a9e71ae /experimental | |
parent | 30a38ff737c61799b0f36d2e6ba412f7e612f617 (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 'experimental')
-rw-r--r-- | experimental/SkPerlinNoiseShader2/SkPerlinNoiseShader2.cpp | 4 | ||||
-rw-r--r-- | experimental/SkPerlinNoiseShader2/SkPerlinNoiseShader2.h | 4 | ||||
-rw-r--r-- | experimental/svg/model/SkSVGCircle.h | 2 | ||||
-rw-r--r-- | experimental/svg/model/SkSVGContainer.h | 2 | ||||
-rw-r--r-- | experimental/svg/model/SkSVGEllipse.h | 2 | ||||
-rw-r--r-- | experimental/svg/model/SkSVGLine.h | 2 | ||||
-rw-r--r-- | experimental/svg/model/SkSVGLinearGradient.h | 2 | ||||
-rw-r--r-- | experimental/svg/model/SkSVGPath.h | 2 | ||||
-rw-r--r-- | experimental/svg/model/SkSVGPoly.h | 2 | ||||
-rw-r--r-- | experimental/svg/model/SkSVGRect.h | 2 | ||||
-rw-r--r-- | experimental/svg/model/SkSVGSVG.h | 2 | ||||
-rw-r--r-- | experimental/svg/model/SkSVGShape.h | 2 | ||||
-rw-r--r-- | experimental/svg/model/SkSVGStop.h | 2 | ||||
-rw-r--r-- | experimental/svg/model/SkSVGTransformableNode.h | 2 |
14 files changed, 16 insertions, 16 deletions
diff --git a/experimental/SkPerlinNoiseShader2/SkPerlinNoiseShader2.cpp b/experimental/SkPerlinNoiseShader2/SkPerlinNoiseShader2.cpp index 246d34e9b6..da4c42f760 100644 --- a/experimental/SkPerlinNoiseShader2/SkPerlinNoiseShader2.cpp +++ b/experimental/SkPerlinNoiseShader2/SkPerlinNoiseShader2.cpp @@ -633,7 +633,7 @@ public: std::move(permutationsProxy), std::move(noiseProxy), matrix)); } - virtual ~GrPerlinNoise2Effect() { delete fPaintingData; } + ~GrPerlinNoise2Effect() override { delete fPaintingData; } const char* name() const override { return "PerlinNoise"; } @@ -1053,7 +1053,7 @@ public: std::move(gradientProxy), matrix)); } - virtual ~GrImprovedPerlinNoiseEffect() { delete fPaintingData; } + ~GrImprovedPerlinNoiseEffect() override { delete fPaintingData; } const char* name() const override { return "ImprovedPerlinNoise"; } diff --git a/experimental/SkPerlinNoiseShader2/SkPerlinNoiseShader2.h b/experimental/SkPerlinNoiseShader2/SkPerlinNoiseShader2.h index 1f4839c8b4..0f40ae4af3 100644 --- a/experimental/SkPerlinNoiseShader2/SkPerlinNoiseShader2.h +++ b/experimental/SkPerlinNoiseShader2/SkPerlinNoiseShader2.h @@ -86,7 +86,7 @@ public: class PerlinNoiseShaderContext : public SkShader::Context { public: PerlinNoiseShaderContext(const SkPerlinNoiseShader2& shader, const ContextRec&); - virtual ~PerlinNoiseShaderContext(); + ~PerlinNoiseShaderContext() override; void shadeSpan(int x, int y, SkPMColor[], int count) override; @@ -120,7 +120,7 @@ private: SkPerlinNoiseShader2(SkPerlinNoiseShader2::Type type, SkScalar baseFrequencyX, SkScalar baseFrequencyY, int numOctaves, SkScalar seed, const SkISize* tileSize); - virtual ~SkPerlinNoiseShader2(); + ~SkPerlinNoiseShader2() override; const SkPerlinNoiseShader2::Type fType; const SkScalar fBaseFrequencyX; diff --git a/experimental/svg/model/SkSVGCircle.h b/experimental/svg/model/SkSVGCircle.h index 16ee54d280..19db926f21 100644 --- a/experimental/svg/model/SkSVGCircle.h +++ b/experimental/svg/model/SkSVGCircle.h @@ -15,7 +15,7 @@ struct SkPoint; class SkSVGCircle final : public SkSVGShape { public: - virtual ~SkSVGCircle() = default; + ~SkSVGCircle() override = default; static sk_sp<SkSVGCircle> Make() { return sk_sp<SkSVGCircle>(new SkSVGCircle()); } void setCx(const SkSVGLength&); diff --git a/experimental/svg/model/SkSVGContainer.h b/experimental/svg/model/SkSVGContainer.h index 6a0b00244c..3a6841f3ad 100644 --- a/experimental/svg/model/SkSVGContainer.h +++ b/experimental/svg/model/SkSVGContainer.h @@ -13,7 +13,7 @@ class SkSVGContainer : public SkSVGTransformableNode { public: - virtual ~SkSVGContainer() = default; + ~SkSVGContainer() override = default; void appendChild(sk_sp<SkSVGNode>) override; diff --git a/experimental/svg/model/SkSVGEllipse.h b/experimental/svg/model/SkSVGEllipse.h index f17c1e1137..68cebd75db 100644 --- a/experimental/svg/model/SkSVGEllipse.h +++ b/experimental/svg/model/SkSVGEllipse.h @@ -15,7 +15,7 @@ struct SkRect; class SkSVGEllipse final : public SkSVGShape { public: - virtual ~SkSVGEllipse() = default; + ~SkSVGEllipse() override = default; static sk_sp<SkSVGEllipse> Make() { return sk_sp<SkSVGEllipse>(new SkSVGEllipse()); } void setCx(const SkSVGLength&); diff --git a/experimental/svg/model/SkSVGLine.h b/experimental/svg/model/SkSVGLine.h index 0f15ca5ac7..ec6213cf77 100644 --- a/experimental/svg/model/SkSVGLine.h +++ b/experimental/svg/model/SkSVGLine.h @@ -15,7 +15,7 @@ struct SkPoint; class SkSVGLine final : public SkSVGShape { public: - virtual ~SkSVGLine() = default; + ~SkSVGLine() override = default; static sk_sp<SkSVGLine> Make() { return sk_sp<SkSVGLine>(new SkSVGLine()); } void setX1(const SkSVGLength&); diff --git a/experimental/svg/model/SkSVGLinearGradient.h b/experimental/svg/model/SkSVGLinearGradient.h index 2e4e3f5dee..4e5905c02d 100644 --- a/experimental/svg/model/SkSVGLinearGradient.h +++ b/experimental/svg/model/SkSVGLinearGradient.h @@ -13,7 +13,7 @@ class SkSVGLinearGradient : public SkSVGHiddenContainer { public: - virtual ~SkSVGLinearGradient() = default; + ~SkSVGLinearGradient() override = default; static sk_sp<SkSVGLinearGradient> Make() { return sk_sp<SkSVGLinearGradient>(new SkSVGLinearGradient()); } diff --git a/experimental/svg/model/SkSVGPath.h b/experimental/svg/model/SkSVGPath.h index 8b1f2e98f8..176b83873e 100644 --- a/experimental/svg/model/SkSVGPath.h +++ b/experimental/svg/model/SkSVGPath.h @@ -13,7 +13,7 @@ class SkSVGPath final : public SkSVGShape { public: - virtual ~SkSVGPath() = default; + ~SkSVGPath() override = default; static sk_sp<SkSVGPath> Make() { return sk_sp<SkSVGPath>(new SkSVGPath()); } void setPath(const SkPath& path) { fPath = path; } diff --git a/experimental/svg/model/SkSVGPoly.h b/experimental/svg/model/SkSVGPoly.h index 90fb354d35..3259bc0612 100644 --- a/experimental/svg/model/SkSVGPoly.h +++ b/experimental/svg/model/SkSVGPoly.h @@ -14,7 +14,7 @@ // Handles <polygon> and <polyline> elements. class SkSVGPoly final : public SkSVGShape { public: - virtual ~SkSVGPoly() = default; + ~SkSVGPoly() override = default; static sk_sp<SkSVGPoly> MakePolygon() { return sk_sp<SkSVGPoly>(new SkSVGPoly(SkSVGTag::kPolygon)); diff --git a/experimental/svg/model/SkSVGRect.h b/experimental/svg/model/SkSVGRect.h index a0c07a1957..e61f276418 100644 --- a/experimental/svg/model/SkSVGRect.h +++ b/experimental/svg/model/SkSVGRect.h @@ -15,7 +15,7 @@ class SkRRect; class SkSVGRect final : public SkSVGShape { public: - virtual ~SkSVGRect() = default; + ~SkSVGRect() override = default; static sk_sp<SkSVGRect> Make() { return sk_sp<SkSVGRect>(new SkSVGRect()); } void setX(const SkSVGLength&); diff --git a/experimental/svg/model/SkSVGSVG.h b/experimental/svg/model/SkSVGSVG.h index 675c83351f..0dfeb766fd 100644 --- a/experimental/svg/model/SkSVGSVG.h +++ b/experimental/svg/model/SkSVGSVG.h @@ -16,7 +16,7 @@ class SkSVGLengthContext; class SkSVGSVG : public SkSVGContainer { public: - virtual ~SkSVGSVG() = default; + ~SkSVGSVG() override = default; static sk_sp<SkSVGSVG> Make() { return sk_sp<SkSVGSVG>(new SkSVGSVG()); } diff --git a/experimental/svg/model/SkSVGShape.h b/experimental/svg/model/SkSVGShape.h index 48b2ead0c1..f40609e8f8 100644 --- a/experimental/svg/model/SkSVGShape.h +++ b/experimental/svg/model/SkSVGShape.h @@ -16,7 +16,7 @@ class SkPaint; class SkSVGShape : public SkSVGTransformableNode { public: - virtual ~SkSVGShape() = default; + ~SkSVGShape() override = default; void appendChild(sk_sp<SkSVGNode>) override; diff --git a/experimental/svg/model/SkSVGStop.h b/experimental/svg/model/SkSVGStop.h index 2ffbc5c852..5eb044271d 100644 --- a/experimental/svg/model/SkSVGStop.h +++ b/experimental/svg/model/SkSVGStop.h @@ -15,7 +15,7 @@ class SkSVGLengthContext; class SkSVGStop : public SkSVGHiddenContainer { public: - virtual ~SkSVGStop() = default; + ~SkSVGStop() override = default; static sk_sp<SkSVGStop> Make() { return sk_sp<SkSVGStop>(new SkSVGStop()); } diff --git a/experimental/svg/model/SkSVGTransformableNode.h b/experimental/svg/model/SkSVGTransformableNode.h index ad217a92f9..f9cd668003 100644 --- a/experimental/svg/model/SkSVGTransformableNode.h +++ b/experimental/svg/model/SkSVGTransformableNode.h @@ -13,7 +13,7 @@ class SkSVGTransformableNode : public SkSVGNode { public: - virtual ~SkSVGTransformableNode() = default; + ~SkSVGTransformableNode() override = default; void setTransform(const SkSVGTransformType& t) { fTransform = t; } |