Replacing the OVERRIDE with override and FINAL with final in gpu

gpu/command_buffer/service/framebuffer_manager.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "gpu/command_buffer/service/framebuffer_manager.h"
 #include "base/logging.h"
 #include "base/strings/stringprintf.h"
 #include "gpu/command_buffer/common/gles2_cmd_utils.h"
 #include "gpu/command_buffer/service/renderbuffer_manager.h"
 #include "gpu/command_buffer/service/texture_manager.h"
@@ skipping 30 matching lines @@
 }
 
 class RenderbufferAttachment
     : public Framebuffer::Attachment {
  public:
   explicit RenderbufferAttachment(
       Renderbuffer* renderbuffer)
       : renderbuffer_(renderbuffer) {
   }
 
-  virtual GLsizei width() const OVERRIDE {
+  virtual GLsizei width() const override {
     return renderbuffer_->width();
   }
 
-  virtual GLsizei height() const OVERRIDE {
+  virtual GLsizei height() const override {
     return renderbuffer_->height();
   }
 
-  virtual GLenum internal_format() const OVERRIDE {
+  virtual GLenum internal_format() const override {
     return renderbuffer_->internal_format();
   }
 
-  virtual GLenum texture_type() const OVERRIDE {
+  virtual GLenum texture_type() const override {
     return 0;
   }
 
-  virtual GLsizei samples() const OVERRIDE {
+  virtual GLsizei samples() const override {
     return renderbuffer_->samples();
   }
 
-  virtual GLuint object_name() const OVERRIDE {
+  virtual GLuint object_name() const override {
     return renderbuffer_->client_id();
   }
 
-  virtual bool cleared() const OVERRIDE {
+  virtual bool cleared() const override {
     return renderbuffer_->cleared();
   }
 
   virtual void SetCleared(
       RenderbufferManager* renderbuffer_manager,
       TextureManager* /* texture_manager */,
-      bool cleared) OVERRIDE {
+      bool cleared) override {
     renderbuffer_manager->SetCleared(renderbuffer_.get(), cleared);
   }
 
   virtual bool IsTexture(
-      TextureRef* /* texture */) const OVERRIDE {
+      TextureRef* /* texture */) const override {
     return false;
   }
 
   virtual bool IsRenderbuffer(
-       Renderbuffer* renderbuffer) const OVERRIDE {
+       Renderbuffer* renderbuffer) const override {
     return renderbuffer_.get() == renderbuffer;
   }
 
-  virtual bool CanRenderTo() const OVERRIDE {
+  virtual bool CanRenderTo() const override {
     return true;
   }
 
-  virtual void DetachFromFramebuffer(Framebuffer* framebuffer) const OVERRIDE {
+  virtual void DetachFromFramebuffer(Framebuffer* framebuffer) const override {
     // Nothing to do for renderbuffers.
   }
 
   virtual bool ValidForAttachmentType(
-      GLenum attachment_type, uint32 max_color_attachments) OVERRIDE {
+      GLenum attachment_type, uint32 max_color_attachments) override {
     uint32 need = GLES2Util::GetChannelsNeededForAttachmentType(
         attachment_type, max_color_attachments);
     uint32 have = GLES2Util::GetChannelsForFormat(internal_format());
     return (need & have) != 0;
   }
 
   Renderbuffer* renderbuffer() const {
     return renderbuffer_.get();
   }
 
   virtual size_t GetSignatureSize(
-      TextureManager* texture_manager) const OVERRIDE {
+      TextureManager* texture_manager) const override {
     return renderbuffer_->GetSignatureSize();
   }
 
   virtual void AddToSignature(
-      TextureManager* texture_manager, std::string* signature) const OVERRIDE {
+      TextureManager* texture_manager, std::string* signature) const override {
     DCHECK(signature);
     renderbuffer_->AddToSignature(signature);
   }
 
-  virtual void OnWillRenderTo() const OVERRIDE {}
-  virtual void OnDidRenderTo() const OVERRIDE {}
+  virtual void OnWillRenderTo() const override {}
+  virtual void OnDidRenderTo() const override {}
 
  protected:
   virtual ~RenderbufferAttachment() { }
 
  private:
   scoped_refptr<Renderbuffer> renderbuffer_;
 
   DISALLOW_COPY_AND_ASSIGN(RenderbufferAttachment);
 };
 
 class TextureAttachment
     : public Framebuffer::Attachment {
  public:
   TextureAttachment(
       TextureRef* texture_ref, GLenum target, GLint level, GLsizei samples)
       : texture_ref_(texture_ref),
         target_(target),
         level_(level),
         samples_(samples) {
   }
 
-  virtual GLsizei width() const OVERRIDE {
+  virtual GLsizei width() const override {
     GLsizei temp_width = 0;
     GLsizei temp_height = 0;
     texture_ref_->texture()->GetLevelSize(
         target_, level_, &temp_width, &temp_height);
     return temp_width;
   }
 
-  virtual GLsizei height() const OVERRIDE {
+  virtual GLsizei height() const override {
     GLsizei temp_width = 0;
     GLsizei temp_height = 0;
     texture_ref_->texture()->GetLevelSize(
         target_, level_, &temp_width, &temp_height);
     return temp_height;
   }
 
-  virtual GLenum internal_format() const OVERRIDE {
+  virtual GLenum internal_format() const override {
     GLenum temp_type = 0;
     GLenum temp_internal_format = 0;
     texture_ref_->texture()->GetLevelType(
         target_, level_, &temp_type, &temp_internal_format);
     return temp_internal_format;
   }
 
-  virtual GLenum texture_type() const OVERRIDE {
+  virtual GLenum texture_type() const override {
     GLenum temp_type = 0;
     GLenum temp_internal_format = 0;
     texture_ref_->texture()->GetLevelType(
         target_, level_, &temp_type, &temp_internal_format);
     return temp_type;
   }
 
-  virtual GLsizei samples() const OVERRIDE {
+  virtual GLsizei samples() const override {
     return samples_;
   }
 
-  virtual GLuint object_name() const OVERRIDE {
+  virtual GLuint object_name() const override {
     return texture_ref_->client_id();
   }
 
-  virtual bool cleared() const OVERRIDE {
+  virtual bool cleared() const override {
     return texture_ref_->texture()->IsLevelCleared(target_, level_);
   }
 
   virtual void SetCleared(
       RenderbufferManager* /* renderbuffer_manager */,
       TextureManager* texture_manager,
-      bool cleared) OVERRIDE {
+      bool cleared) override {
     texture_manager->SetLevelCleared(
         texture_ref_.get(), target_, level_, cleared);
   }
 
-  virtual bool IsTexture(TextureRef* texture) const OVERRIDE {
+  virtual bool IsTexture(TextureRef* texture) const override {
     return texture == texture_ref_.get();
   }
 
   virtual bool IsRenderbuffer(
        Renderbuffer* /* renderbuffer */)
-          const OVERRIDE {
+          const override {
     return false;
   }
 
   TextureRef* texture() const {
     return texture_ref_.get();
   }
 
-  virtual bool CanRenderTo() const OVERRIDE {
+  virtual bool CanRenderTo() const override {
     return texture_ref_->texture()->CanRenderTo();
   }
 
   virtual void DetachFromFramebuffer(Framebuffer* framebuffer)
-      const OVERRIDE {
+      const override {
     texture_ref_->texture()->DetachFromFramebuffer();
     framebuffer->OnTextureRefDetached(texture_ref_.get());
   }
 
   virtual bool ValidForAttachmentType(
-      GLenum attachment_type, uint32 max_color_attachments) OVERRIDE {
+      GLenum attachment_type, uint32 max_color_attachments) override {
     GLenum type = 0;
     GLenum internal_format = 0;
     if (!texture_ref_->texture()->GetLevelType(
         target_, level_, &type, &internal_format)) {
       return false;
     }
     uint32 need = GLES2Util::GetChannelsNeededForAttachmentType(
         attachment_type, max_color_attachments);
     uint32 have = GLES2Util::GetChannelsForFormat(internal_format);
 
     // Workaround for NVIDIA drivers that incorrectly expose these formats as
     // renderable:
     if (internal_format == GL_LUMINANCE || internal_format == GL_ALPHA ||
         internal_format == GL_LUMINANCE_ALPHA) {
       return false;
     }
     return (need & have) != 0;
   }
 
   virtual size_t GetSignatureSize(
-      TextureManager* texture_manager) const OVERRIDE {
+      TextureManager* texture_manager) const override {
     return texture_manager->GetSignatureSize();
   }
 
   virtual void AddToSignature(
-      TextureManager* texture_manager, std::string* signature) const OVERRIDE {
+      TextureManager* texture_manager, std::string* signature) const override {
     DCHECK(signature);
     texture_manager->AddToSignature(
         texture_ref_.get(), target_, level_, signature);
   }
 
-  virtual void OnWillRenderTo() const OVERRIDE {
+  virtual void OnWillRenderTo() const override {
     texture_ref_->texture()->OnWillModifyPixels();
   }
 
-  virtual void OnDidRenderTo() const OVERRIDE {
+  virtual void OnDidRenderTo() const override {
     texture_ref_->texture()->OnDidModifyPixels();
   }
 
  protected:
   virtual ~TextureAttachment() {}
 
  private:
   scoped_refptr<TextureRef> texture_ref_;
   GLenum target_;
   GLint level_;
@@ skipping 480 matching lines @@
        ++it) {
     TextureDetachObserver* observer = *it;
     observer->OnTextureRefDetachedFromFramebuffer(texture);
   }
 }
 
 }  // namespace gles2
 }  // namespace gpu