commit baf71d35e15b47d74509b8e505263e82c1731fde
author James Robinson <jamesr@chromium.org> Wed Oct 08 13:00:20 2014 -0700
committer James Robinson <jamesr@chromium.org> Wed Oct 08 13:00:20 2014 -0700
tree 363463428f7d4eac1aa613c12e3b3a27f314249e
parent efecea65328f9b2fcbdb754576155849d550f1c4

Revved to chromium c06ba3f6d7a67bc04ae2f6c041c22a86bdcf372a refs/remotes/origin/HEAD

gpu/command_buffer/service/async_pixel_transfer_manager_idle.h

diff --git a/gpu/command_buffer/service/async_pixel_transfer_manager_idle.h b/gpu/command_buffer/service/async_pixel_transfer_manager_idle.h
index af3262f..0ec950c 100644
--- a/gpu/command_buffer/service/async_pixel_transfer_manager_idle.h
+++ b/gpu/command_buffer/service/async_pixel_transfer_manager_idle.h
@@ -17,15 +17,15 @@
   virtual ~AsyncPixelTransferManagerIdle();
 
   // AsyncPixelTransferManager implementation:
-  virtual void BindCompletedAsyncTransfers() OVERRIDE;
+  virtual void BindCompletedAsyncTransfers() override;
   virtual void AsyncNotifyCompletion(
       const AsyncMemoryParams& mem_params,
-      AsyncPixelTransferCompletionObserver* observer) OVERRIDE;
-  virtual uint32 GetTextureUploadCount() OVERRIDE;
-  virtual base::TimeDelta GetTotalTextureUploadTime() OVERRIDE;
-  virtual void ProcessMorePendingTransfers() OVERRIDE;
-  virtual bool NeedsProcessMorePendingTransfers() OVERRIDE;
-  virtual void WaitAllAsyncTexImage2D() OVERRIDE;
+      AsyncPixelTransferCompletionObserver* observer) override;
+  virtual uint32 GetTextureUploadCount() override;
+  virtual base::TimeDelta GetTotalTextureUploadTime() override;
+  virtual void ProcessMorePendingTransfers() override;
+  virtual bool NeedsProcessMorePendingTransfers() override;
+  virtual void WaitAllAsyncTexImage2D() override;
 
   struct Task {
     Task(uint64 transfer_id,
@@ -56,7 +56,7 @@
   // AsyncPixelTransferManager implementation:
   virtual AsyncPixelTransferDelegate* CreatePixelTransferDelegateImpl(
       gles2::TextureRef* ref,
-      const AsyncTexImage2DParams& define_params) OVERRIDE;
+      const AsyncTexImage2DParams& define_params) override;
 
   SharedState shared_state_;