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>

6 files changed, 10 insertions, 10 deletions

diff --git a/tests/CachedDecodingPixelRefTest.cpp b/tests/CachedDecodingPixelRefTest.cpp
index d9a9e9e1c5..c42344178e 100644
--- a/tests/CachedDecodingPixelRefTest.cpp
+++ b/tests/CachedDecodingPixelRefTest.cpp
@@ -37,7 +37,7 @@ public:
     : INHERITED(GetMyInfo(colorType)), fType(type), fReporter(reporter) {
         SkASSERT((fType <= kLast_TestType) && (fType >= 0));
     }
-    virtual ~TestImageGenerator() { }
+    ~TestImageGenerator() override {}
 
 protected:
     static SkImageInfo GetMyInfo(SkColorType colorType) {
diff --git a/tests/LayerRasterizerTest.cpp b/tests/LayerRasterizerTest.cpp
index dcbfdd1520..310aa3b2fe 100644
--- a/tests/LayerRasterizerTest.cpp
+++ b/tests/LayerRasterizerTest.cpp
@@ -26,7 +26,7 @@ public:
         gCount++;
     }
 
-    ~DummyRasterizer() {
+    ~DummyRasterizer() override {
         // Not threadsafe. Only used in one thread.
         gCount--;
     }
diff --git a/tests/PathTest.cpp b/tests/PathTest.cpp
index 0949a5d8a8..d41ed47f77 100644
--- a/tests/PathTest.cpp
+++ b/tests/PathTest.cpp
@@ -4315,7 +4315,7 @@ namespace {
 class ChangeListener : public SkPathRef::GenIDChangeListener {
 public:
     ChangeListener(bool *changed) : fChanged(changed) { *fChanged = false; }
-    virtual ~ChangeListener() {}
+    ~ChangeListener() override {}
     void onChange() override {
         *fChanged = true;
     }
diff --git a/tests/PictureBBHTest.cpp b/tests/PictureBBHTest.cpp
index b8698bcdbd..69cb443879 100644
--- a/tests/PictureBBHTest.cpp
+++ b/tests/PictureBBHTest.cpp
@@ -59,10 +59,10 @@ private:
 class DrawEmptyPictureBBHTest : public PictureBBHTestBase {
 public:
     DrawEmptyPictureBBHTest()
-        : PictureBBHTestBase(2, 2, 1, 1) { }
-    virtual ~DrawEmptyPictureBBHTest() { }
+        : PictureBBHTestBase(2, 2, 1, 1) {}
+    ~DrawEmptyPictureBBHTest() override {}
 
-    void doTest(SkCanvas&, SkCanvas&) override { }
+    void doTest(SkCanvas&, SkCanvas&) override {}
 };
 
 // Test to verify the playback of a picture into a canvas that has
@@ -71,7 +71,7 @@ public:
 class EmptyClipPictureBBHTest : public PictureBBHTestBase {
 public:
     EmptyClipPictureBBHTest()
-        : PictureBBHTestBase(2, 2, 3, 3) { }
+        : PictureBBHTestBase(2, 2, 3, 3) {}
 
     void doTest(SkCanvas& playbackCanvas, SkCanvas& recordingCanvas) override {
         // intersect with out of bounds rect -> empty clip.
@@ -80,7 +80,7 @@ public:
         recordingCanvas.drawRect(SkRect::MakeWH(3, 3), paint);
     }
 
-    virtual ~EmptyClipPictureBBHTest() { }
+    ~EmptyClipPictureBBHTest() override {}
 };
 
 DEF_TEST(PictureBBH, reporter) {
diff --git a/tests/QuickRejectTest.cpp b/tests/QuickRejectTest.cpp
index 6f472dcd86..cf886d3d34 100644
--- a/tests/QuickRejectTest.cpp
+++ b/tests/QuickRejectTest.cpp
@@ -34,7 +34,7 @@ private:
     class TestDrawLooperContext : public SkDrawLooper::Context {
     public:
         TestDrawLooperContext() : fOnce(true) {}
-        virtual ~TestDrawLooperContext() {}
+        ~TestDrawLooperContext() override {}
 
         bool next(SkCanvas* canvas, SkPaint*) override {
             if (fOnce) {
diff --git a/tests/ResourceCacheTest.cpp b/tests/ResourceCacheTest.cpp
index 8051191d4b..9573161b9e 100644
--- a/tests/ResourceCacheTest.cpp
+++ b/tests/ResourceCacheTest.cpp
@@ -295,7 +295,7 @@ public:
         return new TestResource(gpu, size);
     }
 
-    ~TestResource() {
+    ~TestResource() override {
         --fNumAlive;
         SkSafeUnref(fToDelete);
     }