commit d007281c9a529b58df84d21c38e808ba01fa2cc3
author Brian Salomon <bsalomon@google.com> Tue Jul 21 17:03:56 2020 -0400
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Wed Jul 22 01:11:36 2020 +0000
tree a0ea620985bd5be6bfd58ea646f420bf4ebab27c
parent 67fd3b8257092662fb0c8e7f82e1225d8a46d98e

Fix clang 12 Wsuggest-override and Wsuggest-destructor-override


Change-Id: Ic44e24057b95bb014504f02a736fb4341afc8971
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/304856
Commit-Queue: Mike Klein <mtklein@google.com>
Reviewed-by: Mike Klein <mtklein@google.com>

gm/complexclip4.cpp

diff --git a/gm/complexclip4.cpp b/gm/complexclip4.cpp
index ce34bfa..2709e2e 100644
--- a/gm/complexclip4.cpp
+++ b/gm/complexclip4.cpp
@@ -29,16 +29,14 @@
     }
 
 protected:
-
-
-    SkString onShortName() {
+    SkString onShortName() override {
         SkString str;
         str.printf("complexclip4_%s",
                    fDoAAClip ? "aa" : "bw");
         return str;
     }
 
-    SkISize onISize() { return SkISize::Make(970, 780); }
+    SkISize onISize() override { return SkISize::Make(970, 780); }
 
     // Android Framework will still support the legacy kReplace SkClipOp on older devices, so
     // this represents how to do so while also respecting the device restriction using the newer
@@ -71,7 +69,7 @@
         canvas->clipPath(path, SkClipOp::kIntersect, aa);
     }
 
-    virtual void onDraw(SkCanvas* canvas) {
+    void onDraw(SkCanvas* canvas) override {
         SkPaint p;
         p.setAntiAlias(fDoAAClip);
         p.setColor(SK_ColorYELLOW);