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>

5 files changed, 7 insertions, 7 deletions

diff --git a/bench/BlurRectBench.cpp b/bench/BlurRectBench.cpp
index 774bafaf27..163130201e 100644
--- a/bench/BlurRectBench.cpp
+++ b/bench/BlurRectBench.cpp
@@ -105,7 +105,7 @@ class BlurRectSeparableBench: public BlurRectBench {
 public:
     BlurRectSeparableBench(SkScalar rad) : INHERITED(rad) { }
 
-    ~BlurRectSeparableBench() {
+    ~BlurRectSeparableBench() override {
         SkMask::FreeImage(fSrcMask.fImage);
     }
 
diff --git a/bench/GMBench.h b/bench/GMBench.h
index 5e8b04ab46..c9ec80c643 100644
--- a/bench/GMBench.h
+++ b/bench/GMBench.h
@@ -18,7 +18,7 @@ class GMBench : public Benchmark {
 public:
     // Constructor takes ownership of the GM param.
     GMBench(skiagm::GM* gm);
-    virtual ~GMBench();
+    ~GMBench() override;
 
 protected:
     const char* onGetName() override;
diff --git a/bench/PDFBench.cpp b/bench/PDFBench.cpp
index 3716ff3be0..c07bc222c9 100644
--- a/bench/PDFBench.cpp
+++ b/bench/PDFBench.cpp
@@ -61,7 +61,7 @@ static void test_pdf_object_serialization(const sk_sp<SkPDFObject> object) {
 class PDFImageBench : public Benchmark {
 public:
     PDFImageBench() {}
-    virtual ~PDFImageBench() {}
+    ~PDFImageBench() override {}
 
 protected:
     const char* onGetName() override { return "PDFImage"; }
@@ -100,7 +100,7 @@ private:
 class PDFJpegImageBench : public Benchmark {
 public:
     PDFJpegImageBench() {}
-    virtual ~PDFJpegImageBench() {}
+    ~PDFJpegImageBench() override {}
 
 protected:
     const char* onGetName() override { return "PDFJpegImage"; }
@@ -139,7 +139,7 @@ private:
 class PDFCompressionBench : public Benchmark {
 public:
     PDFCompressionBench() {}
-    virtual ~PDFCompressionBench() {}
+    ~PDFCompressionBench() override {}
 
 protected:
     const char* onGetName() override { return "PDFCompression"; }
diff --git a/bench/ResultsWriter.h b/bench/ResultsWriter.h
index 1d6dc3eef1..85c44136fe 100644
--- a/bench/ResultsWriter.h
+++ b/bench/ResultsWriter.h
@@ -85,7 +85,7 @@ public:
         , fBench(nullptr)
         , fConfig(nullptr) {}
 
-    ~NanoJSONResultsWriter() {
+    ~NanoJSONResultsWriter() override {
         this->flush();
     }
 
diff --git a/bench/TextBench.cpp b/bench/TextBench.cpp
index a048ffd4a1..f4a7cddbae 100644
--- a/bench/TextBench.cpp
+++ b/bench/TextBench.cpp
@@ -63,7 +63,7 @@ public:
         fPaint.setColor(color);
     }
 
-    virtual ~TextBench() {
+    ~TextBench() override {
         delete[] fPos;
     }