Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1809)

Unified Diff: cc/resources/raster_worker_pool_perftest.cc

Issue 628443002: replace OVERRIDE and FINAL with override and final in cc/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase on master Created 6 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « cc/resources/raster_worker_pool.cc ('k') | cc/resources/raster_worker_pool_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/resources/raster_worker_pool_perftest.cc
diff --git a/cc/resources/raster_worker_pool_perftest.cc b/cc/resources/raster_worker_pool_perftest.cc
index 3ae1c20f6e91736c7eab56bb53e97c3bfaf1210d..e84e8af707f80ea8911051fc2b70d2ee5d8500e8 100644
--- a/cc/resources/raster_worker_pool_perftest.cc
+++ b/cc/resources/raster_worker_pool_perftest.cc
@@ -35,28 +35,28 @@ class PerfGLES2Interface : public gpu::gles2::GLES2InterfaceStub {
virtual GLuint CreateImageCHROMIUM(GLsizei width,
GLsizei height,
GLenum internalformat,
- GLenum usage) OVERRIDE {
+ GLenum usage) override {
return 1u;
}
- virtual void GenBuffers(GLsizei n, GLuint* buffers) OVERRIDE {
+ virtual void GenBuffers(GLsizei n, GLuint* buffers) override {
for (GLsizei i = 0; i < n; ++i)
buffers[i] = 1u;
}
- virtual void GenTextures(GLsizei n, GLuint* textures) OVERRIDE {
+ virtual void GenTextures(GLsizei n, GLuint* textures) override {
for (GLsizei i = 0; i < n; ++i)
textures[i] = 1u;
}
- virtual void GetIntegerv(GLenum pname, GLint* params) OVERRIDE {
+ virtual void GetIntegerv(GLenum pname, GLint* params) override {
if (pname == GL_MAX_TEXTURE_SIZE)
*params = INT_MAX;
}
- virtual void GenQueriesEXT(GLsizei n, GLuint* queries) OVERRIDE {
+ virtual void GenQueriesEXT(GLsizei n, GLuint* queries) override {
for (GLsizei i = 0; i < n; ++i)
queries[i] = 1u;
}
virtual void GetQueryObjectuivEXT(GLuint query,
GLenum pname,
- GLuint* params) OVERRIDE {
+ GLuint* params) override {
if (pname == GL_QUERY_RESULT_AVAILABLE_EXT)
*params = 1;
}
@@ -66,25 +66,25 @@ class PerfContextProvider : public ContextProvider {
public:
PerfContextProvider() : context_gl_(new PerfGLES2Interface) {}
- virtual bool BindToCurrentThread() OVERRIDE { return true; }
- virtual Capabilities ContextCapabilities() OVERRIDE {
+ virtual bool BindToCurrentThread() override { return true; }
+ virtual Capabilities ContextCapabilities() override {
Capabilities capabilities;
capabilities.gpu.image = true;
capabilities.gpu.sync_query = true;
return capabilities;
}
- virtual gpu::gles2::GLES2Interface* ContextGL() OVERRIDE {
+ virtual gpu::gles2::GLES2Interface* ContextGL() override {
return context_gl_.get();
}
- virtual gpu::ContextSupport* ContextSupport() OVERRIDE { return &support_; }
- virtual class GrContext* GrContext() OVERRIDE { return NULL; }
- virtual bool IsContextLost() OVERRIDE { return false; }
- virtual void VerifyContexts() OVERRIDE {}
- virtual void DeleteCachedResources() OVERRIDE {}
- virtual bool DestroyedOnMainThread() OVERRIDE { return false; }
- virtual void SetLostContextCallback(const LostContextCallback& cb) OVERRIDE {}
+ virtual gpu::ContextSupport* ContextSupport() override { return &support_; }
+ virtual class GrContext* GrContext() override { return NULL; }
+ virtual bool IsContextLost() override { return false; }
+ virtual void VerifyContexts() override {}
+ virtual void DeleteCachedResources() override {}
+ virtual bool DestroyedOnMainThread() override { return false; }
+ virtual void SetLostContextCallback(const LostContextCallback& cb) override {}
virtual void SetMemoryPolicyChangedCallback(
- const MemoryPolicyChangedCallback& cb) OVERRIDE {}
+ const MemoryPolicyChangedCallback& cb) override {}
private:
virtual ~PerfContextProvider() {}
@@ -110,12 +110,12 @@ class PerfImageDecodeTaskImpl : public ImageDecodeTask {
PerfImageDecodeTaskImpl() {}
// Overridden from Task:
- virtual void RunOnWorkerThread() OVERRIDE {}
+ virtual void RunOnWorkerThread() override {}
// Overridden from RasterizerTask:
- virtual void ScheduleOnOriginThread(RasterizerTaskClient* client) OVERRIDE {}
- virtual void CompleteOnOriginThread(RasterizerTaskClient* client) OVERRIDE {}
- virtual void RunReplyOnOriginThread() OVERRIDE { Reset(); }
+ virtual void ScheduleOnOriginThread(RasterizerTaskClient* client) override {}
+ virtual void CompleteOnOriginThread(RasterizerTaskClient* client) override {}
+ virtual void RunReplyOnOriginThread() override { Reset(); }
void Reset() {
did_run_ = false;
@@ -136,16 +136,16 @@ class PerfRasterTaskImpl : public RasterTask {
: RasterTask(resource.get(), dependencies), resource_(resource.Pass()) {}
// Overridden from Task:
- virtual void RunOnWorkerThread() OVERRIDE {}
+ virtual void RunOnWorkerThread() override {}
// Overridden from RasterizerTask:
- virtual void ScheduleOnOriginThread(RasterizerTaskClient* client) OVERRIDE {
+ virtual void ScheduleOnOriginThread(RasterizerTaskClient* client) override {
raster_buffer_ = client->AcquireBufferForRaster(resource());
}
- virtual void CompleteOnOriginThread(RasterizerTaskClient* client) OVERRIDE {
+ virtual void CompleteOnOriginThread(RasterizerTaskClient* client) override {
client->ReleaseBufferForRaster(raster_buffer_.Pass());
}
- virtual void RunReplyOnOriginThread() OVERRIDE { Reset(); }
+ virtual void RunReplyOnOriginThread() override { Reset(); }
void Reset() {
did_run_ = false;
@@ -227,7 +227,7 @@ class RasterWorkerPoolPerfTest
public RasterizerClient {
public:
// Overridden from testing::Test:
- virtual void SetUp() OVERRIDE {
+ virtual void SetUp() override {
switch (GetParam()) {
case RASTER_WORKER_POOL_TYPE_PIXEL_BUFFER:
Create3dOutputSurfaceAndResourceProvider();
@@ -275,16 +275,16 @@ class RasterWorkerPoolPerfTest
DCHECK(raster_worker_pool_);
raster_worker_pool_->AsRasterizer()->SetClient(this);
}
- virtual void TearDown() OVERRIDE {
+ virtual void TearDown() override {
raster_worker_pool_->AsRasterizer()->Shutdown();
raster_worker_pool_->AsRasterizer()->CheckForCompletedTasks();
}
// Overriden from RasterizerClient:
- virtual void DidFinishRunningTasks(TaskSet task_set) OVERRIDE {
+ virtual void DidFinishRunningTasks(TaskSet task_set) override {
raster_worker_pool_->AsRasterizer()->CheckForCompletedTasks();
}
- virtual TaskSetCollection TasksThatShouldBeForcedToComplete() const OVERRIDE {
+ virtual TaskSetCollection TasksThatShouldBeForcedToComplete() const override {
return TaskSetCollection();
}
@@ -478,7 +478,7 @@ class RasterWorkerPoolCommonPerfTest : public RasterWorkerPoolPerfTestBase,
public testing::Test {
public:
// Overridden from testing::Test:
- virtual void SetUp() OVERRIDE {
+ virtual void SetUp() override {
output_surface_ = FakeOutputSurface::Create3d(context_provider_).Pass();
CHECK(output_surface_->BindToClient(&output_surface_client_));
resource_provider_ =
« no previous file with comments | « cc/resources/raster_worker_pool.cc ('k') | cc/resources/raster_worker_pool_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698