| Index: bench/RefCntBench.cpp
|
| diff --git a/bench/RefCntBench.cpp b/bench/RefCntBench.cpp
|
| index 7aa57463185f7c9552033d64adc005562e693242..aacdf18edb83dc4efef9c4766ae659884789bd0b 100644
|
| --- a/bench/RefCntBench.cpp
|
| +++ b/bench/RefCntBench.cpp
|
| @@ -18,7 +18,7 @@ class AtomicInc32 : public Benchmark {
|
| public:
|
| AtomicInc32() : fX(0) {}
|
|
|
| - bool isSuitableFor(Backend backend) SK_OVERRIDE {
|
| + bool isSuitableFor(Backend backend) override {
|
| return backend == kNonRendering_Backend;
|
| }
|
|
|
| @@ -42,7 +42,7 @@ class AtomicInc64 : public Benchmark {
|
| public:
|
| AtomicInc64() : fX(0) {}
|
|
|
| - bool isSuitableFor(Backend backend) SK_OVERRIDE {
|
| + bool isSuitableFor(Backend backend) override {
|
| return backend == kNonRendering_Backend;
|
| }
|
|
|
| @@ -64,7 +64,7 @@ private:
|
|
|
| class RefCntBench_Stack : public Benchmark {
|
| public:
|
| - bool isSuitableFor(Backend backend) SK_OVERRIDE {
|
| + bool isSuitableFor(Backend backend) override {
|
| return backend == kNonRendering_Backend;
|
| }
|
|
|
| @@ -100,7 +100,7 @@ private:
|
|
|
| class RefCntBench_Heap : public Benchmark {
|
| public:
|
| - bool isSuitableFor(Backend backend) SK_OVERRIDE {
|
| + bool isSuitableFor(Backend backend) override {
|
| return backend == kNonRendering_Backend;
|
| }
|
|
|
| @@ -127,7 +127,7 @@ private:
|
|
|
| class RefCntBench_New : public Benchmark {
|
| public:
|
| - bool isSuitableFor(Backend backend) SK_OVERRIDE {
|
| + bool isSuitableFor(Backend backend) override {
|
| return backend == kNonRendering_Backend;
|
| }
|
|
|
| @@ -155,7 +155,7 @@ private:
|
|
|
| class WeakRefCntBench_Stack : public Benchmark {
|
| public:
|
| - bool isSuitableFor(Backend backend) SK_OVERRIDE {
|
| + bool isSuitableFor(Backend backend) override {
|
| return backend == kNonRendering_Backend;
|
| }
|
|
|
| @@ -186,16 +186,16 @@ public:
|
|
|
| class WeakRefCntBench_Heap : public Benchmark {
|
| public:
|
| - bool isSuitableFor(Backend backend) SK_OVERRIDE {
|
| + bool isSuitableFor(Backend backend) override {
|
| return backend == kNonRendering_Backend;
|
| }
|
|
|
| protected:
|
| - const char* onGetName() SK_OVERRIDE {
|
| + const char* onGetName() override {
|
| return "ref_cnt_heap_weak";
|
| }
|
|
|
| - void onDraw(const int loops, SkCanvas*) SK_OVERRIDE {
|
| + void onDraw(const int loops, SkCanvas*) override {
|
| char memory[sizeof(PlacedWeakRefCnt)];
|
| for (int i = 0; i < loops; ++i) {
|
| PlacedWeakRefCnt* ref = new (memory) PlacedWeakRefCnt();
|
| @@ -213,16 +213,16 @@ private:
|
|
|
| class WeakRefCntBench_New : public Benchmark {
|
| public:
|
| - bool isSuitableFor(Backend backend) SK_OVERRIDE {
|
| + bool isSuitableFor(Backend backend) override {
|
| return backend == kNonRendering_Backend;
|
| }
|
|
|
| protected:
|
| - const char* onGetName() SK_OVERRIDE {
|
| + const char* onGetName() override {
|
| return "ref_cnt_new_weak";
|
| }
|
|
|
| - void onDraw(const int loops, SkCanvas*) SK_OVERRIDE {
|
| + void onDraw(const int loops, SkCanvas*) override {
|
| for (int i = 0; i < loops; ++i) {
|
| SkWeakRefCnt* ref = new SkWeakRefCnt();
|
| for (int j = 0; j < M; ++j) {
|
|
|