Enable ClangTidy flag modernize-use-override.

johnstiles-google · Skia Commit-Bot · commit 1cf2c8d6ec21 · 2020-08-14T10:54:45.000Z
https://clang.llvm.org/extra/clang-tidy/checks/modernize-use-override.html Adds override (introduced in C++11) to overridden virtual functions and removes virtual from those functions as it is not required. virtual on non base class implementations was used to help indicate to the user that a function was virtual. C++ compilers did not use the presence of this to signify an overridden function. Change-Id: If66d8919358f72a4035190caf8d7569268037a9a Reviewed-on: https://skia-review.googlesource.com/c/skia/+/310160 Commit-Queue: Mike Klein <mtklein@google.com> Auto-Submit: John Stiles <johnstiles@google.com> Reviewed-by: Mike Klein <mtklein@google.com>
diff --git a/.clang-tidy b/.clang-tidy
@@ -1,4 +1,20 @@
-Checks: '-*,bugprone-use-after-move,bugprone-unused-raii,bugprone-undelegated-constructor,bugprone-argument-comment,bugprone-bool-pointer-implicit-conversion,performance-unnecessary-copy-initialization,performance-for-range-copy,readability-redundant-preprocessor,misc-definitions-in-headers,modernize-make-unique,llvm-namespace-comment,readability-static-accessed-through-instance,readability-const-return-type,google-build-namespaces'
+Checks: >
+    -*,
+    bugprone-argument-comment,
+    bugprone-bool-pointer-implicit-conversion,
+    bugprone-undelegated-constructor,
+    bugprone-unused-raii,
+    bugprone-use-after-move,
+    google-build-namespaces,
+    llvm-namespace-comment,
+    misc-definitions-in-headers,
+    modernize-make-unique,
+    modernize-use-override,
+    performance-for-range-copy,
+    performance-unnecessary-copy-initialization,
+    readability-const-return-type,
+    readability-redundant-preprocessor,
+    readability-static-accessed-through-instance
 CheckOptions:
   - key:             llvm-namespace-comment.SpacesBeforeComments
     value:           2
diff --git a/bench/DashBench.cpp b/bench/DashBench.cpp
@@ -104,8 +104,7 @@ class RectDashBench : public DashBench {
     }
 
 protected:
