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

src/utils/debugger/SkDebugCanvas.cpp

 
 /*
  * Copyright 2012 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 
 #include "SkColorPriv.h"
@@ skipping 77 matching lines @@
         if (prev != bitmap.getColor(0,0)) {
             layer = i;
         }
         prev = bitmap.getColor(0,0);
     }
     return layer;
 }
 
 class OverdrawXfermode : public SkXfermode {
 public:
-    virtual SkPMColor xferColor(SkPMColor src, SkPMColor dst) const SK_OVERRIDE {
+    SkPMColor xferColor(SkPMColor src, SkPMColor dst) const SK_OVERRIDE {
         // This table encodes the color progression of the overdraw visualization
         static const SkPMColor gTable[] = {
             SkPackARGB32(0x00, 0x00, 0x00, 0x00),
             SkPackARGB32(0xFF, 128, 158, 255),
             SkPackARGB32(0xFF, 170, 185, 212),
             SkPackARGB32(0xFF, 213, 195, 170),
             SkPackARGB32(0xFF, 255, 192, 127),
             SkPackARGB32(0xFF, 255, 185, 85),
             SkPackARGB32(0xFF, 255, 165, 42),
             SkPackARGB32(0xFF, 255, 135, 0),
             SkPackARGB32(0xFF, 255,  95, 0),
             SkPackARGB32(0xFF, 255,  50, 0),
             SkPackARGB32(0xFF, 255,  0, 0)
         };
 
         for (size_t i = 0; i < SK_ARRAY_COUNT(gTable)-1; ++i) {
             if (gTable[i] == dst) {
                 return gTable[i+1];
             }
         }
 
         return gTable[SK_ARRAY_COUNT(gTable)-1];
     }
 
-    virtual Factory getFactory() const SK_OVERRIDE { return NULL; }
+    Factory getFactory() const SK_OVERRIDE { return NULL; }
 #ifndef SK_IGNORE_TO_STRING
     virtual void toString(SkString* str) const { str->set("OverdrawXfermode"); }
 #endif
 };
 
 class SkOverdrawFilter : public SkDrawFilter {
 public:
     SkOverdrawFilter() {
         fXferMode = SkNEW(OverdrawXfermode);
     }
 
     virtual ~SkOverdrawFilter() {
         delete fXferMode;
     }
 
-    virtual bool filter(SkPaint* p, Type) SK_OVERRIDE {
+    bool filter(SkPaint* p, Type) SK_OVERRIDE {
         p->setXfermode(fXferMode);
         return true;
     }
 
 protected:
     SkXfermode* fXferMode;
 
 private:
     typedef SkDrawFilter INHERITED;
 };
 
 // SkTexOverrideFilter modifies every paint to use the specified
 // texture filtering mode
 class SkTexOverrideFilter : public SkDrawFilter {
 public:
     SkTexOverrideFilter() : fFilterLevel(SkPaint::kNone_FilterLevel) {
     }
 
     void setFilterLevel(SkPaint::FilterLevel filterLevel) {
         fFilterLevel = filterLevel;
     }
 
-    virtual bool filter(SkPaint* p, Type) SK_OVERRIDE {
+    bool filter(SkPaint* p, Type) SK_OVERRIDE {
         p->setFilterLevel(fFilterLevel);
         return true;
     }
 
 protected:
     SkPaint::FilterLevel fFilterLevel;
 
 private:
     typedef SkDrawFilter INHERITED;
 };
 
 class SkDebugClipVisitor : public SkCanvas::ClipVisitor {
 public:
     SkDebugClipVisitor(SkCanvas* canvas) : fCanvas(canvas) {}
 
-    virtual void clipRect(const SkRect& r, SkRegion::Op, bool doAA) SK_OVERRIDE {
+    void clipRect(const SkRect& r, SkRegion::Op, bool doAA) SK_OVERRIDE {
         SkPaint p;
         p.setColor(SK_ColorRED);
         p.setStyle(SkPaint::kStroke_Style);
         p.setAntiAlias(doAA);
         fCanvas->drawRect(r, p);
     }
-    virtual void clipRRect(const SkRRect& rr, SkRegion::Op, bool doAA) SK_OVERRIDE {
+    void clipRRect(const SkRRect& rr, SkRegion::Op, bool doAA) SK_OVERRIDE {
         SkPaint p;
         p.setColor(SK_ColorGREEN);
         p.setStyle(SkPaint::kStroke_Style);
         p.setAntiAlias(doAA);
         fCanvas->drawRRect(rr, p);
     }
-    virtual void clipPath(const SkPath& path, SkRegion::Op, bool doAA) SK_OVERRIDE {
+    void clipPath(const SkPath& path, SkRegion::Op, bool doAA) SK_OVERRIDE {
         SkPaint p;
         p.setColor(SK_ColorBLUE);
         p.setStyle(SkPaint::kStroke_Style);
         p.setAntiAlias(doAA);
         fCanvas->drawPath(path, p);
     }
 
 protected:
     SkCanvas* fCanvas;
 
@@ skipping 486 matching lines @@
 }
 
 bool SkDebugCanvas::lastClipStackData(const SkPath& devPath) {
     if (fCalledAddStackData) {
         fClipStackData.appendf("<br>");
         addPathData(devPath, "pathOut");
         return true;
     }
     return false;
 }