| Index: gpu/command_buffer/service/query_manager.cc
|
| diff --git a/gpu/command_buffer/service/query_manager.cc b/gpu/command_buffer/service/query_manager.cc
|
| index 1d36c899871109a0b9038dd20169f2c57d2a9cac..fdc7d0a68b2a29aa067dca036db6a380b3f44885 100644
|
| --- a/gpu/command_buffer/service/query_manager.cc
|
| +++ b/gpu/command_buffer/service/query_manager.cc
|
| @@ -34,7 +34,7 @@ class AsyncPixelTransferCompletionObserverImpl
|
| cancelled_ = true;
|
| }
|
|
|
| - virtual void DidComplete(const AsyncMemoryParams& mem_params) OVERRIDE {
|
| + virtual void DidComplete(const AsyncMemoryParams& mem_params) override {
|
| base::AutoLock locked(lock_);
|
| if (!cancelled_) {
|
| DCHECK(mem_params.buffer().get());
|
| @@ -62,10 +62,10 @@ class AsyncPixelTransfersCompletedQuery
|
| AsyncPixelTransfersCompletedQuery(
|
| QueryManager* manager, GLenum target, int32 shm_id, uint32 shm_offset);
|
|
|
| - virtual bool Begin() OVERRIDE;
|
| - virtual bool End(base::subtle::Atomic32 submit_count) OVERRIDE;
|
| - virtual bool Process() OVERRIDE;
|
| - virtual void Destroy(bool have_context) OVERRIDE;
|
| + virtual bool Begin() override;
|
| + virtual bool End(base::subtle::Atomic32 submit_count) override;
|
| + virtual bool Process() override;
|
| + virtual void Destroy(bool have_context) override;
|
|
|
| protected:
|
| virtual ~AsyncPixelTransfersCompletedQuery();
|
| @@ -139,10 +139,10 @@ class AllSamplesPassedQuery : public QueryManager::Query {
|
| AllSamplesPassedQuery(
|
| QueryManager* manager, GLenum target, int32 shm_id, uint32 shm_offset,
|
| GLuint service_id);
|
| - virtual bool Begin() OVERRIDE;
|
| - virtual bool End(base::subtle::Atomic32 submit_count) OVERRIDE;
|
| - virtual bool Process() OVERRIDE;
|
| - virtual void Destroy(bool have_context) OVERRIDE;
|
| + virtual bool Begin() override;
|
| + virtual bool End(base::subtle::Atomic32 submit_count) override;
|
| + virtual bool Process() override;
|
| + virtual void Destroy(bool have_context) override;
|
|
|
| protected:
|
| virtual ~AllSamplesPassedQuery();
|
| @@ -198,10 +198,10 @@ class CommandsIssuedQuery : public QueryManager::Query {
|
| CommandsIssuedQuery(
|
| QueryManager* manager, GLenum target, int32 shm_id, uint32 shm_offset);
|
|
|
| - virtual bool Begin() OVERRIDE;
|
| - virtual bool End(base::subtle::Atomic32 submit_count) OVERRIDE;
|
| - virtual bool Process() OVERRIDE;
|
| - virtual void Destroy(bool have_context) OVERRIDE;
|
| + virtual bool Begin() override;
|
| + virtual bool End(base::subtle::Atomic32 submit_count) override;
|
| + virtual bool Process() override;
|
| + virtual void Destroy(bool have_context) override;
|
|
|
| protected:
|
| virtual ~CommandsIssuedQuery();
|
| @@ -245,10 +245,10 @@ class CommandLatencyQuery : public QueryManager::Query {
|
| CommandLatencyQuery(
|
| QueryManager* manager, GLenum target, int32 shm_id, uint32 shm_offset);
|
|
|
| - virtual bool Begin() OVERRIDE;
|
| - virtual bool End(base::subtle::Atomic32 submit_count) OVERRIDE;
|
| - virtual bool Process() OVERRIDE;
|
| - virtual void Destroy(bool have_context) OVERRIDE;
|
| + virtual bool Begin() override;
|
| + virtual bool End(base::subtle::Atomic32 submit_count) override;
|
| + virtual bool Process() override;
|
| + virtual void Destroy(bool have_context) override;
|
|
|
| protected:
|
| virtual ~CommandLatencyQuery();
|
| @@ -291,10 +291,10 @@ class AsyncReadPixelsCompletedQuery
|
| AsyncReadPixelsCompletedQuery(
|
| QueryManager* manager, GLenum target, int32 shm_id, uint32 shm_offset);
|
|
|
| - virtual bool Begin() OVERRIDE;
|
| - virtual bool End(base::subtle::Atomic32 submit_count) OVERRIDE;
|
| - virtual bool Process() OVERRIDE;
|
| - virtual void Destroy(bool have_context) OVERRIDE;
|
| + virtual bool Begin() override;
|
| + virtual bool End(base::subtle::Atomic32 submit_count) override;
|
| + virtual bool Process() override;
|
| + virtual void Destroy(bool have_context) override;
|
|
|
| protected:
|
| void Complete();
|
| @@ -351,10 +351,10 @@ class GetErrorQuery : public QueryManager::Query {
|
| GetErrorQuery(
|
| QueryManager* manager, GLenum target, int32 shm_id, uint32 shm_offset);
|
|
|
| - virtual bool Begin() OVERRIDE;
|
| - virtual bool End(base::subtle::Atomic32 submit_count) OVERRIDE;
|
| - virtual bool Process() OVERRIDE;
|
| - virtual void Destroy(bool have_context) OVERRIDE;
|
| + virtual bool Begin() override;
|
| + virtual bool End(base::subtle::Atomic32 submit_count) override;
|
| + virtual bool Process() override;
|
| + virtual void Destroy(bool have_context) override;
|
|
|
| protected:
|
| virtual ~GetErrorQuery();
|
| @@ -398,10 +398,10 @@ class CommandsCompletedQuery : public QueryManager::Query {
|
| uint32 shm_offset);
|
|
|
| // Overridden from QueryManager::Query:
|
| - virtual bool Begin() OVERRIDE;
|
| - virtual bool End(base::subtle::Atomic32 submit_count) OVERRIDE;
|
| - virtual bool Process() OVERRIDE;
|
| - virtual void Destroy(bool have_context) OVERRIDE;
|
| + virtual bool Begin() override;
|
| + virtual bool End(base::subtle::Atomic32 submit_count) override;
|
| + virtual bool Process() override;
|
| + virtual void Destroy(bool have_context) override;
|
|
|
| protected:
|
| virtual ~CommandsCompletedQuery();
|
|
|