C++11 override should now be supported by all of {bots,Chrome,Android,Mozilla}

src/core/SkScan_Antihair.cpp

 
 /*
  * Copyright 2011 The Android Open Source Project
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 
 #include "SkScan.h"
@@ skipping 88 matching lines @@
 
     virtual SkFixed drawCap(int x, SkFixed fy, SkFixed slope, int mod64) = 0;
     virtual SkFixed drawLine(int x, int stopx, SkFixed fy, SkFixed slope) = 0;
 
 private:
     SkBlitter*  fBlitter;
 };
 
 class HLine_SkAntiHairBlitter : public SkAntiHairBlitter {
 public:
-    SkFixed drawCap(int x, SkFixed fy, SkFixed slope, int mod64) SK_OVERRIDE {
+    SkFixed drawCap(int x, SkFixed fy, SkFixed slope, int mod64) override {
         fy += SK_Fixed1/2;
 
         int y = fy >> 16;
         uint8_t  a = (uint8_t)(fy >> 8);
 
         // lower line
         unsigned ma = SmallDot6Scale(a, mod64);
         if (ma) {
             call_hline_blitter(this->getBlitter(), x, y, 1, ma);
         }
 
         // upper line
         ma = SmallDot6Scale(255 - a, mod64);
         if (ma) {
             call_hline_blitter(this->getBlitter(), x, y - 1, 1, ma);
         }
 
         return fy - SK_Fixed1/2;
     }
 
     virtual SkFixed drawLine(int x, int stopx, SkFixed fy,
-                             SkFixed slope) SK_OVERRIDE {
+                             SkFixed slope) override {
         SkASSERT(x < stopx);
         int count = stopx - x;
         fy += SK_Fixed1/2;
 
         int y = fy >> 16;
         uint8_t  a = (uint8_t)(fy >> 8);
 
         // lower line
         if (a) {
             call_hline_blitter(this->getBlitter(), x, y, count, a);
         }
 
         // upper line
         a = 255 - a;
         if (a) {
             call_hline_blitter(this->getBlitter(), x, y - 1, count, a);
         }
 
         return fy - SK_Fixed1/2;
     }
 };
 
 class Horish_SkAntiHairBlitter : public SkAntiHairBlitter {
 public:
-    SkFixed drawCap(int x, SkFixed fy, SkFixed dy, int mod64) SK_OVERRIDE {
+    SkFixed drawCap(int x, SkFixed fy, SkFixed dy, int mod64) override {
         int16_t runs[2];
         uint8_t  aa[1];
 
         runs[0] = 1;
         runs[1] = 0;
 
         fy += SK_Fixed1/2;
         SkBlitter* blitter = this->getBlitter();
 
         int lower_y = fy >> 16;
@@ skipping 12 matching lines @@
             blitter->blitAntiH(x, lower_y - 1, aa, runs);
             // the clipping blitters might edit runs, but should not affect us
             SkASSERT(runs[0] == 1);
             SkASSERT(runs[1] == 0);
         }
         fy += dy;
 
         return fy - SK_Fixed1/2;
     }
 
-    SkFixed drawLine(int x, int stopx, SkFixed fy, SkFixed dy) SK_OVERRIDE {
+    SkFixed drawLine(int x, int stopx, SkFixed fy, SkFixed dy) override {
         SkASSERT(x < stopx);
 
         int16_t runs[2];
         uint8_t  aa[1];
 
         runs[0] = 1;
         runs[1] = 0;
 
         fy += SK_Fixed1/2;
         SkBlitter* blitter = this->getBlitter();
@@ skipping 17 matching lines @@
             }
             fy += dy;
         } while (++x < stopx);
 
         return fy - SK_Fixed1/2;
     }
 };
 
 class VLine_SkAntiHairBlitter : public SkAntiHairBlitter {
 public:
-    SkFixed drawCap(int y, SkFixed fx, SkFixed dx, int mod64) SK_OVERRIDE {
+    SkFixed drawCap(int y, SkFixed fx, SkFixed dx, int mod64) override {
         SkASSERT(0 == dx);
         fx += SK_Fixed1/2;
 
         int x = fx >> 16;
         int a = (uint8_t)(fx >> 8);
 
         unsigned ma = SmallDot6Scale(a, mod64);
         if (ma) {
             this->getBlitter()->blitV(x, y, 1, ma);
         }
         ma = SmallDot6Scale(255 - a, mod64);
         if (ma) {
             this->getBlitter()->blitV(x - 1, y, 1, ma);
         }
 
         return fx - SK_Fixed1/2;
     }
 
-    SkFixed drawLine(int y, int stopy, SkFixed fx, SkFixed dx) SK_OVERRIDE {
+    SkFixed drawLine(int y, int stopy, SkFixed fx, SkFixed dx) override {
         SkASSERT(y < stopy);
         SkASSERT(0 == dx);
         fx += SK_Fixed1/2;
 
         int x = fx >> 16;
         int a = (uint8_t)(fx >> 8);
 
         if (a) {
             this->getBlitter()->blitV(x, y, stopy - y, a);
         }
         a = 255 - a;
         if (a) {
             this->getBlitter()->blitV(x - 1, y, stopy - y, a);
         }
 
         return fx - SK_Fixed1/2;
     }
 };
 
 class Vertish_SkAntiHairBlitter : public SkAntiHairBlitter {
 public:
-    SkFixed drawCap(int y, SkFixed fx, SkFixed dx, int mod64) SK_OVERRIDE {
+    SkFixed drawCap(int y, SkFixed fx, SkFixed dx, int mod64) override {
         int16_t runs[3];
         uint8_t  aa[2];
 
         runs[0] = 1;
         runs[2] = 0;
 
         fx += SK_Fixed1/2;
         int x = fx >> 16;
         uint8_t  a = (uint8_t)(fx >> 8);
 
         aa[0] = SmallDot6Scale(255 - a, mod64);
         aa[1] = SmallDot6Scale(a, mod64);
         // the clippng blitters might overwrite this guy, so we have to reset it each time
         runs[1] = 1;
         this->getBlitter()->blitAntiH(x - 1, y, aa, runs);
         // the clipping blitters might edit runs, but should not affect us
         SkASSERT(runs[0] == 1);
         SkASSERT(runs[2] == 0);
         fx += dx;
 
         return fx - SK_Fixed1/2;
     }
 
-    SkFixed drawLine(int y, int stopy, SkFixed fx, SkFixed dx) SK_OVERRIDE {
+    SkFixed drawLine(int y, int stopy, SkFixed fx, SkFixed dx) override {
         SkASSERT(y < stopy);
         int16_t runs[3];
         uint8_t  aa[2];
 
         runs[0] = 1;
         runs[2] = 0;
 
         fx += SK_Fixed1/2;
         do {
             int x = fx >> 16;
@@ skipping 762 matching lines @@
 
 void SkScan::AntiFrameRect(const SkRect& r, const SkPoint& strokeSize,
                            const SkRasterClip& clip, SkBlitter* blitter) {
     if (clip.isBW()) {
         AntiFrameRect(r, strokeSize, &clip.bwRgn(), blitter);
     } else {
         SkAAClipBlitterWrapper wrap(clip, blitter);
         AntiFrameRect(r, strokeSize, &wrap.getRgn(), wrap.getBlitter());
     }
 }