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/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);