Index: cc/resources/tile_manager.cc |
diff --git a/cc/resources/tile_manager.cc b/cc/resources/tile_manager.cc |
index 7fa2e3ee07bc6ed4f4b1e7170288d1bf45a80800..cb9d766654eedaf78d36b313c1a226f35e71ee56 100644 |
--- a/cc/resources/tile_manager.cc |
+++ b/cc/resources/tile_manager.cc |
@@ -57,7 +57,7 @@ class RasterTaskImpl : public RasterTask { |
reply_(reply) {} |
// Overridden from Task: |
- virtual void RunOnWorkerThread() override { |
+ void RunOnWorkerThread() override { |
TRACE_EVENT0("cc", "RasterizerTaskImpl::RunOnWorkerThread"); |
DCHECK(picture_pile_.get()); |
@@ -73,20 +73,20 @@ class RasterTaskImpl : public RasterTask { |
} |
// Overridden from RasterizerTask: |
- virtual void ScheduleOnOriginThread(RasterizerTaskClient* client) override { |
+ void ScheduleOnOriginThread(RasterizerTaskClient* client) override { |
DCHECK(!raster_buffer_); |
raster_buffer_ = client->AcquireBufferForRaster(resource()); |
} |
- virtual void CompleteOnOriginThread(RasterizerTaskClient* client) override { |
+ void CompleteOnOriginThread(RasterizerTaskClient* client) override { |
client->ReleaseBufferForRaster(raster_buffer_.Pass()); |
} |
- virtual void RunReplyOnOriginThread() override { |
+ void RunReplyOnOriginThread() override { |
DCHECK(!raster_buffer_); |
reply_.Run(analysis_, !HasFinishedRunning()); |
} |
protected: |
- virtual ~RasterTaskImpl() { DCHECK(!raster_buffer_); } |
+ ~RasterTaskImpl() override { DCHECK(!raster_buffer_); } |
private: |
void Analyze(const PicturePileImpl* picture_pile) { |
@@ -166,7 +166,7 @@ class ImageDecodeTaskImpl : public ImageDecodeTask { |
reply_(reply) {} |
// Overridden from Task: |
- virtual void RunOnWorkerThread() override { |
+ void RunOnWorkerThread() override { |
TRACE_EVENT0("cc", "ImageDecodeTaskImpl::RunOnWorkerThread"); |
devtools_instrumentation::ScopedImageDecodeTask image_decode_task( |
@@ -177,14 +177,12 @@ class ImageDecodeTaskImpl : public ImageDecodeTask { |
} |
// Overridden from RasterizerTask: |
- virtual void ScheduleOnOriginThread(RasterizerTaskClient* client) override {} |
- virtual void CompleteOnOriginThread(RasterizerTaskClient* client) override {} |
- virtual void RunReplyOnOriginThread() override { |
- reply_.Run(!HasFinishedRunning()); |
- } |
+ void ScheduleOnOriginThread(RasterizerTaskClient* client) override {} |
+ void CompleteOnOriginThread(RasterizerTaskClient* client) override {} |
+ void RunReplyOnOriginThread() override { reply_.Run(!HasFinishedRunning()); } |
protected: |
- virtual ~ImageDecodeTaskImpl() {} |
+ ~ImageDecodeTaskImpl() override {} |
private: |
skia::RefPtr<SkPixelRef> pixel_ref_; |