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>

16 files changed, 19 insertions, 19 deletions

diff --git a/include/core/SkImageFilter.h b/include/core/SkImageFilter.h
index 86e12e1f4f..ea2afa2f2e 100644
--- a/include/core/SkImageFilter.h
+++ b/include/core/SkImageFilter.h
@@ -270,7 +270,7 @@ protected:
 
     SkImageFilter(sk_sp<SkImageFilter>* inputs, int inputCount, const CropRect* cropRect);
 
-    virtual ~SkImageFilter();
+    ~SkImageFilter() override;
 
     /**
      *  Constructs a new SkImageFilter read from an SkReadBuffer object.
diff --git a/include/core/SkMallocPixelRef.h b/include/core/SkMallocPixelRef.h
index ab337b9241..bb07fa2dab 100644
--- a/include/core/SkMallocPixelRef.h
+++ b/include/core/SkMallocPixelRef.h
@@ -99,7 +99,7 @@ protected:
     // The ownPixels version of this constructor is deprecated.
     SkMallocPixelRef(const SkImageInfo&, void* addr, size_t rb, SkColorTable*,
                      bool ownPixels);
-    virtual ~SkMallocPixelRef();
+    ~SkMallocPixelRef() override;
 
     bool onNewLockPixels(LockRec*) override;
     void onUnlockPixels() override;
diff --git a/include/core/SkShader.h b/include/core/SkShader.h
index 4c264e4741..e49ad5f6a6 100644
--- a/include/core/SkShader.h
+++ b/include/core/SkShader.h
@@ -40,7 +40,7 @@ class GrFragmentProcessor;
 class SK_API SkShader : public SkFlattenable {
 public:
     SkShader(const SkMatrix* localMatrix = NULL);
-    virtual ~SkShader();
+    ~SkShader() override;
 
     /**
      *  Returns the local matrix.
diff --git a/include/core/SkStream.h b/include/core/SkStream.h
index e10aece360..428f247fc5 100644
--- a/include/core/SkStream.h
+++ b/include/core/SkStream.h
@@ -261,7 +261,7 @@ public:
      */
     explicit SkFILEStream(FILE* file);
 
-    virtual ~SkFILEStream();
+    ~SkFILEStream() override;
 
     /** Returns true if the current path could be opened. */
     bool isValid() const { return fFILE != nullptr; }
@@ -357,7 +357,7 @@ private:
 class SK_API SkFILEWStream : public SkWStream {
 public:
     SkFILEWStream(const char path[]);
-    virtual ~SkFILEWStream();
+    ~SkFILEWStream() override;
 
     /** Returns true if the current path could be opened.
     */
@@ -377,7 +377,7 @@ private:
 class SK_API SkDynamicMemoryWStream : public SkWStream {
 public:
     SkDynamicMemoryWStream();
-    virtual ~SkDynamicMemoryWStream();
+    ~SkDynamicMemoryWStream() override;
 
     bool write(const void* buffer, size_t size) override;
     size_t bytesWritten() const override;
diff --git a/include/core/SkWriteBuffer.h b/include/core/SkWriteBuffer.h
index a104ffcb1f..12d5d3b022 100644
--- a/include/core/SkWriteBuffer.h
+++ b/include/core/SkWriteBuffer.h
@@ -81,7 +81,7 @@ public:
 
     SkBinaryWriteBuffer(uint32_t flags = 0);
     SkBinaryWriteBuffer(void* initialStorage, size_t storageSize, uint32_t flags = 0);
-    ~SkBinaryWriteBuffer();
+    ~SkBinaryWriteBuffer() override;
 
     bool isCrossProcess() const override {
         return SkToBool(fFlags & kCrossProcess_Flag);
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;
 
diff --git a/include/private/SkWeakRefCnt.h b/include/private/SkWeakRefCnt.h
index d6631e946f..c65ea9e7f1 100644
--- a/include/private/SkWeakRefCnt.h
+++ b/include/private/SkWeakRefCnt.h
@@ -60,7 +60,7 @@ public:
 
     /** Destruct, asserting that the weak reference count is 1.
     */
-    virtual ~SkWeakRefCnt() {
+    ~SkWeakRefCnt() override {
 #ifdef SK_DEBUG
         SkASSERT(getWeakCnt() == 1);
         fWeakCnt.store(0, std::memory_order_relaxed);
diff --git a/include/utils/SkDumpCanvas.h b/include/utils/SkDumpCanvas.h
index b8fff72258..727c5797d7 100644
--- a/include/utils/SkDumpCanvas.h
+++ b/include/utils/SkDumpCanvas.h
@@ -22,7 +22,7 @@ public:
     class Dumper;
 
     explicit SkDumpCanvas(Dumper* = 0);
-    virtual ~SkDumpCanvas();
+    ~SkDumpCanvas() override;
 
     enum Verb {
         kNULL_Verb,
diff --git a/include/utils/SkLuaCanvas.h b/include/utils/SkLuaCanvas.h
index 49ff377af3..7653b45366 100644
--- a/include/utils/SkLuaCanvas.h
+++ b/include/utils/SkLuaCanvas.h
@@ -19,7 +19,7 @@ public:
     void pushThis();
 
     SkLuaCanvas(int width, int height, lua_State*, const char function[]);
-    virtual ~SkLuaCanvas();
+    ~SkLuaCanvas() override;
 
 protected:
     void willSave() override;
diff --git a/include/utils/SkNWayCanvas.h b/include/utils/SkNWayCanvas.h
index 3407853fd6..ba0745e420 100644
--- a/include/utils/SkNWayCanvas.h
+++ b/include/utils/SkNWayCanvas.h
@@ -15,7 +15,7 @@
 class SK_API SkNWayCanvas : public SkNoDrawCanvas {
 public:
     SkNWayCanvas(int width, int height);
-    virtual ~SkNWayCanvas();
+    ~SkNWayCanvas() override;
 
     virtual void addCanvas(SkCanvas*);
     virtual void removeCanvas(SkCanvas*);
diff --git a/include/views/SkOSWindow_Unix.h b/include/views/SkOSWindow_Unix.h
index 9d1b8e0392..48838e764c 100644
--- a/include/views/SkOSWindow_Unix.h
+++ b/include/views/SkOSWindow_Unix.h
@@ -26,7 +26,7 @@ struct SkUnixWindow {
 class SkOSWindow : public SkWindow {
 public:
     SkOSWindow(void*);
-    ~SkOSWindow();
+    ~SkOSWindow() override;
 
     void* getHWND() const { return (void*)fUnixWindow.fWin; }
     void* getDisplay() const { return (void*)fUnixWindow.fDisplay; }