| Index: bench/ScalarBench.cpp | 
| diff --git a/bench/ScalarBench.cpp b/bench/ScalarBench.cpp | 
| index 92608123ee2c887b08f7221ef457a8bc2d37c4ab..21f9264e9cc00d2b0a53aa9bbe74c5fa23027f06 100644 | 
| --- a/bench/ScalarBench.cpp | 
| +++ b/bench/ScalarBench.cpp | 
| @@ -18,7 +18,7 @@ public: | 
| fName.printf("scalar_%s", name); | 
| } | 
|  | 
| -    virtual bool isSuitableFor(Backend backend) SK_OVERRIDE { | 
| +    bool isSuitableFor(Backend backend) SK_OVERRIDE { | 
| return backend == kNonRendering_Backend; | 
| } | 
|  | 
| @@ -27,11 +27,11 @@ public: | 
| protected: | 
| virtual int mulLoopCount() const { return 1; } | 
|  | 
| -    virtual const char* onGetName() SK_OVERRIDE { | 
| +    const char* onGetName() SK_OVERRIDE { | 
| return fName.c_str(); | 
| } | 
|  | 
| -    virtual void onDraw(const int loops, SkCanvas* canvas) SK_OVERRIDE { | 
| +    void onDraw(const int loops, SkCanvas* canvas) SK_OVERRIDE { | 
| for (int i = 0; i < loops; i++) { | 
| this->performTest(); | 
| } | 
| @@ -101,8 +101,8 @@ public: | 
| } | 
| } | 
| protected: | 
| -    virtual int mulLoopCount() const SK_OVERRIDE { return 1; } | 
| -    virtual void performTest() SK_OVERRIDE { | 
| +    int mulLoopCount() const SK_OVERRIDE { return 1; } | 
| +    void performTest() SK_OVERRIDE { | 
| int sum = 0; | 
| for (size_t i = 0; i < ARRAY_N; ++i) { | 
| // We pass -fArray[i], so the compiler can't cheat and treat the | 
| @@ -140,16 +140,16 @@ public: | 
| } | 
| } | 
|  | 
| -    virtual bool isSuitableFor(Backend backend) SK_OVERRIDE { | 
| +    bool isSuitableFor(Backend backend) SK_OVERRIDE { | 
| return backend == kNonRendering_Backend; | 
| } | 
|  | 
| protected: | 
| -    virtual const char* onGetName() SK_OVERRIDE { | 
| +    const char* onGetName() SK_OVERRIDE { | 
| return "rect_bounds"; | 
| } | 
|  | 
| -    virtual void onDraw(const int loops, SkCanvas* canvas) SK_OVERRIDE { | 
| +    void onDraw(const int loops, SkCanvas* canvas) SK_OVERRIDE { | 
| SkRect r; | 
| for (int i = 0; i < loops; ++i) { | 
| r.set(fPts, PTS); | 
|  |