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

src/fonts/SkTestScalerContext.cpp

 /*
  * Copyright 2014 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "SkBitmap.h"
 #include "SkCanvas.h"
 #include "SkDescriptor.h"
@@ skipping 183 matching lines @@
         , fFace(face)
     {
         fRec.getSingleMatrix(&fMatrix);
         this->forceGenerateImageFromPath();
     }
 
     virtual ~SkTestScalerContext() {
     }
 
 protected:
-    virtual unsigned generateGlyphCount() SK_OVERRIDE {
+    unsigned generateGlyphCount() SK_OVERRIDE {
         return fFace->onCountGlyphs();
     }
 
-    virtual uint16_t generateCharToGlyph(SkUnichar uni) SK_OVERRIDE {
+    uint16_t generateCharToGlyph(SkUnichar uni) SK_OVERRIDE {
         uint16_t glyph;
         (void) fFace->onCharsToGlyphs((const void *) &uni, SkTypeface::kUTF16_Encoding, &glyph, 1);
         return glyph;
     }
 
-    virtual void generateAdvance(SkGlyph* glyph) SK_OVERRIDE {
+    void generateAdvance(SkGlyph* glyph) SK_OVERRIDE {
         fFace->getAdvance(glyph);
 
         SkVector advance;
         fMatrix.mapXY(SkFixedToScalar(glyph->fAdvanceX),
                       SkFixedToScalar(glyph->fAdvanceY), &advance);
         glyph->fAdvanceX = SkScalarToFixed(advance.fX);
         glyph->fAdvanceY = SkScalarToFixed(advance.fY);
     }
 
-    virtual void generateMetrics(SkGlyph* glyph) SK_OVERRIDE {
+    void generateMetrics(SkGlyph* glyph) SK_OVERRIDE {
         fFace->getMetrics(glyph);
 
         SkVector advance;
         fMatrix.mapXY(SkFixedToScalar(glyph->fAdvanceX),
                       SkFixedToScalar(glyph->fAdvanceY), &advance);
         glyph->fAdvanceX = SkScalarToFixed(advance.fX);
         glyph->fAdvanceY = SkScalarToFixed(advance.fY);
 
         SkPath path;
         fFace->getPath(*glyph, &path);
         path.transform(fMatrix);
 
         SkRect storage;
         const SkPaint paint;
         const SkRect& newBounds = paint.doComputeFastBounds(path.getBounds(),
                                                             &storage,
                                                             SkPaint::kFill_Style);
         SkIRect ibounds;
         newBounds.roundOut(&ibounds);
         glyph->fLeft = ibounds.fLeft;
         glyph->fTop = ibounds.fTop;
         glyph->fWidth = ibounds.width();
         glyph->fHeight = ibounds.height();
         glyph->fMaskFormat = SkMask::kARGB32_Format;
     }
 
-    virtual void generateImage(const SkGlyph& glyph) SK_OVERRIDE {
+    void generateImage(const SkGlyph& glyph) SK_OVERRIDE {
         SkPath path;
         fFace->getPath(glyph, &path);
 
         SkBitmap bm;
         bm.installPixels(SkImageInfo::MakeN32Premul(glyph.fWidth, glyph.fHeight),
                             glyph.fImage, glyph.rowBytes());
         bm.eraseColor(0);
 
         SkCanvas canvas(bm);
         canvas.translate(-SkIntToScalar(glyph.fLeft),
                             -SkIntToScalar(glyph.fTop));
         canvas.concat(fMatrix);
         SkPaint paint;
         paint.setAntiAlias(true);
         canvas.drawPath(path, paint);
     }
 
-    virtual void generatePath(const SkGlyph& glyph, SkPath* path) SK_OVERRIDE {
+    void generatePath(const SkGlyph& glyph, SkPath* path) SK_OVERRIDE {
         fFace->getPath(glyph, path);
         path->transform(fMatrix);
     }
 
-    virtual void generateFontMetrics(SkPaint::FontMetrics* metrics) SK_OVERRIDE {
+    void generateFontMetrics(SkPaint::FontMetrics* metrics) SK_OVERRIDE {
         fFace->getFontMetrics(metrics);
         if (metrics) {
             SkScalar scale = fMatrix.getScaleY();
             metrics->fTop = SkScalarMul(metrics->fTop, scale);
             metrics->fAscent = SkScalarMul(metrics->fAscent, scale);
             metrics->fDescent = SkScalarMul(metrics->fDescent, scale);
             metrics->fBottom = SkScalarMul(metrics->fBottom, scale);
             metrics->fLeading = SkScalarMul(metrics->fLeading, scale);
             metrics->fAvgCharWidth = SkScalarMul(metrics->fAvgCharWidth, scale);
             metrics->fXMin = SkScalarMul(metrics->fXMin, scale);
             metrics->fXMax = SkScalarMul(metrics->fXMax, scale);
             metrics->fXHeight = SkScalarMul(metrics->fXHeight, scale);
         }
     }
 
 private:
     SkTestTypeface*  fFace;
     SkMatrix         fMatrix;
 };
 
 SkScalerContext* SkTestTypeface::onCreateScalerContext(const SkDescriptor* desc) const {
     return SkNEW_ARGS(SkTestScalerContext, (const_cast<SkTestTypeface*>(this), desc));
 }