diff options
Diffstat (limited to 'cc/resources')
33 files changed, 174 insertions, 174 deletions
diff --git a/cc/resources/bitmap_content_layer_updater.h b/cc/resources/bitmap_content_layer_updater.h index ca3f445..0010c41 100644 --- a/cc/resources/bitmap_content_layer_updater.h +++ b/cc/resources/bitmap_content_layer_updater.h @@ -32,7 +32,7 @@ class CC_EXPORT BitmapContentLayerUpdater : public ContentLayerUpdater { virtual void Update(ResourceUpdateQueue* queue, const gfx::Rect& source_rect, const gfx::Vector2d& dest_offset, - bool partial_update) OVERRIDE; + bool partial_update) override; private: BitmapContentLayerUpdater* updater_; @@ -46,19 +46,19 @@ class CC_EXPORT BitmapContentLayerUpdater : public ContentLayerUpdater { int layer_id); virtual scoped_ptr<LayerUpdater::Resource> CreateResource( - PrioritizedResourceManager* manager) OVERRIDE; + PrioritizedResourceManager* manager) override; virtual void PrepareToUpdate(const gfx::Size& content_size, const gfx::Rect& paint_rect, const gfx::Size& tile_size, float contents_width_scale, - float contents_height_scale) OVERRIDE; + float contents_height_scale) override; void UpdateTexture(ResourceUpdateQueue* queue, PrioritizedResource* resource, const gfx::Rect& source_rect, const gfx::Vector2d& dest_offset, bool partial_update); - virtual void SetOpaque(bool opaque) OVERRIDE; - virtual void ReduceMemoryUsage() OVERRIDE; + virtual void SetOpaque(bool opaque) override; + virtual void ReduceMemoryUsage() override; protected: BitmapContentLayerUpdater( diff --git a/cc/resources/bitmap_raster_worker_pool.cc b/cc/resources/bitmap_raster_worker_pool.cc index 959a0f3..404f67f 100644 --- a/cc/resources/bitmap_raster_worker_pool.cc +++ b/cc/resources/bitmap_raster_worker_pool.cc @@ -23,10 +23,10 @@ class RasterBufferImpl : public RasterBuffer { : lock_(resource_provider, resource->id()) {} // Overridden from RasterBuffer: - virtual skia::RefPtr<SkCanvas> AcquireSkCanvas() OVERRIDE { + virtual skia::RefPtr<SkCanvas> AcquireSkCanvas() override { return skia::SharePtr(lock_.sk_canvas()); } - virtual void ReleaseSkCanvas(const skia::RefPtr<SkCanvas>& canvas) OVERRIDE {} + virtual void ReleaseSkCanvas(const skia::RefPtr<SkCanvas>& canvas) override {} private: ResourceProvider::ScopedWriteLockSoftware lock_; diff --git a/cc/resources/bitmap_raster_worker_pool.h b/cc/resources/bitmap_raster_worker_pool.h index 39c4237..876bf36 100644 --- a/cc/resources/bitmap_raster_worker_pool.h +++ b/cc/resources/bitmap_raster_worker_pool.h @@ -31,18 +31,18 @@ class CC_EXPORT BitmapRasterWorkerPool : public RasterWorkerPool, ResourceProvider* resource_provider); // Overridden from RasterWorkerPool: - virtual Rasterizer* AsRasterizer() OVERRIDE; + virtual Rasterizer* AsRasterizer() override; // Overridden from Rasterizer: - virtual void SetClient(RasterizerClient* client) OVERRIDE; - virtual void Shutdown() OVERRIDE; - virtual void ScheduleTasks(RasterTaskQueue* queue) OVERRIDE; - virtual void CheckForCompletedTasks() OVERRIDE; + virtual void SetClient(RasterizerClient* client) override; + virtual void Shutdown() override; + virtual void ScheduleTasks(RasterTaskQueue* queue) override; + virtual void CheckForCompletedTasks() override; // Overridden from RasterizerTaskClient: virtual scoped_ptr<RasterBuffer> AcquireBufferForRaster( - const Resource* resource) OVERRIDE; - virtual void ReleaseBufferForRaster(scoped_ptr<RasterBuffer> buffer) OVERRIDE; + const Resource* resource) override; + virtual void ReleaseBufferForRaster(scoped_ptr<RasterBuffer> buffer) override; protected: BitmapRasterWorkerPool(base::SequencedTaskRunner* task_runner, diff --git a/cc/resources/bitmap_skpicture_content_layer_updater.h b/cc/resources/bitmap_skpicture_content_layer_updater.h index e20e3c3..030db6e 100644 --- a/cc/resources/bitmap_skpicture_content_layer_updater.h +++ b/cc/resources/bitmap_skpicture_content_layer_updater.h @@ -23,7 +23,7 @@ class BitmapSkPictureContentLayerUpdater : public SkPictureContentLayerUpdater { virtual void Update(ResourceUpdateQueue* queue, const gfx::Rect& source_rect, const gfx::Vector2d& dest_offset, - bool partial_update) OVERRIDE; + bool partial_update) override; private: SkBitmap bitmap_; @@ -38,7 +38,7 @@ class BitmapSkPictureContentLayerUpdater : public SkPictureContentLayerUpdater { int layer_id); virtual scoped_ptr<LayerUpdater::Resource> CreateResource( - PrioritizedResourceManager* manager) OVERRIDE; + PrioritizedResourceManager* manager) override; void PaintContentsRect(SkCanvas* canvas, const gfx::Rect& source_rect); diff --git a/cc/resources/content_layer_updater.h b/cc/resources/content_layer_updater.h index b11281e..33d3ee52 100644 --- a/cc/resources/content_layer_updater.h +++ b/cc/resources/content_layer_updater.h @@ -22,9 +22,9 @@ class RenderingStatsInstrumentation; class CC_EXPORT ContentLayerUpdater : public LayerUpdater { public: void set_rendering_stats_instrumentation(RenderingStatsInstrumentation* rsi); - virtual void SetOpaque(bool opaque) OVERRIDE; - virtual void SetFillsBoundsCompletely(bool fills_bounds) OVERRIDE; - virtual void SetBackgroundColor(SkColor background_color) OVERRIDE; + virtual void SetOpaque(bool opaque) override; + virtual void SetFillsBoundsCompletely(bool fills_bounds) override; + virtual void SetBackgroundColor(SkColor background_color) override; protected: ContentLayerUpdater(scoped_ptr<LayerPainter> painter, diff --git a/cc/resources/gpu_raster_worker_pool.cc b/cc/resources/gpu_raster_worker_pool.cc index cee01fe..0463cff 100644 --- a/cc/resources/gpu_raster_worker_pool.cc +++ b/cc/resources/gpu_raster_worker_pool.cc @@ -36,7 +36,7 @@ class RasterBufferImpl : public RasterBuffer { } // Overridden from RasterBuffer: - virtual skia::RefPtr<SkCanvas> AcquireSkCanvas() OVERRIDE { + virtual skia::RefPtr<SkCanvas> AcquireSkCanvas() override { if (!surface_) return skia::AdoptRef(SkCreateNullCanvas()); @@ -48,7 +48,7 @@ class RasterBufferImpl : public RasterBuffer { canvas->save(); return canvas; } - virtual void ReleaseSkCanvas(const skia::RefPtr<SkCanvas>& canvas) OVERRIDE { + virtual void ReleaseSkCanvas(const skia::RefPtr<SkCanvas>& canvas) override { if (!surface_) return; diff --git a/cc/resources/gpu_raster_worker_pool.h b/cc/resources/gpu_raster_worker_pool.h index 2149400..48c17b1 100644 --- a/cc/resources/gpu_raster_worker_pool.h +++ b/cc/resources/gpu_raster_worker_pool.h @@ -26,18 +26,18 @@ class CC_EXPORT GpuRasterWorkerPool : public RasterWorkerPool, ResourceProvider* resource_provider); // Overridden from RasterWorkerPool: - virtual Rasterizer* AsRasterizer() OVERRIDE; + virtual Rasterizer* AsRasterizer() override; // Overridden from Rasterizer: - virtual void SetClient(RasterizerClient* client) OVERRIDE; - virtual void Shutdown() OVERRIDE; - virtual void ScheduleTasks(RasterTaskQueue* queue) OVERRIDE; - virtual void CheckForCompletedTasks() OVERRIDE; + virtual void SetClient(RasterizerClient* client) override; + virtual void Shutdown() override; + virtual void ScheduleTasks(RasterTaskQueue* queue) override; + virtual void CheckForCompletedTasks() override; // Overridden from RasterizerTaskClient: virtual scoped_ptr<RasterBuffer> AcquireBufferForRaster( - const Resource* resource) OVERRIDE; - virtual void ReleaseBufferForRaster(scoped_ptr<RasterBuffer> buffer) OVERRIDE; + const Resource* resource) override; + virtual void ReleaseBufferForRaster(scoped_ptr<RasterBuffer> buffer) override; private: GpuRasterWorkerPool(base::SequencedTaskRunner* task_runner, diff --git a/cc/resources/image_layer_updater.h b/cc/resources/image_layer_updater.h index b2235b1..55fdfe5 100644 --- a/cc/resources/image_layer_updater.h +++ b/cc/resources/image_layer_updater.h @@ -24,7 +24,7 @@ class CC_EXPORT ImageLayerUpdater : public LayerUpdater { virtual void Update(ResourceUpdateQueue* queue, const gfx::Rect& source_rect, const gfx::Vector2d& dest_offset, - bool partial_update) OVERRIDE; + bool partial_update) override; private: ImageLayerUpdater* updater_; @@ -35,7 +35,7 @@ class CC_EXPORT ImageLayerUpdater : public LayerUpdater { static scoped_refptr<ImageLayerUpdater> Create(); virtual scoped_ptr<LayerUpdater::Resource> CreateResource( - PrioritizedResourceManager*) OVERRIDE; + PrioritizedResourceManager*) override; void UpdateTexture(ResourceUpdateQueue* queue, PrioritizedResource* texture, diff --git a/cc/resources/one_copy_raster_worker_pool.cc b/cc/resources/one_copy_raster_worker_pool.cc index a86d498..f447df5 100644 --- a/cc/resources/one_copy_raster_worker_pool.cc +++ b/cc/resources/one_copy_raster_worker_pool.cc @@ -53,7 +53,7 @@ class RasterBufferImpl : public RasterBuffer { } // Overridden from RasterBuffer: - virtual skia::RefPtr<SkCanvas> AcquireSkCanvas() OVERRIDE { + virtual skia::RefPtr<SkCanvas> AcquireSkCanvas() override { if (!buffer_) return skia::AdoptRef(SkCreateNullCanvas()); @@ -61,7 +61,7 @@ class RasterBufferImpl : public RasterBuffer { &bitmap_, buffer_, resource_->format(), resource_->size(), stride_); return skia::AdoptRef(new SkCanvas(bitmap_)); } - virtual void ReleaseSkCanvas(const skia::RefPtr<SkCanvas>& canvas) OVERRIDE { + virtual void ReleaseSkCanvas(const skia::RefPtr<SkCanvas>& canvas) override { if (!buffer_) return; diff --git a/cc/resources/one_copy_raster_worker_pool.h b/cc/resources/one_copy_raster_worker_pool.h index 1943868..c240999 100644 --- a/cc/resources/one_copy_raster_worker_pool.h +++ b/cc/resources/one_copy_raster_worker_pool.h @@ -37,18 +37,18 @@ class CC_EXPORT OneCopyRasterWorkerPool : public RasterWorkerPool, ResourcePool* resource_pool); // Overridden from RasterWorkerPool: - virtual Rasterizer* AsRasterizer() OVERRIDE; + virtual Rasterizer* AsRasterizer() override; // Overridden from Rasterizer: - virtual void SetClient(RasterizerClient* client) OVERRIDE; - virtual void Shutdown() OVERRIDE; - virtual void ScheduleTasks(RasterTaskQueue* queue) OVERRIDE; - virtual void CheckForCompletedTasks() OVERRIDE; + virtual void SetClient(RasterizerClient* client) override; + virtual void Shutdown() override; + virtual void ScheduleTasks(RasterTaskQueue* queue) override; + virtual void CheckForCompletedTasks() override; // Overridden from RasterizerTaskClient: virtual scoped_ptr<RasterBuffer> AcquireBufferForRaster( - const Resource* resource) OVERRIDE; - virtual void ReleaseBufferForRaster(scoped_ptr<RasterBuffer> buffer) OVERRIDE; + const Resource* resource) override; + virtual void ReleaseBufferForRaster(scoped_ptr<RasterBuffer> buffer) override; protected: OneCopyRasterWorkerPool(base::SequencedTaskRunner* task_runner, diff --git a/cc/resources/picture_layer_tiling_perftest.cc b/cc/resources/picture_layer_tiling_perftest.cc index 78a6a08..32cc9bb 100644 --- a/cc/resources/picture_layer_tiling_perftest.cc +++ b/cc/resources/picture_layer_tiling_perftest.cc @@ -43,7 +43,7 @@ class PictureLayerTilingPerfTest : public testing::Test { false).Pass(); } - virtual void SetUp() OVERRIDE { + virtual void SetUp() override { picture_layer_tiling_client_.SetTileSize(gfx::Size(256, 256)); picture_layer_tiling_client_.set_max_tiles_for_interest_area(250); picture_layer_tiling_client_.set_tree(PENDING_TREE); @@ -52,7 +52,7 @@ class PictureLayerTilingPerfTest : public testing::Test { picture_layer_tiling_->CreateAllTilesForTesting(); } - virtual void TearDown() OVERRIDE { + virtual void TearDown() override { picture_layer_tiling_.reset(NULL); } diff --git a/cc/resources/picture_pile_unittest.cc b/cc/resources/picture_pile_unittest.cc index 87938fa..15cb3d3 100644 --- a/cc/resources/picture_pile_unittest.cc +++ b/cc/resources/picture_pile_unittest.cc @@ -96,7 +96,7 @@ class PicturePileTestBase { class PicturePileTest : public PicturePileTestBase, public testing::Test { public: - virtual void SetUp() OVERRIDE { InitializeData(); } + virtual void SetUp() override { InitializeData(); } }; TEST_F(PicturePileTest, SmallInvalidateInflated) { @@ -402,7 +402,7 @@ enum Corner { class PicturePileResizeCornerTest : public PicturePileTestBase, public testing::TestWithParam<Corner> { protected: - virtual void SetUp() OVERRIDE { InitializeData(); } + virtual void SetUp() override { InitializeData(); } static gfx::Rect CornerSinglePixelRect(Corner corner, const gfx::Size& s) { switch (corner) { diff --git a/cc/resources/pixel_buffer_raster_worker_pool.cc b/cc/resources/pixel_buffer_raster_worker_pool.cc index b1011fc..87c4a79 100644 --- a/cc/resources/pixel_buffer_raster_worker_pool.cc +++ b/cc/resources/pixel_buffer_raster_worker_pool.cc @@ -36,7 +36,7 @@ class RasterBufferImpl : public RasterBuffer { } // Overridden from RasterBuffer: - virtual skia::RefPtr<SkCanvas> AcquireSkCanvas() OVERRIDE { + virtual skia::RefPtr<SkCanvas> AcquireSkCanvas() override { if (!buffer_) return skia::AdoptRef(SkCreateNullCanvas()); @@ -44,7 +44,7 @@ class RasterBufferImpl : public RasterBuffer { &bitmap_, buffer_, resource_->format(), resource_->size(), stride_); return skia::AdoptRef(new SkCanvas(bitmap_)); } - virtual void ReleaseSkCanvas(const skia::RefPtr<SkCanvas>& canvas) OVERRIDE { + virtual void ReleaseSkCanvas(const skia::RefPtr<SkCanvas>& canvas) override { if (!buffer_) return; diff --git a/cc/resources/pixel_buffer_raster_worker_pool.h b/cc/resources/pixel_buffer_raster_worker_pool.h index a2bed33..65fcdad 100644 --- a/cc/resources/pixel_buffer_raster_worker_pool.h +++ b/cc/resources/pixel_buffer_raster_worker_pool.h @@ -39,18 +39,18 @@ class CC_EXPORT PixelBufferRasterWorkerPool : public RasterWorkerPool, size_t max_transfer_buffer_usage_bytes); // Overridden from RasterWorkerPool: - virtual Rasterizer* AsRasterizer() OVERRIDE; + virtual Rasterizer* AsRasterizer() override; // Overridden from Rasterizer: - virtual void SetClient(RasterizerClient* client) OVERRIDE; - virtual void Shutdown() OVERRIDE; - virtual void ScheduleTasks(RasterTaskQueue* queue) OVERRIDE; - virtual void CheckForCompletedTasks() OVERRIDE; + virtual void SetClient(RasterizerClient* client) override; + virtual void Shutdown() override; + virtual void ScheduleTasks(RasterTaskQueue* queue) override; + virtual void CheckForCompletedTasks() override; // Overridden from RasterizerTaskClient: virtual scoped_ptr<RasterBuffer> AcquireBufferForRaster( - const Resource* resource) OVERRIDE; - virtual void ReleaseBufferForRaster(scoped_ptr<RasterBuffer> buffer) OVERRIDE; + const Resource* resource) override; + virtual void ReleaseBufferForRaster(scoped_ptr<RasterBuffer> buffer) override; private: struct RasterTaskState { diff --git a/cc/resources/raster_worker_pool.cc b/cc/resources/raster_worker_pool.cc index a720543..80477c1 100644 --- a/cc/resources/raster_worker_pool.cc +++ b/cc/resources/raster_worker_pool.cc @@ -39,7 +39,7 @@ class RasterTaskGraphRunner : public TaskGraphRunner, private: // Overridden from base::DelegateSimpleThread::Delegate: - virtual void Run() OVERRIDE { + virtual void Run() override { TaskGraphRunner::Run(); } @@ -62,15 +62,15 @@ class RasterFinishedTaskImpl : public RasterizerTask { on_raster_finished_callback_(on_raster_finished_callback) {} // Overridden from Task: - virtual void RunOnWorkerThread() OVERRIDE { + virtual void RunOnWorkerThread() override { TRACE_EVENT0("cc", "RasterFinishedTaskImpl::RunOnWorkerThread"); RasterFinished(); } // Overridden from RasterizerTask: - virtual void ScheduleOnOriginThread(RasterizerTaskClient* client) OVERRIDE {} - virtual void CompleteOnOriginThread(RasterizerTaskClient* client) OVERRIDE {} - virtual void RunReplyOnOriginThread() OVERRIDE {} + virtual void ScheduleOnOriginThread(RasterizerTaskClient* client) override {} + virtual void CompleteOnOriginThread(RasterizerTaskClient* client) override {} + virtual void RunReplyOnOriginThread() override {} protected: virtual ~RasterFinishedTaskImpl() {} diff --git a/cc/resources/raster_worker_pool_perftest.cc b/cc/resources/raster_worker_pool_perftest.cc index 3ae1c20..e84e8af 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_ = diff --git a/cc/resources/raster_worker_pool_unittest.cc b/cc/resources/raster_worker_pool_unittest.cc index 86755f8..3c39c05 100644 --- a/cc/resources/raster_worker_pool_unittest.cc +++ b/cc/resources/raster_worker_pool_unittest.cc @@ -53,7 +53,7 @@ class TestRasterTaskImpl : public RasterTask { : RasterTask(resource, dependencies), reply_(reply) {} // Overridden from Task: - virtual void RunOnWorkerThread() OVERRIDE { + virtual void RunOnWorkerThread() override { skia::RefPtr<SkCanvas> canvas = raster_buffer_->AcquireSkCanvas(); DCHECK(canvas); canvas->drawColor(SK_ColorWHITE); @@ -61,13 +61,13 @@ class TestRasterTaskImpl : public RasterTask { } // 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 { + virtual void RunReplyOnOriginThread() override { reply_.Run(PicturePileImpl::Analysis(), !HasFinishedRunning()); } @@ -90,13 +90,13 @@ class BlockingTestRasterTaskImpl : public TestRasterTaskImpl { : TestRasterTaskImpl(resource, reply, dependencies), lock_(lock) {} // Overridden from Task: - virtual void RunOnWorkerThread() OVERRIDE { + virtual void RunOnWorkerThread() override { base::AutoLock lock(*lock_); TestRasterTaskImpl::RunOnWorkerThread(); } // Overridden from RasterizerTask: - virtual void RunReplyOnOriginThread() OVERRIDE {} + virtual void RunReplyOnOriginThread() override {} protected: virtual ~BlockingTestRasterTaskImpl() {} @@ -126,7 +126,7 @@ class RasterWorkerPoolTest timed_out_(false) {} // Overridden from testing::Test: - virtual void SetUp() OVERRIDE { + virtual void SetUp() override { switch (GetParam()) { case RASTER_WORKER_POOL_TYPE_PIXEL_BUFFER: Create3dOutputSurfaceAndResourceProvider(); @@ -175,19 +175,19 @@ class RasterWorkerPoolTest 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 RasterWorkerPoolClient: - virtual void DidFinishRunningTasks(TaskSet task_set) OVERRIDE { + virtual void DidFinishRunningTasks(TaskSet task_set) override { if (task_set == ALL) { raster_worker_pool_->AsRasterizer()->CheckForCompletedTasks(); base::MessageLoop::current()->Quit(); } } - virtual TaskSetCollection TasksThatShouldBeForcedToComplete() const OVERRIDE { + virtual TaskSetCollection TasksThatShouldBeForcedToComplete() const override { return TaskSetCollection(); } diff --git a/cc/resources/rasterizer.h b/cc/resources/rasterizer.h index 72b50f2..5d2eeee 100644 --- a/cc/resources/rasterizer.h +++ b/cc/resources/rasterizer.h @@ -61,7 +61,7 @@ class CC_EXPORT ImageDecodeTask : public RasterizerTask { typedef std::vector<scoped_refptr<ImageDecodeTask> > Vector; // Overridden from RasterizerTask: - virtual ImageDecodeTask* AsImageDecodeTask() OVERRIDE; + virtual ImageDecodeTask* AsImageDecodeTask() override; protected: ImageDecodeTask(); @@ -73,7 +73,7 @@ class CC_EXPORT RasterTask : public RasterizerTask { typedef std::vector<scoped_refptr<RasterTask> > Vector; // Overridden from RasterizerTask: - virtual RasterTask* AsRasterTask() OVERRIDE; + virtual RasterTask* AsRasterTask() override; const Resource* resource() const { return resource_; } const ImageDecodeTask::Vector& dependencies() const { return dependencies_; } diff --git a/cc/resources/resource_provider.cc b/cc/resources/resource_provider.cc index 0e7c938..94ae1d9 100644 --- a/cc/resources/resource_provider.cc +++ b/cc/resources/resource_provider.cc @@ -143,7 +143,7 @@ class TextureIdAllocator : public IdAllocator { } // Overridden from IdAllocator: - virtual GLuint NextId() OVERRIDE { + virtual GLuint NextId() override { if (next_id_index_ == id_allocation_chunk_size_) { gl_->GenTextures(id_allocation_chunk_size_, ids_.get()); next_id_index_ = 0; @@ -166,7 +166,7 @@ class BufferIdAllocator : public IdAllocator { } // Overridden from IdAllocator: - virtual GLuint NextId() OVERRIDE { + virtual GLuint NextId() override { if (next_id_index_ == id_allocation_chunk_size_) { gl_->GenBuffers(id_allocation_chunk_size_, ids_.get()); next_id_index_ = 0; @@ -187,8 +187,8 @@ class QueryFence : public ResourceProvider::Fence { : gl_(gl), query_id_(query_id) {} // Overridden from ResourceProvider::Fence: - virtual void Set() OVERRIDE {} - virtual bool HasPassed() OVERRIDE { + virtual void Set() override {} + virtual bool HasPassed() override { unsigned available = 1; gl_->GetQueryObjectuivEXT( query_id_, GL_QUERY_RESULT_AVAILABLE_EXT, &available); diff --git a/cc/resources/resource_provider_unittest.cc b/cc/resources/resource_provider_unittest.cc index 04d88c6..a7ab3ae 100644 --- a/cc/resources/resource_provider_unittest.cc +++ b/cc/resources/resource_provider_unittest.cc @@ -101,11 +101,11 @@ class TextureStateTrackingContext : public TestWebGraphicsContext3D { // Force all textures to be consecutive numbers starting at "1", // so we easily can test for them. - virtual GLuint NextTextureId() OVERRIDE { + virtual GLuint NextTextureId() override { base::AutoLock lock(namespace_->lock); return namespace_->next_texture_id++; } - virtual void RetireTextureId(GLuint) OVERRIDE {} + virtual void RetireTextureId(GLuint) override {} }; // Shared data between multiple ResourceProviderContext. This contains mailbox @@ -168,7 +168,7 @@ class ResourceProviderContext : public TestWebGraphicsContext3D { return make_scoped_ptr(new ResourceProviderContext(shared_data)); } - virtual GLuint insertSyncPoint() OVERRIDE { + virtual GLuint insertSyncPoint() override { uint32 sync_point = shared_data_->InsertSyncPoint(); // Commit the produceTextureCHROMIUM calls at this point, so that // they're associated with the sync point. @@ -183,7 +183,7 @@ class ResourceProviderContext : public TestWebGraphicsContext3D { return sync_point; } - virtual void waitSyncPoint(GLuint sync_point) OVERRIDE { + virtual void waitSyncPoint(GLuint sync_point) override { last_waited_sync_point_ = std::max(sync_point, last_waited_sync_point_); } @@ -193,7 +193,7 @@ class ResourceProviderContext : public TestWebGraphicsContext3D { GLint levels, GLuint internalformat, GLint width, - GLint height) OVERRIDE { + GLint height) override { CheckTextureIsBound(target); ASSERT_EQ(static_cast<unsigned>(GL_TEXTURE_2D), target); ASSERT_EQ(1, levels); @@ -218,7 +218,7 @@ class ResourceProviderContext : public TestWebGraphicsContext3D { GLint border, GLenum format, GLenum type, - const void* pixels) OVERRIDE { + const void* pixels) override { CheckTextureIsBound(target); ASSERT_EQ(static_cast<unsigned>(GL_TEXTURE_2D), target); ASSERT_FALSE(level); @@ -238,7 +238,7 @@ class ResourceProviderContext : public TestWebGraphicsContext3D { GLsizei height, GLenum format, GLenum type, - const void* pixels) OVERRIDE { + const void* pixels) override { CheckTextureIsBound(target); ASSERT_EQ(static_cast<unsigned>(GL_TEXTURE_2D), target); ASSERT_FALSE(level); @@ -251,12 +251,12 @@ class ResourceProviderContext : public TestWebGraphicsContext3D { SetPixels(xoffset, yoffset, width, height, pixels); } - virtual void genMailboxCHROMIUM(GLbyte* mailbox) OVERRIDE { + virtual void genMailboxCHROMIUM(GLbyte* mailbox) override { return shared_data_->GenMailbox(mailbox); } virtual void produceTextureCHROMIUM(GLenum target, - const GLbyte* mailbox) OVERRIDE { + const GLbyte* mailbox) override { CheckTextureIsBound(target); // Delay moving the texture into the mailbox until the next @@ -270,7 +270,7 @@ class ResourceProviderContext : public TestWebGraphicsContext3D { } virtual void consumeTextureCHROMIUM(GLenum target, - const GLbyte* mailbox) OVERRIDE { + const GLbyte* mailbox) override { CheckTextureIsBound(target); base::AutoLock lock_for_texture_access(namespace_->lock); scoped_refptr<TestTexture> texture = @@ -3615,11 +3615,11 @@ INSTANTIATE_TEST_CASE_P( class TextureIdAllocationTrackingContext : public TestWebGraphicsContext3D { public: - virtual GLuint NextTextureId() OVERRIDE { + virtual GLuint NextTextureId() override { base::AutoLock lock(namespace_->lock); return namespace_->next_texture_id++; } - virtual void RetireTextureId(GLuint) OVERRIDE {} + virtual void RetireTextureId(GLuint) override {} GLuint PeekTextureId() { base::AutoLock lock(namespace_->lock); return namespace_->next_texture_id; diff --git a/cc/resources/resource_update_controller_unittest.cc b/cc/resources/resource_update_controller_unittest.cc index 58df016..18ad507 100644 --- a/cc/resources/resource_update_controller_unittest.cc +++ b/cc/resources/resource_update_controller_unittest.cc @@ -32,8 +32,8 @@ class WebGraphicsContext3DForUploadTest : public TestWebGraphicsContext3D { explicit WebGraphicsContext3DForUploadTest(ResourceUpdateControllerTest* test) : test_(test) {} - virtual void flush() OVERRIDE; - virtual void shallowFlushCHROMIUM() OVERRIDE; + virtual void flush() override; + virtual void shallowFlushCHROMIUM() override; virtual void texSubImage2D(GLenum target, GLint level, GLint xoffset, @@ -42,10 +42,10 @@ class WebGraphicsContext3DForUploadTest : public TestWebGraphicsContext3D { GLsizei height, GLenum format, GLenum type, - const void* pixels) OVERRIDE; + const void* pixels) override; virtual void getQueryObjectuivEXT(GLuint id, GLenum pname, GLuint* value) - OVERRIDE; + override; private: ResourceUpdateControllerTest* test_; @@ -328,7 +328,7 @@ class FakeResourceUpdateControllerClient void Reset() { ready_to_finalize_called_ = false; } bool ReadyToFinalizeCalled() const { return ready_to_finalize_called_; } - virtual void ReadyToFinalizeTextureUpdates() OVERRIDE { + virtual void ReadyToFinalizeTextureUpdates() override { ready_to_finalize_called_ = true; } @@ -352,7 +352,7 @@ class FakeResourceUpdateController : public ResourceUpdateController { void SetUpdateTextureTime(base::TimeDelta time) { update_textures_time_ = time; } - virtual base::TimeTicks UpdateMoreTexturesCompletionTime() OVERRIDE { + virtual base::TimeTicks UpdateMoreTexturesCompletionTime() override { size_t total_updates = resource_provider_->NumBlockingUploads() + update_more_textures_size_; return now_ + total_updates * update_textures_time_; @@ -360,7 +360,7 @@ class FakeResourceUpdateController : public ResourceUpdateController { void SetUpdateMoreTexturesSize(size_t size) { update_more_textures_size_ = size; } - virtual size_t UpdateMoreTexturesSize() const OVERRIDE { + virtual size_t UpdateMoreTexturesSize() const override { return update_more_textures_size_; } diff --git a/cc/resources/scoped_ui_resource.h b/cc/resources/scoped_ui_resource.h index c257e1e..9d4b937 100644 --- a/cc/resources/scoped_ui_resource.h +++ b/cc/resources/scoped_ui_resource.h @@ -29,7 +29,7 @@ class CC_EXPORT ScopedUIResource : public UIResourceClient { // UIResourceClient implementation. virtual UIResourceBitmap GetBitmap(UIResourceId uid, - bool resource_lost) OVERRIDE; + bool resource_lost) override; UIResourceId id() { return id_; } protected: diff --git a/cc/resources/skpicture_content_layer_updater.h b/cc/resources/skpicture_content_layer_updater.h index 9c79c74..55edade 100644 --- a/cc/resources/skpicture_content_layer_updater.h +++ b/cc/resources/skpicture_content_layer_updater.h @@ -29,7 +29,7 @@ class SkPictureContentLayerUpdater : public ContentLayerUpdater { const gfx::Rect& paint_rect, const gfx::Size& tile_size, float contents_width_scale, - float contents_height_scale) OVERRIDE; + float contents_height_scale) override; void DrawPicture(SkCanvas* canvas); private: diff --git a/cc/resources/task_graph_runner_perftest.cc b/cc/resources/task_graph_runner_perftest.cc index 533ea4b..999043f 100644 --- a/cc/resources/task_graph_runner_perftest.cc +++ b/cc/resources/task_graph_runner_perftest.cc @@ -27,7 +27,7 @@ class PerfTaskImpl : public Task { PerfTaskImpl() {} // Overridden from Task: - virtual void RunOnWorkerThread() OVERRIDE {} + virtual void RunOnWorkerThread() override {} void Reset() { did_run_ = false; } @@ -45,11 +45,11 @@ class TaskGraphRunnerPerfTest : public testing::Test { kTimeCheckInterval) {} // Overridden from testing::Test: - virtual void SetUp() OVERRIDE { + virtual void SetUp() override { task_graph_runner_ = make_scoped_ptr(new TaskGraphRunner); namespace_token_ = task_graph_runner_->GetNamespaceToken(); } - virtual void TearDown() OVERRIDE { task_graph_runner_ = nullptr; } + virtual void TearDown() override { task_graph_runner_ = nullptr; } void AfterTest(const std::string& test_name) { // Format matches chrome/test/perf/perf_test.h:PrintResult diff --git a/cc/resources/task_graph_runner_unittest.cc b/cc/resources/task_graph_runner_unittest.cc index 1a6256c..6e5a785 100644 --- a/cc/resources/task_graph_runner_unittest.cc +++ b/cc/resources/task_graph_runner_unittest.cc @@ -118,7 +118,7 @@ class TaskGraphRunnerTestBase { : test_(test), namespace_index_(namespace_index), id_(id) {} // Overridden from Task: - virtual void RunOnWorkerThread() OVERRIDE { + virtual void RunOnWorkerThread() override { test_->RunTaskOnWorkerThread(namespace_index_, id_); } @@ -145,7 +145,7 @@ class TaskGraphRunnerTestBase { : FakeTaskImpl(test, namespace_index, id) {} // Overridden from FakeTaskImpl: - virtual void CompleteOnOriginThread() OVERRIDE {} + virtual void CompleteOnOriginThread() override {} private: virtual ~FakeDependentTaskImpl() {} @@ -167,7 +167,7 @@ class TaskGraphRunnerTest : public TaskGraphRunnerTestBase, public base::DelegateSimpleThread::Delegate { public: // Overridden from testing::Test: - virtual void SetUp() OVERRIDE { + virtual void SetUp() override { const size_t num_threads = GetParam(); while (workers_.size() < num_threads) { scoped_ptr<base::DelegateSimpleThread> worker = @@ -179,7 +179,7 @@ class TaskGraphRunnerTest : public TaskGraphRunnerTestBase, for (int i = 0; i < kNamespaceCount; ++i) namespace_token_[i] = task_graph_runner_->GetNamespaceToken(); } - virtual void TearDown() OVERRIDE { + virtual void TearDown() override { task_graph_runner_->Shutdown(); while (workers_.size()) { scoped_ptr<base::DelegateSimpleThread> worker = workers_.take_front(); @@ -189,7 +189,7 @@ class TaskGraphRunnerTest : public TaskGraphRunnerTestBase, private: // Overridden from base::DelegateSimpleThread::Delegate: - virtual void Run() OVERRIDE { task_graph_runner_->Run(); } + virtual void Run() override { task_graph_runner_->Run(); } ScopedPtrDeque<base::DelegateSimpleThread> workers_; }; @@ -285,21 +285,21 @@ class TaskGraphRunnerSingleThreadTest public base::DelegateSimpleThread::Delegate { public: // Overridden from testing::Test: - virtual void SetUp() OVERRIDE { + virtual void SetUp() override { worker_.reset(new base::DelegateSimpleThread(this, "TestWorker")); worker_->Start(); for (int i = 0; i < kNamespaceCount; ++i) namespace_token_[i] = task_graph_runner_->GetNamespaceToken(); } - virtual void TearDown() OVERRIDE { + virtual void TearDown() override { task_graph_runner_->Shutdown(); worker_->Join(); } private: // Overridden from base::DelegateSimpleThread::Delegate: - virtual void Run() OVERRIDE { task_graph_runner_->Run(); } + virtual void Run() override { task_graph_runner_->Run(); } scoped_ptr<base::DelegateSimpleThread> worker_; }; diff --git a/cc/resources/texture_uploader_unittest.cc b/cc/resources/texture_uploader_unittest.cc index bf94065..335908d 100644 --- a/cc/resources/texture_uploader_unittest.cc +++ b/cc/resources/texture_uploader_unittest.cc @@ -19,7 +19,7 @@ class TextureUploadTestContext : public gpu::gles2::GLES2InterfaceStub { public: TextureUploadTestContext() : result_available_(0), unpack_alignment_(4) {} - virtual void PixelStorei(GLenum pname, GLint param) OVERRIDE { + virtual void PixelStorei(GLenum pname, GLint param) override { switch (pname) { case GL_UNPACK_ALIGNMENT: // Param should be a power of two <= 8. @@ -43,7 +43,7 @@ class TextureUploadTestContext : public gpu::gles2::GLES2InterfaceStub { virtual void GetQueryObjectuivEXT(GLuint, GLenum type, - GLuint* value) OVERRIDE { + GLuint* value) override { switch (type) { case GL_QUERY_RESULT_AVAILABLE_EXT: *value = result_available_; @@ -62,7 +62,7 @@ class TextureUploadTestContext : public gpu::gles2::GLES2InterfaceStub { GLsizei height, GLenum format, GLenum type, - const void* pixels) OVERRIDE { + const void* pixels) override { EXPECT_EQ(static_cast<unsigned>(GL_TEXTURE_2D), target); EXPECT_EQ(0, level); EXPECT_LE(0, width); diff --git a/cc/resources/tile_manager.cc b/cc/resources/tile_manager.cc index 218faca..d121840 100644 --- a/cc/resources/tile_manager.cc +++ b/cc/resources/tile_manager.cc @@ -59,7 +59,7 @@ class RasterTaskImpl : public RasterTask { reply_(reply) {} // Overridden from Task: - virtual void RunOnWorkerThread() OVERRIDE { + virtual void RunOnWorkerThread() override { TRACE_EVENT0("cc", "RasterizerTaskImpl::RunOnWorkerThread"); DCHECK(picture_pile_.get()); @@ -75,14 +75,14 @@ class RasterTaskImpl : public RasterTask { } // Overridden from RasterizerTask: - virtual void ScheduleOnOriginThread(RasterizerTaskClient* client) OVERRIDE { + virtual void ScheduleOnOriginThread(RasterizerTaskClient* client) override { DCHECK(!raster_buffer_); 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 { + virtual void RunReplyOnOriginThread() override { DCHECK(!raster_buffer_); reply_.Run(analysis_, !HasFinishedRunning()); } @@ -172,7 +172,7 @@ class ImageDecodeTaskImpl : public ImageDecodeTask { reply_(reply) {} // Overridden from Task: - virtual void RunOnWorkerThread() OVERRIDE { + virtual void RunOnWorkerThread() override { TRACE_EVENT0("cc", "ImageDecodeTaskImpl::RunOnWorkerThread"); devtools_instrumentation::ScopedImageDecodeTask image_decode_task( @@ -183,9 +183,9 @@ class ImageDecodeTaskImpl : public ImageDecodeTask { } // Overridden from RasterizerTask: - virtual void ScheduleOnOriginThread(RasterizerTaskClient* client) OVERRIDE {} - virtual void CompleteOnOriginThread(RasterizerTaskClient* client) OVERRIDE {} - virtual void RunReplyOnOriginThread() OVERRIDE { + virtual void ScheduleOnOriginThread(RasterizerTaskClient* client) override {} + virtual void CompleteOnOriginThread(RasterizerTaskClient* client) override {} + virtual void RunReplyOnOriginThread() override { reply_.Run(!HasFinishedRunning()); } diff --git a/cc/resources/tile_manager.h b/cc/resources/tile_manager.h index a9118a7..d8d219b 100644 --- a/cc/resources/tile_manager.h +++ b/cc/resources/tile_manager.h @@ -183,11 +183,11 @@ class CC_EXPORT TileManager : public RasterizerClient, void CleanUpReleasedTiles(); // Overriden from RefCountedManager<Tile>: - virtual void Release(Tile* tile) OVERRIDE; + virtual void Release(Tile* tile) override; // Overriden from RasterizerClient: - virtual void DidFinishRunningTasks(TaskSet task_set) OVERRIDE; - virtual TaskSetCollection TasksThatShouldBeForcedToComplete() const OVERRIDE; + virtual void DidFinishRunningTasks(TaskSet task_set) override; + virtual TaskSetCollection TasksThatShouldBeForcedToComplete() const override; typedef std::vector<Tile*> TileVector; typedef std::set<Tile*> TileSet; diff --git a/cc/resources/tile_manager_perftest.cc b/cc/resources/tile_manager_perftest.cc index 5ff4fa2..9766df6 100644 --- a/cc/resources/tile_manager_perftest.cc +++ b/cc/resources/tile_manager_perftest.cc @@ -37,9 +37,9 @@ static const int kTimeCheckInterval = 10; class FakeRasterizerImpl : public Rasterizer, public RasterizerTaskClient { public: // Overridden from Rasterizer: - virtual void SetClient(RasterizerClient* client) OVERRIDE {} - virtual void Shutdown() OVERRIDE {} - virtual void ScheduleTasks(RasterTaskQueue* queue) OVERRIDE { + virtual void SetClient(RasterizerClient* client) override {} + virtual void Shutdown() override {} + virtual void ScheduleTasks(RasterTaskQueue* queue) override { for (RasterTaskQueue::Item::Vector::const_iterator it = queue->items.begin(); it != queue->items.end(); @@ -53,7 +53,7 @@ class FakeRasterizerImpl : public Rasterizer, public RasterizerTaskClient { completed_tasks_.push_back(task); } } - virtual void CheckForCompletedTasks() OVERRIDE { + virtual void CheckForCompletedTasks() override { for (RasterTask::Vector::iterator it = completed_tasks_.begin(); it != completed_tasks_.end(); ++it) { @@ -70,11 +70,11 @@ class FakeRasterizerImpl : public Rasterizer, public RasterizerTaskClient { // Overridden from RasterizerTaskClient: virtual scoped_ptr<RasterBuffer> AcquireBufferForRaster( - const Resource* resource) OVERRIDE { + const Resource* resource) override { return nullptr; } virtual void ReleaseBufferForRaster( - scoped_ptr<RasterBuffer> buffer) OVERRIDE {} + scoped_ptr<RasterBuffer> buffer) override {} private: RasterTask::Vector completed_tasks_; @@ -112,7 +112,7 @@ class TileManagerPerfTest : public testing::Test { host_impl_.tile_manager()->SetGlobalStateForTesting(state); } - virtual void SetUp() OVERRIDE { + virtual void SetUp() override { picture_pile_ = FakePicturePileImpl::CreateInfiniteFilledPile(); InitializeRenderer(); SetTreePriority(SAME_PRIORITY_FOR_BOTH_TREES); diff --git a/cc/resources/tile_manager_unittest.cc b/cc/resources/tile_manager_unittest.cc index 3fb5b13..b0d57e6 100644 --- a/cc/resources/tile_manager_unittest.cc +++ b/cc/resources/tile_manager_unittest.cc @@ -81,7 +81,7 @@ class TileManagerTest : public testing::TestWithParam<bool>, tile_manager_->SetGlobalStateForTesting(state); } - virtual void TearDown() OVERRIDE { + virtual void TearDown() override { tile_manager_.reset(NULL); picture_pile_ = NULL; @@ -90,15 +90,15 @@ class TileManagerTest : public testing::TestWithParam<bool>, // TileManagerClient implementation. virtual const std::vector<PictureLayerImpl*>& GetPictureLayers() - const OVERRIDE { + const override { return picture_layers_; } - virtual void NotifyReadyToActivate() OVERRIDE { ready_to_activate_ = true; } - virtual void NotifyTileStateChanged(const Tile* tile) OVERRIDE {} + virtual void NotifyReadyToActivate() override { ready_to_activate_ = true; } + virtual void NotifyTileStateChanged(const Tile* tile) override {} virtual void BuildRasterQueue(RasterTilePriorityQueue* queue, - TreePriority priority) OVERRIDE {} + TreePriority priority) override {} virtual void BuildEvictionQueue(EvictionTilePriorityQueue* queue, - TreePriority priority) OVERRIDE {} + TreePriority priority) override {} TileVector CreateTilesWithSize(int count, TilePriority active_priority, @@ -514,7 +514,7 @@ class TileManagerTilePriorityQueueTest : public testing::Test { host_impl_.tile_manager()->SetGlobalStateForTesting(state); } - virtual void SetUp() OVERRIDE { + virtual void SetUp() override { InitializeRenderer(); SetTreePriority(SAME_PRIORITY_FOR_BOTH_TREES); } diff --git a/cc/resources/video_resource_updater.cc b/cc/resources/video_resource_updater.cc index 75edccb..f62b6e6 100644 --- a/cc/resources/video_resource_updater.cc +++ b/cc/resources/video_resource_updater.cc @@ -27,10 +27,10 @@ class SyncPointClientImpl : public media::VideoFrame::SyncPointClient { public: explicit SyncPointClientImpl(gpu::gles2::GLES2Interface* gl) : gl_(gl) {} virtual ~SyncPointClientImpl() {} - virtual uint32 InsertSyncPoint() OVERRIDE { + virtual uint32 InsertSyncPoint() override { return GLC(gl_, gl_->InsertSyncPointCHROMIUM()); } - virtual void WaitSyncPoint(uint32 sync_point) OVERRIDE { + virtual void WaitSyncPoint(uint32 sync_point) override { GLC(gl_, gl_->WaitSyncPointCHROMIUM(sync_point)); } diff --git a/cc/resources/zero_copy_raster_worker_pool.cc b/cc/resources/zero_copy_raster_worker_pool.cc index f463406..8d98eaf 100644 --- a/cc/resources/zero_copy_raster_worker_pool.cc +++ b/cc/resources/zero_copy_raster_worker_pool.cc @@ -36,7 +36,7 @@ class RasterBufferImpl : public RasterBuffer { } // Overridden from RasterBuffer: - virtual skia::RefPtr<SkCanvas> AcquireSkCanvas() OVERRIDE { + virtual skia::RefPtr<SkCanvas> AcquireSkCanvas() override { if (!buffer_) return skia::AdoptRef(SkCreateNullCanvas()); @@ -44,7 +44,7 @@ class RasterBufferImpl : public RasterBuffer { &bitmap_, buffer_, resource_->format(), resource_->size(), stride_); return skia::AdoptRef(new SkCanvas(bitmap_)); } - virtual void ReleaseSkCanvas(const skia::RefPtr<SkCanvas>& canvas) OVERRIDE { + virtual void ReleaseSkCanvas(const skia::RefPtr<SkCanvas>& canvas) override { if (!buffer_) return; diff --git a/cc/resources/zero_copy_raster_worker_pool.h b/cc/resources/zero_copy_raster_worker_pool.h index 4e4280e..b94713d 100644 --- a/cc/resources/zero_copy_raster_worker_pool.h +++ b/cc/resources/zero_copy_raster_worker_pool.h @@ -31,18 +31,18 @@ class CC_EXPORT ZeroCopyRasterWorkerPool : public RasterWorkerPool, ResourceProvider* resource_provider); // Overridden from RasterWorkerPool: - virtual Rasterizer* AsRasterizer() OVERRIDE; + virtual Rasterizer* AsRasterizer() override; // Overridden from Rasterizer: - virtual void SetClient(RasterizerClient* client) OVERRIDE; - virtual void Shutdown() OVERRIDE; - virtual void ScheduleTasks(RasterTaskQueue* queue) OVERRIDE; - virtual void CheckForCompletedTasks() OVERRIDE; + virtual void SetClient(RasterizerClient* client) override; + virtual void Shutdown() override; + virtual void ScheduleTasks(RasterTaskQueue* queue) override; + virtual void CheckForCompletedTasks() override; // Overridden from RasterizerTaskClient: virtual scoped_ptr<RasterBuffer> AcquireBufferForRaster( - const Resource* resource) OVERRIDE; - virtual void ReleaseBufferForRaster(scoped_ptr<RasterBuffer> buffer) OVERRIDE; + const Resource* resource) override; + virtual void ReleaseBufferForRaster(scoped_ptr<RasterBuffer> buffer) override; protected: ZeroCopyRasterWorkerPool(base::SequencedTaskRunner* task_runner, |