From 36352bf5e38f45a70ee4f4fc132a38048d38206d Mon Sep 17 00:00:00 2001 From: mtklein Date: Wed, 25 Mar 2015 18:17:31 -0700 Subject: C++11 override should now be supported by all of {bots,Chrome,Android,Mozilla} NOPRESUBMIT=true BUG=skia: DOCS_PREVIEW= https://skia.org/?cl=1037793002 Review URL: https://codereview.chromium.org/1037793002 --- bench/GrResourceCacheBench.cpp | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'bench/GrResourceCacheBench.cpp') diff --git a/bench/GrResourceCacheBench.cpp b/bench/GrResourceCacheBench.cpp index def736c8b8..5807654ca9 100644 --- a/bench/GrResourceCacheBench.cpp +++ b/bench/GrResourceCacheBench.cpp @@ -36,7 +36,7 @@ public: } private: - size_t onGpuMemorySize() const SK_OVERRIDE { return 100; } + size_t onGpuMemorySize() const override { return 100; } typedef GrGpuResource INHERITED; }; @@ -53,16 +53,16 @@ static void populate_cache(GrGpu* gpu, int resourceCount) { class GrResourceCacheBenchAdd : 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 "grresourcecache_add"; } - void onDraw(const int loops, SkCanvas* canvas) SK_OVERRIDE { + void onDraw(const int loops, SkCanvas* canvas) override { SkAutoTUnref context(GrContext::CreateMockContext()); if (NULL == context) { return; @@ -90,16 +90,16 @@ private: class GrResourceCacheBenchFind : 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 "grresourcecache_find"; } - void onPreDraw() SK_OVERRIDE { + void onPreDraw() override { fContext.reset(GrContext::CreateMockContext()); if (!fContext) { return; @@ -118,7 +118,7 @@ protected: populate_cache(gpu, CACHE_SIZE_COUNT); } - void onDraw(const int loops, SkCanvas* canvas) SK_OVERRIDE { + void onDraw(const int loops, SkCanvas* canvas) override { if (!fContext) { return; } -- cgit v1.2.3