diff options
Diffstat (limited to 'cc/resources/resource_update_controller_unittest.cc')
-rw-r--r-- | cc/resources/resource_update_controller_unittest.cc | 14 |
1 files changed, 7 insertions, 7 deletions
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_; } |