-    virtual void handlePath(SkCanvas* canvas, const SkPath& path,
-                            const SkPaint& paint, int N) override {
+    void handlePath(SkCanvas* canvas, const SkPath& path, const SkPaint& paint, int N) override {
         SkPoint pts[2];
         if (!path.isLine(pts) || pts[0].fY != pts[1].fY) {
             this->INHERITED::handlePath(canvas, path, paint, N);
diff --git a/bench/PathBench.cpp b/bench/PathBench.cpp
@@ -129,7 +129,7 @@ class RotatedRectBench : public PathBench {
         path->transform(rotateMatrix);
     }
 
-    virtual void setupPaint(SkPaint* paint) override {
+    void setupPaint(SkPaint* paint) override {
         PathBench::setupPaint(paint);
         paint->setAntiAlias(fAA);
     }
diff --git a/gm/croppedrects.cpp b/gm/croppedrects.cpp
@@ -35,7 +35,7 @@ constexpr SkRect kSrcImageClip{75, 75, 275, 275};
  */
 class CroppedRectsGM : public GM {
 private:
-    SkString onShortName() override final { return SkString("croppedrects"); }
+    SkString onShortName() final { return SkString("croppedrects"); }
     SkISize onISize() override { return SkISize::Make(500, 500); }
 
     void onOnceBeforeDraw() override {
diff --git a/gm/cubicpaths.cpp b/gm/cubicpaths.cpp
@@ -29,7 +29,7 @@ class ClippedCubicGM : public skiagm::GM {
 
     SkISize onISize() override { return {1240, 390}; }
 
-    virtual void onDraw(SkCanvas* canvas) override {
+    void onDraw(SkCanvas* canvas) override {
         SkPath path;
         path.moveTo(0, 0);
         path.cubicTo(140, 150, 40, 10, 170, 150);
@@ -259,7 +259,7 @@ class CubicClosePathGM : public skiagm::GM {
         canvas->restore();
     }
 
-    virtual void onDraw(SkCanvas* canvas) override {
+    void onDraw(SkCanvas* canvas) override {
         struct FillAndName {
             SkPathFillType fFill;
             const char*      fName;
diff --git a/gm/dftext.cpp b/gm/dftext.cpp
@@ -52,7 +52,7 @@ class DFTextGM : public skiagm::GM {
         return SkISize::Make(1024, 768);
     }
 
-    virtual void onDraw(SkCanvas* inputCanvas) override {
+    void onDraw(SkCanvas* inputCanvas) override {
         SkScalar textSizes[] = { 9.0f, 9.0f*2.0f, 9.0f*5.0f, 9.0f*2.0f*5.0f };
         SkScalar scales[] = { 2.0f*5.0f, 5.0f, 2.0f, 1.0f };
 
diff --git a/gm/hairmodes.cpp b/gm/hairmodes.cpp
@@ -88,7 +88,7 @@ namespace skiagm {
             return SkString("hairmodes");
         }
 
-        virtual SkISize onISize() override { return SkISize::Make(640, 480); }
+        SkISize onISize() override { return SkISize::Make(640, 480); }
 
         void onOnceBeforeDraw() override {
             fBGPaint.setShader(make_bg_shader());
diff --git a/gm/shapes.cpp b/gm/shapes.cpp
@@ -36,7 +36,7 @@ class ShapesGM : public GM {
         }
     }
 
-    SkString onShortName() override final { return fName; }
+    SkString onShortName() final { return fName; }
     SkISize onISize() override { return SkISize::Make(500, 500); }
 
     void onOnceBeforeDraw() override {
diff --git a/gm/tinybitmap.cpp b/gm/tinybitmap.cpp
@@ -21,7 +21,7 @@ class TinyBitmapGM : public skiagm::GM {
 
     SkString onShortName() override { return SkString("tinybitmap"); }
 
-    virtual SkISize onISize() override { return SkISize::Make(100, 100); }
+    SkISize onISize() override { return SkISize::Make(100, 100); }
 
     void onDraw(SkCanvas* canvas) override {
         SkBitmap bm;
diff --git a/include/utils/SkLuaCanvas.h b/include/utils/SkLuaCanvas.h
@@ -33,7 +33,7 @@ class SkLuaCanvas : public SkCanvas {
     void didTranslate(SkScalar, SkScalar) override;
 
     void onDrawDRRect(const SkRRect&, const SkRRect&, const SkPaint&) override;
-    virtual void onDrawTextBlob(const SkTextBlob* blob, SkScalar x, SkScalar y,
+    void onDrawTextBlob(const SkTextBlob* blob, SkScalar x, SkScalar y,
                                 const SkPaint& paint) override;
 
     void onDrawPaint(const SkPaint&) override;
diff --git a/include/utils/SkNWayCanvas.h b/include/utils/SkNWayCanvas.h
@@ -38,11 +38,10 @@ class SK_API SkNWayCanvas : public SkCanvasVirtualEnforcer<SkNoDrawCanvas> {
     void didTranslate(SkScalar, SkScalar) override;
 
     void onDrawDRRect(const SkRRect&, const SkRRect&, const SkPaint&) override;
-    virtual void onDrawTextBlob(const SkTextBlob* blob, SkScalar x, SkScalar y,
-                                const SkPaint& paint) override;
-    virtual void onDrawPatch(const SkPoint cubics[12], const SkColor colors[4],
-                             const SkPoint texCoords[4], SkBlendMode,
-                             const SkPaint& paint) override;
+    void onDrawTextBlob(const SkTextBlob* blob, SkScalar x, SkScalar y,
+                        const SkPaint& paint) override;
+    void onDrawPatch(const SkPoint cubics[12], const SkColor colors[4],
+                     const SkPoint texCoords[4], SkBlendMode, const SkPaint& paint) override;
 
     void onDrawPaint(const SkPaint&) override;
     void onDrawBehind(const SkPaint&) override;
diff --git a/modules/skottie/src/animator/KeyframeAnimator.h b/modules/skottie/src/animator/KeyframeAnimator.h
@@ -55,7 +55,7 @@ struct Keyframe {
 
 class KeyframeAnimator : public Animator {
 public:
-    virtual ~KeyframeAnimator() override;
+    ~KeyframeAnimator() override;
 
     bool isConstant() const {
         SkASSERT(!fKFs.empty());
diff --git a/modules/skottie/tests/AudioLayer.cpp b/modules/skottie/tests/AudioLayer.cpp
@@ -76,7 +76,7 @@ DEF_TEST(Skottie_AudioLayer, r) {
     private:
         sk_sp<ExternalTrackAsset> loadAudioAsset(const char path[],
                                                  const char name[],
-                                                 const char id[]) {
+                                                 const char id[]) override {
             REPORTER_ASSERT(fReporter, !strcmp(path, "assets/"));
             REPORTER_ASSERT(fReporter, !strcmp(name, "audio.mp3"));
             REPORTER_ASSERT(fReporter, !strcmp(id  , "audio_0"));
diff --git a/samplecode/SampleAAGeometry.cpp b/samplecode/SampleAAGeometry.cpp
@@ -1519,7 +1519,7 @@ class AAGeometryView : public Sample {
         return -1;
     }
 
-    virtual Sample::Click* onFindClickHandler(SkScalar x, SkScalar y, skui::ModifierKey modi) override {
+    Sample::Click* onFindClickHandler(SkScalar x, SkScalar y, skui::ModifierKey modi) override {
         SkPoint pt = {x, y};
         int ptHit = hittest_pt(pt);
         if (ptHit >= 0) {
diff --git a/samplecode/SampleLua.cpp b/samplecode/SampleLua.cpp
@@ -108,8 +108,7 @@ class LuaView : public Sample {
         }
     }
 
-    virtual Sample::Click* onFindClickHandler(SkScalar x, SkScalar y,
-                                              skui::ModifierKey modi) override {
+    Sample::Click* onFindClickHandler(SkScalar x, SkScalar y, skui::ModifierKey modi) override {
         lua_State* L = this->ensureLua();
         lua_getglobal(L, gClickName);
         if (lua_isfunction(L, -1)) {
diff --git a/samplecode/SampleMixer.cpp b/samplecode/SampleMixer.cpp
@@ -71,7 +71,7 @@ class MixerView : public Sample {
         }
     }
 
-    virtual Click* onFindClickHandler(SkScalar x, SkScalar y, skui::ModifierKey) override {
+    Click* onFindClickHandler(SkScalar x, SkScalar y, skui::ModifierKey) override {
         return fRect.contains(SkScalarRoundToInt(x),
                               SkScalarRoundToInt(y)) ? new Click() : nullptr;
     }
diff --git a/samplecode/SampleQuadStroker.cpp b/samplecode/SampleQuadStroker.cpp
@@ -714,8 +714,7 @@ class QuadStrokerView : public Sample {
         MyClick(int index) : fIndex(index) {}
     };
 
-    virtual Sample::Click* onFindClickHandler(SkScalar x, SkScalar y,
-                                              skui::ModifierKey modi) override {
+    Sample::Click* onFindClickHandler(SkScalar x, SkScalar y, skui::ModifierKey modi) override {
         for (size_t i = 0; i < SK_ARRAY_COUNT(fPts); ++i) {
             if (hittest(fPts[i], x, y)) {
                 return new MyClick((int)i);
diff --git a/samplecode/SampleRegion.cpp b/samplecode/SampleRegion.cpp
@@ -324,8 +324,7 @@ class RegionView : public Sample {
         }
     }
 
-    virtual Sample::Click* onFindClickHandler(SkScalar x, SkScalar y,
-                                              skui::ModifierKey modi) override {
+    Sample::Click* onFindClickHandler(SkScalar x, SkScalar y, skui::ModifierKey modi) override {
         return fRect.contains(SkScalarRoundToInt(x),
                               SkScalarRoundToInt(y)) ? new Click() : nullptr;
     }
diff --git a/samplecode/SampleTextEffects.cpp b/samplecode/SampleTextEffects.cpp
@@ -38,8 +38,7 @@ class Dot2DPathEffect : public Sk2DPathEffect {
         this->INHERITED::begin(uvBounds, dst);
     }
 
-    virtual void next(const SkPoint& loc, int u, int v,
-                      SkPath* dst) const override {
+    void next(const SkPoint& loc, int u, int v, SkPath* dst) const override {
         if (fPts) {
             *fPts->append() = loc;
         }
@@ -78,8 +77,7 @@ sk_sp<SkFlattenable> Dot2DPathEffect::CreateProc(SkReadBuffer& buffer) {
 class InverseFillPE : public SkPathEffect {
 public:
     InverseFillPE() {}
-    virtual bool onFilterPath(SkPath* dst, const SkPath& src,
-                              SkStrokeRec*, const SkRect*) const override {
+    bool onFilterPath(SkPath* dst, const SkPath& src, SkStrokeRec*, const SkRect*) const override {
         *dst = src;
         dst->setFillType(SkPathFillType::kInverseWinding);
         return true;
diff --git a/src/core/SkAAClip.cpp b/src/core/SkAAClip.cpp
@@ -1217,8 +1217,8 @@ class SkAAClip::BuilderBlitter : public SkBlitter {
         fLastY = y + height - 1;
     }
 
-    virtual void blitAntiRect(int x, int y, int width, int height,
-                     SkAlpha leftAlpha, SkAlpha rightAlpha) override {
+    void blitAntiRect(int x, int y, int width, int height,
+                      SkAlpha leftAlpha, SkAlpha rightAlpha) override {
         this->recordMinY(y);
         this->checkForYGap(y);
         fBuilder->addAntiRectRun(x, y, width, height, leftAlpha, rightAlpha);
@@ -1238,8 +1238,8 @@ class SkAAClip::BuilderBlitter : public SkBlitter {
         fBuilder->addRun(x, y, 0xFF, width);
     }
 
-    virtual void blitAntiH(int x, int y, const SkAlpha alpha[],
-                           const int16_t runs[]) override {
+    void blitAntiH(int x, int y, const SkAlpha alpha[],
+                   const int16_t runs[]) override {
         this->recordMinY(y);
         this->checkForYGap(y);
         for (;;) {
diff --git a/src/core/SkBlitter.h b/src/core/SkBlitter.h
@@ -189,8 +189,8 @@ class SkRectClipBlitter : public SkBlitter {
     void blitAntiH(int x, int y, const SkAlpha[], const int16_t runs[]) override;
     void blitV(int x, int y, int height, SkAlpha alpha) override;
     void blitRect(int x, int y, int width, int height) override;
-    virtual void blitAntiRect(int x, int y, int width, int height,
-                     SkAlpha leftAlpha, SkAlpha rightAlpha) override;
+    void blitAntiRect(int x, int y, int width, int height,
+                      SkAlpha leftAlpha, SkAlpha rightAlpha) override;
     void blitMask(const SkMask&, const SkIRect& clip) override;
     const SkPixmap* justAnOpaqueColor(uint32_t* value) override;
 
diff --git a/src/core/SkExecutor.cpp b/src/core/SkExecutor.cpp
@@ -89,7 +89,7 @@ class SkThreadPool final : public SkExecutor {
         }
     }
 
-    virtual void add(std::function<void(void)> work) override {
+    void add(std::function<void(void)> work) override {
         // Add some work to our pile of work to do.
         {
             SkAutoMutexExclusive lock(fWorkLock);
@@ -99,7 +99,7 @@ class SkThreadPool final : public SkExecutor {
         fWorkAvailable.signal(1);
     }
 
-    virtual void borrow() override {
+    void borrow() override {
         // If there is work waiting and we're allowed to borrow work, do it.
         if (fAllowBorrowing && fWorkAvailable.try_wait()) {
             SkAssertResult(this->do_work());
diff --git a/src/core/SkPtrRecorder.h b/src/core/SkPtrRecorder.h
@@ -131,8 +131,8 @@ class SkRefCntSet : public SkTPtrSet<SkRefCnt*> {
 
 protected:
     // overrides
-    virtual void incPtr(void*) override ;
-    virtual void decPtr(void*) override ;
+    void incPtr(void*) override;
+    void decPtr(void*) override;
 };
 
 class SkFactorySet : public SkTPtrSet<SkFlattenable::Factory> {};
diff --git a/src/core/SkScan_AntiPath.cpp b/src/core/SkScan_AntiPath.cpp
@@ -44,8 +44,7 @@ class BaseSuperBlitter : public SkBlitter {
                      const SkIRect& clipBounds, bool isInverse);
 
     /// Must be explicitly defined on subclasses.
-    virtual void blitAntiH(int x, int y, const SkAlpha antialias[],
-                           const int16_t runs[]) override {
+    void blitAntiH(int x, int y, const SkAlpha antialias[], const int16_t runs[]) override {
         SkDEBUGFAIL("How did I get here?");
     }
     /// May not be called on BaseSuperBlitter because it blits out of order.
diff --git a/src/core/SkScan_Antihair.cpp b/src/core/SkScan_Antihair.cpp
@@ -135,8 +135,7 @@ class HLine_SkAntiHairBlitter : public SkAntiHairBlitter {
         return fy - SK_Fixed1/2;
     }
 
-    virtual SkFixed drawLine(int x, int stopx, SkFixed fy,
-                             SkFixed slope) override {
+    SkFixed drawLine(int x, int stopx, SkFixed fy, SkFixed slope) override {
         SkASSERT(x < stopx);
         int count = stopx - x;
         fy += SK_Fixed1/2;
diff --git a/src/effects/imagefilters/SkDisplacementMapEffect.cpp b/src/effects/imagefilters/SkDisplacementMapEffect.cpp
@@ -43,8 +43,8 @@ class SkDisplacementMapEffectImpl final : public SkImageFilter_Base {
 
     SkRect computeFastBounds(const SkRect& src) const override;
 
-    virtual SkIRect onFilterBounds(const SkIRect& src, const SkMatrix& ctm,
-                                   MapDirection, const SkIRect* inputRect) const override;
+    SkIRect onFilterBounds(const SkIRect& src, const SkMatrix& ctm,
+                           MapDirection, const SkIRect* inputRect) const override;
     SkIRect onFilterNodeBounds(const SkIRect&, const SkMatrix& ctm,
                                MapDirection, const SkIRect* inputRect) const override;
 
diff --git a/src/gpu/GrPathProcessor.h b/src/gpu/GrPathProcessor.h
@@ -28,12 +28,11 @@ class GrPathProcessor : public GrPrimitiveProcessor {
     const SkMatrix& viewMatrix() const { return fViewMatrix; }
     const SkMatrix& localMatrix() const { return fLocalMatrix; }
 
-    virtual void getGLSLProcessorKey(const GrShaderCaps& caps,
-                                     GrProcessorKeyBuilder* b) const override;
+    void getGLSLProcessorKey(const GrShaderCaps& caps, GrProcessorKeyBuilder* b) const override;
 
-    virtual GrGLSLPrimitiveProcessor* createGLSLInstance(const GrShaderCaps& caps) const override;
+    GrGLSLPrimitiveProcessor* createGLSLInstance(const GrShaderCaps& caps) const override;
 
-    virtual bool isPathRendering() const override { return true; }
+    bool isPathRendering() const override { return true; }
 
 private:
     GrPathProcessor(const SkPMColor4f&, const SkMatrix& viewMatrix, const SkMatrix& localMatrix);
diff --git a/src/gpu/effects/GrRRectEffect.cpp b/src/gpu/effects/GrRRectEffect.cpp
@@ -150,7 +150,7 @@ class GLCircularRRectEffect : public GrGLSLFragmentProcessor {
 public:
     GLCircularRRectEffect() = default;
 
-    virtual void emitCode(EmitArgs&) override;
+    void emitCode(EmitArgs&) override;
 
     static inline void GenKey(const GrProcessor&, const GrShaderCaps&, GrProcessorKeyBuilder*);
 
diff --git a/src/image/SkImage_GpuYUVA.h b/src/image/SkImage_GpuYUVA.h
@@ -52,7 +52,7 @@ class SkImage_GpuYUVA : public SkImage_GpuBase {
 
     sk_sp<SkImage> onReinterpretColorSpace(sk_sp<SkColorSpace>) const final;
 
-    virtual bool isYUVA() const override { return true; }
+    bool isYUVA() const override { return true; }
 
     bool setupMipmapsForPlanes(GrRecordingContext*) const;
 
diff --git a/src/ports/SkFontMgr_android.cpp b/src/ports/SkFontMgr_android.cpp
@@ -82,7 +82,7 @@ class SkTypeface_AndroidSystem : public SkTypeface_Android {
         return SkStream::MakeFromFile(fPathName.c_str());
     }
 
-    virtual void onGetFontDescriptor(SkFontDescriptor* desc, bool* serialize) const override {
+    void onGetFontDescriptor(SkFontDescriptor* desc, bool* serialize) const override {
         SkASSERT(desc);
         SkASSERT(serialize);
         desc->setFamilyName(fFamilyName.c_str());
@@ -134,8 +134,7 @@ class SkTypeface_AndroidStream : public SkTypeface_Android {
         , fData(std::move(data))
     { }
 
-    virtual void onGetFontDescriptor(SkFontDescriptor* desc,
-                                     bool* serialize) const override {
+    void onGetFontDescriptor(SkFontDescriptor* desc, bool* serialize) const override {
         SkASSERT(desc);
         SkASSERT(serialize);
         desc->setFamilyName(fFamilyName.c_str());
@@ -353,14 +352,14 @@ class SkFontMgr_Android : public SkFontMgr {
         return nullptr;
     }
 
-    virtual SkTypeface* onMatchFamilyStyle(const char familyName[],
-                                           const SkFontStyle& style) const override {
+    SkTypeface* onMatchFamilyStyle(const char familyName[],
+                                   const SkFontStyle& style) const override {
         sk_sp<SkFontStyleSet> sset(this->matchFamily(familyName));
         return sset->matchStyle(style);
     }
 
-    virtual SkTypeface* onMatchFaceStyle(const SkTypeface* typeface,
-                                         const SkFontStyle& style) const override {
+    SkTypeface* onMatchFaceStyle(const SkTypeface* typeface,
+                                 const SkFontStyle& style) const override {
         for (int i = 0; i < fStyleSets.count(); ++i) {
             for (int j = 0; j < fStyleSets[i]->fStyles.count(); ++j) {
                 if (fStyleSets[i]->fStyles[j].get() == typeface) {
@@ -403,12 +402,11 @@ class SkFontMgr_Android : public SkFontMgr {
         return nullptr;
     }
 
-    virtual SkTypeface* onMatchFamilyStyleCharacter(const char familyName[],
-                                                    const SkFontStyle& style,
-                                                    const char* bcp47[],
-                                                    int bcp47Count,
-                                                    SkUnichar character) const override
-    {
+    SkTypeface* onMatchFamilyStyleCharacter(const char familyName[],
+                                            const SkFontStyle& style,
+                                            const char* bcp47[],
+                                            int bcp47Count,
+                                            SkUnichar character) const override {
         // The variant 'elegant' is 'not squashed', 'compact' is 'stays in ascent/descent'.
         // The variant 'default' means 'compact and elegant'.
         // As a result, it is not possible to know the variant context from the font alone.
diff --git a/src/shaders/SkPerlinNoiseShader.cpp b/src/shaders/SkPerlinNoiseShader.cpp
diff --git a/src/sksl/SkSLSPIRVCodeGenerator.cpp b/src/sksl/SkSLSPIRVCodeGenerator.cpp
diff --git a/src/sksl/ir/SkSLField.h b/src/sksl/ir/SkSLField.h
diff --git a/src/sksl/ir/SkSLNop.h b/src/sksl/ir/SkSLNop.h
diff --git a/src/sksl/ir/SkSLSymbol.h b/src/sksl/ir/SkSLSymbol.h
diff --git a/src/sksl/ir/SkSLVariable.h b/src/sksl/ir/SkSLVariable.h
diff --git a/tests/DrawOpAtlasTest.cpp b/tests/DrawOpAtlasTest.cpp
diff --git a/tests/PictureTest.cpp b/tests/PictureTest.cpp
diff --git a/tests/ProcessorTest.cpp b/tests/ProcessorTest.cpp
diff --git a/tests/ProgramsTest.cpp b/tests/ProgramsTest.cpp
diff --git a/tools/gpu/gl/GLTestContext.h b/tools/gpu/gl/GLTestContext.h
diff --git a/tools/gpu/mock/MockTestContext.cpp b/tools/gpu/mock/MockTestContext.cpp
diff --git a/tools/gpu/vk/VkTestContext.h b/tools/gpu/vk/VkTestContext.h

Original file line number	Diff line number	Diff line change
`@@ -104,8 +104,7 @@ class RectDashBench : public DashBench {`
`104`	`104`	`}`
`105`	`105`
`106`	`106`	`protected:`
`107`		`- virtual void handlePath(SkCanvas* canvas, const SkPath& path,`
`108`		`- const SkPaint& paint, int N) override {`
	`107`	`+ void handlePath(SkCanvas* canvas, const SkPath& path, const SkPaint& paint, int N) override {`
`109`	`108`	`SkPoint pts[2];`
`110`	`109`	`if (!path.isLine(pts) \|\| pts[0].fY != pts[1].fY) {`
`111`	`110`	`this->INHERITED::handlePath(canvas, path, paint, N);`
Original file line number	Diff line number	Diff line change
`@@ -129,7 +129,7 @@ class RotatedRectBench : public PathBench {`
`129`	`129`	`path->transform(rotateMatrix);`
`130`	`130`	`}`
`131`	`131`
`132`		`- virtual void setupPaint(SkPaint* paint) override {`
	`132`	`+ void setupPaint(SkPaint* paint) override {`
`133`	`133`	`PathBench::setupPaint(paint);`
`134`	`134`	`paint->setAntiAlias(fAA);`
`135`	`135`	`}`
Original file line number	Diff line number	Diff line change
`@@ -52,7 +52,7 @@ class DFTextGM : public skiagm::GM {`
`52`	`52`	`return SkISize::Make(1024, 768);`
`53`	`53`	`}`
`54`	`54`
`55`		`- virtual void onDraw(SkCanvas* inputCanvas) override {`
	`55`	`+ void onDraw(SkCanvas* inputCanvas) override {`
`56`	`56`	`SkScalar textSizes[] = { 9.0f, 9.0f2.0f, 9.0f5.0f, 9.0f2.0f5.0f };`
`57`	`57`	`SkScalar scales[] = { 2.0f*5.0f, 5.0f, 2.0f, 1.0f };`
`58`	`58`
Original file line number	Diff line number	Diff line change
`@@ -88,7 +88,7 @@ namespace skiagm {`
`88`	`88`	`return SkString("hairmodes");`
`89`	`89`	`}`
`90`	`90`
`91`		`- virtual SkISize onISize() override { return SkISize::Make(640, 480); }`
	`91`	`+ SkISize onISize() override { return SkISize::Make(640, 480); }`
`92`	`92`
`93`	`93`	`void onOnceBeforeDraw() override {`
`94`	`94`	`fBGPaint.setShader(make_bg_shader());`
Original file line number	Diff line number	Diff line change
`@@ -36,7 +36,7 @@ class ShapesGM : public GM {`
`36`	`36`	`}`
`37`	`37`	`}`
`38`	`38`
`39`		`- SkString onShortName() override final { return fName; }`
	`39`	`+ SkString onShortName() final { return fName; }`
`40`	`40`	`SkISize onISize() override { return SkISize::Make(500, 500); }`
`41`	`41`
`42`	`42`	`void onOnceBeforeDraw() override {`