Add a base class of Texture for interfacing with the mailbox manager.

gpu/command_buffer/service/texture_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/texture_manager.h"
 
 #include <stddef.h>
 #include <stdint.h>
 
 #include <algorithm>
@@ skipping 335 matching lines @@
     default_textures_[ii] = NULL;
   }
 
   if (have_context) {
     glDeleteTextures(arraysize(black_texture_ids_), black_texture_ids_);
   }
 
   DCHECK_EQ(0u, memory_type_tracker_->GetMemRepresented());
 }
 
+TextureBase::TextureBase(GLuint service_id)
+    : service_id_(service_id), mailbox_manager_(nullptr) {}
+
+TextureBase::~TextureBase() {
+    DCHECK_EQ(nullptr, mailbox_manager_);

[piman, 2016/09/07 17:38:31]

nit: use chromium style for indents and {} below ('git cl format' is your
friend)

[Geoff Lang, 2016/09/07 18:14:49]

Done.

+}
+
+void TextureBase::DeleteFromMailboxManager()
+{
+    if (mailbox_manager_) {
+        mailbox_manager_->TextureDeleted(this);
+        mailbox_manager_ = nullptr;
+    }
+}
+
+void TextureBase::SetMailboxManager(MailboxManager* mailbox_manager) {
+  DCHECK(!mailbox_manager_ || mailbox_manager_ == mailbox_manager);
+  mailbox_manager_ = mailbox_manager;
+}
+
+Texture* TextureBase::AsTexture() {
+  return nullptr;
+}
+
 Texture::Texture(GLuint service_id)
-    : mailbox_manager_(NULL),
+    : TextureBase(service_id),
       memory_tracking_ref_(NULL),
-      service_id_(service_id),
       owned_service_id_(service_id),
       cleared_(true),
       num_uncleared_mips_(0),
       num_npot_faces_(0),
       target_(0),
       usage_(GL_NONE),
       base_level_(0),
       max_level_(1000),
       swizzle_r_(GL_RED),
       swizzle_g_(GL_GREEN),
       swizzle_b_(GL_BLUE),
       swizzle_a_(GL_ALPHA),
       max_level_set_(-1),
       texture_complete_(false),
       texture_mips_dirty_(false),
       cube_complete_(false),
       npot_(false),
       has_been_bound_(false),
       framebuffer_attachment_count_(0),
       immutable_(false),
       has_images_(false),
       estimated_size_(0),
       can_render_condition_(CAN_RENDER_ALWAYS),
       texture_max_anisotropy_initialized_(false),
       compatibility_swizzle_(nullptr),
       emulating_rgb_(false) {}
 
 Texture::~Texture() {
-  if (mailbox_manager_)
-    mailbox_manager_->TextureDeleted(this);
+    DeleteFromMailboxManager();
+}
+
+Texture* Texture::AsTexture() {
+  return this;
 }
 
 void Texture::AddTextureRef(TextureRef* ref) {
   DCHECK(refs_.find(ref) == refs_.end());
   refs_.insert(ref);
   if (!memory_tracking_ref_) {
     memory_tracking_ref_ = ref;
     GetMemTracker()->TrackMemAlloc(estimated_size());
   }
 }
@@ skipping 194 matching lines @@
                                   CanRender(feature_info),
                                   CanRenderTo(feature_info, level),
                                   npot_,
                                   emulating_rgb_);
 
   signature->append(TextureTag, sizeof(TextureTag));
   signature->append(reinterpret_cast<const char*>(&signature_data),
                     sizeof(signature_data));
 }
 
-void Texture::SetMailboxManager(MailboxManager* mailbox_manager) {
-  DCHECK(!mailbox_manager_ || mailbox_manager_ == mailbox_manager);
-  mailbox_manager_ = mailbox_manager;
-}
-
 void Texture::MarkMipmapsGenerated() {
   for (size_t ii = 0; ii < face_infos_.size(); ++ii) {
     const Texture::FaceInfo& face_info = face_infos_[ii];
     const Texture::LevelInfo& level0_info = face_info.level_infos[base_level_];
     GLsizei width = level0_info.width;
     GLsizei height = level0_info.height;
     GLsizei depth = level0_info.depth;
     GLenum target = target_ == GL_TEXTURE_CUBE_MAP ?
         GLES2Util::IndexToGLFaceTarget(ii) : target_;
 
@@ skipping 2764 matching lines @@
 uint32_t TextureManager::GetServiceIdGeneration() const {
   return current_service_id_generation_;
 }
 
 void TextureManager::IncrementServiceIdGeneration() {
   current_service_id_generation_++;
 }
 
 }  // namespace gles2
 }  // namespace gpu