gpu: Fix more clang warnings about missing virtual and OVERRIDE annotations.

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"

[tfarina, 2012/09/08 02:41:46]

sort!

 #include "gpu/command_buffer/common/gles2_cmd_utils.h"
 
 namespace gpu {
 namespace gles2 {
 
 class RenderbufferAttachment
     : public FramebufferManager::FramebufferInfo::Attachment {
  public:
   explicit RenderbufferAttachment(
       RenderbufferManager::RenderbufferInfo* renderbuffer)
       : renderbuffer_(renderbuffer) {
   }
 
-  virtual GLsizei width() const {
+  virtual GLsizei width() const OVERRIDE {
     return renderbuffer_->width();
   }
 
-  virtual GLsizei height() const {
+  virtual GLsizei height() const OVERRIDE {
     return renderbuffer_->height();
   }
 
-  virtual GLenum internal_format() const {
+  virtual GLenum internal_format() const OVERRIDE {
     return renderbuffer_->internal_format();
   }
 
-  virtual GLsizei samples() const {
+  virtual GLsizei samples() const OVERRIDE {
     return renderbuffer_->samples();
   }
 
-  virtual bool cleared() const {
+  virtual bool cleared() const OVERRIDE {
     return renderbuffer_->cleared();
   }
 
   virtual void SetCleared(
       RenderbufferManager* renderbuffer_manager,
-      TextureManager* /* texture_manager */) {
+      TextureManager* /* texture_manager */) OVERRIDE {
     renderbuffer_manager->SetCleared(renderbuffer_);
   }
 
-  virtual bool IsTexture(TextureManager::TextureInfo* /* texture */) const {
+  virtual bool IsTexture(
+      TextureManager::TextureInfo* /* texture */) const OVERRIDE {
     return false;
   }
 
   virtual bool IsRenderbuffer(
-       RenderbufferManager::RenderbufferInfo* renderbuffer) const {
+       RenderbufferManager::RenderbufferInfo* renderbuffer) const OVERRIDE {
      return renderbuffer_ == renderbuffer;
   }
 
-  virtual bool CanRenderTo() const {
+  virtual bool CanRenderTo() const OVERRIDE {
     return true;
   }
 
-  virtual void DetachFromFramebuffer() {
+  virtual void DetachFromFramebuffer() OVERRIDE {
     // Nothing to do for renderbuffers.
   }
 
-  virtual bool ValidForAttachmentType(GLenum attachment_type) {
+  virtual bool ValidForAttachmentType(GLenum attachment_type) OVERRIDE {
     uint32 need = GLES2Util::GetChannelsNeededForAttachmentType(
         attachment_type);
     uint32 have = GLES2Util::GetChannelsForFormat(internal_format());
     return (need & have) != 0;
   }
 
   RenderbufferManager::RenderbufferInfo* renderbuffer() const {
     return renderbuffer_.get();
   }
 
  protected:
   virtual ~RenderbufferAttachment() { }
 
  private:
   RenderbufferManager::RenderbufferInfo::Ref renderbuffer_;
 
   DISALLOW_COPY_AND_ASSIGN(RenderbufferAttachment);
 };
 
 class TextureAttachment
     : public FramebufferManager::FramebufferInfo::Attachment {
  public:
   TextureAttachment(
       TextureManager::TextureInfo* texture, GLenum target, GLint level)
       : texture_(texture),
         target_(target),
         level_(level) {
   }
 
-  virtual GLsizei width() const {
+  virtual GLsizei width() const OVERRIDE {
     GLsizei temp_width = 0;
     GLsizei temp_height = 0;
     texture_->GetLevelSize(target_, level_, &temp_width, &temp_height);
     return temp_width;
   }
 
-  virtual GLsizei height() const {
+  virtual GLsizei height() const OVERRIDE {
     GLsizei temp_width = 0;
     GLsizei temp_height = 0;
     texture_->GetLevelSize(target_, level_, &temp_width, &temp_height);
     return temp_height;
   }
 
-  virtual GLenum internal_format() const {
+  virtual GLenum internal_format() const OVERRIDE {
     GLenum temp_type = 0;
     GLenum temp_internal_format = 0;
     texture_->GetLevelType(target_, level_, &temp_type, &temp_internal_format);
     return temp_internal_format;
   }
 
-  virtual GLsizei samples() const {
+  virtual GLsizei samples() const OVERRIDE {
     return 0;
   }
 
-  virtual bool cleared() const {
+  virtual bool cleared() const OVERRIDE {
     return texture_->IsLevelCleared(target_, level_);
   }
 
   virtual void SetCleared(
       RenderbufferManager* /* renderbuffer_manager */,
-      TextureManager* texture_manager) {
+      TextureManager* texture_manager) OVERRIDE {
     texture_manager->SetLevelCleared(texture_, target_, level_);
   }
 
-  virtual bool IsTexture(TextureManager::TextureInfo* texture) const {
+  virtual bool IsTexture(TextureManager::TextureInfo* texture) const OVERRIDE {
     return texture == texture_.get();
   }
 
   virtual bool IsRenderbuffer(
-       RenderbufferManager::RenderbufferInfo* /* renderbuffer */) const {
+       RenderbufferManager::RenderbufferInfo* /* renderbuffer */)
+          const OVERRIDE {
     return false;
   }
 
   TextureManager::TextureInfo* texture() const {
     return texture_.get();
   }
 
-  virtual bool CanRenderTo() const {
+  virtual bool CanRenderTo() const OVERRIDE {
     return texture_->CanRenderTo();
   }
 
-  virtual void DetachFromFramebuffer() {
+  virtual void DetachFromFramebuffer() OVERRIDE {
     texture_->DetachFromFramebuffer();
   }
 
-  virtual bool ValidForAttachmentType(GLenum attachment_type) {
+  virtual bool ValidForAttachmentType(GLenum attachment_type) OVERRIDE {
     GLenum type = 0;
     GLenum internal_format = 0;
     if (!texture_->GetLevelType(target_, level_, &type, &internal_format)) {
       return false;
     }
     uint32 need = GLES2Util::GetChannelsNeededForAttachmentType(
         attachment_type);
     uint32 have = GLES2Util::GetChannelsForFormat(internal_format);
     return (need & have) != 0;
   }
 
  protected:
-  virtual ~TextureAttachment() { }
+  virtual ~TextureAttachment() {}
 
  private:
   TextureManager::TextureInfo::Ref texture_;
   GLenum target_;
   GLint level_;
 
   DISALLOW_COPY_AND_ASSIGN(TextureAttachment);
 };
 
 FramebufferManager::FramebufferManager()
@@ skipping 284 matching lines @@
     FramebufferManager::FramebufferInfo* framebuffer) {
   DCHECK(framebuffer);
   return framebuffer->framebuffer_complete_state_count_id() ==
       framebuffer_state_change_count_;
 }
 
 }  // namespace gles2
 }  // namespace gpu