Fix up all the easy virtual ... SK_OVERRIDE cases.

gm/nonclosedpaths.cpp

 /*
  * Copyright 2013 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "gm.h"
 #include "SkCanvas.h"
 #include "SkPath.h"
@@ skipping 14 matching lines @@
         FakeCloseCorner,   // The last point coincides with the first one at a corner.
                            // The path looks closed, but final rendering has 2 ends with cap.
 
         FakeCloseMiddle,   // The last point coincides with the first one in the middle of a line.
                            // The path looks closed, and the final rendering looks closed too.
 
         kClosureTypeCount
     };
 
 protected:
-    virtual uint32_t onGetFlags() const SK_OVERRIDE {
+    uint32_t onGetFlags() const SK_OVERRIDE {
         return kSkipTiled_Flag;
     }
 
-    virtual SkString onShortName() SK_OVERRIDE {
+    SkString onShortName() SK_OVERRIDE {
         return SkString("nonclosedpaths");
     }
 
     // 12 * 18 + 3 cases, every case is 100 * 100 pixels.
-    virtual SkISize onISize() SK_OVERRIDE {
+    SkISize onISize() SK_OVERRIDE {
         return SkISize::Make(1220, 1920);
     }
 
     // Use rect-like geometry for non-closed path, for right angles make it
     // easier to show the visual difference of lineCap and lineJoin.
     static void MakePath(SkPath* path, ClosureType type) {
         if (FakeCloseMiddle == type) {
             path->moveTo(30, 50);
             path->lineTo(30, 30);
         } else {
             path->moveTo(30, 30);
         }
         path->lineTo(70, 30);
         path->lineTo(70, 70);
         path->lineTo(30, 70);
         path->lineTo(30, 50);
         if (FakeCloseCorner == type) {
             path->lineTo(30, 30);
         }
     }
 
     // Set the location for the current test on the canvas
     static void SetLocation(SkCanvas* canvas, int counter, int lineNum) {
         SkScalar x = SK_Scalar1 * 100 * (counter % lineNum) + 10 + SK_Scalar1 / 4;
         SkScalar y = SK_Scalar1 * 100 * (counter / lineNum) + 10 + 3 * SK_Scalar1 / 4;
         canvas->translate(x, y);
     }
 
-    virtual void onDraw(SkCanvas* canvas) SK_OVERRIDE {
+    void onDraw(SkCanvas* canvas) SK_OVERRIDE {
         // Stroke widths are:
         // 0(may use hairline rendering), 10(common case for stroke-style)
         // 40 and 50(>= geometry width/height, make the contour filled in fact)
         static const int kStrokeWidth[] = {0, 10, 40, 50};
         int numWidths = SK_ARRAY_COUNT(kStrokeWidth);
 
         static const SkPaint::Style kStyle[] = {
             SkPaint::kStroke_Style, SkPaint::kStrokeAndFill_Style
         };
 
@@ skipping 56 matching lines @@
 
 private:
     typedef GM INHERITED;
 };
 
 //////////////////////////////////////////////////////////////////////////////
 
 DEF_GM(return new NonClosedPathsGM;)
 
 }