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

gpu/command_buffer/service/mailbox_manager_unittest.cc

 // Copyright 2013 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 "base/macros.h"
 #include "gpu/command_buffer/common/sync_token.h"
 #include "gpu/command_buffer/service/feature_info.h"
 #include "gpu/command_buffer/service/gpu_service_test.h"
 #include "gpu/command_buffer/service/mailbox_manager_impl.h"
 #include "gpu/command_buffer/service/mailbox_manager_sync.h"
@@ skipping 62 matching lines @@
                        GLenum target,
                        GLint level,
                        bool cleared) {
     texture->SetLevelCleared(target, level, cleared);
   }
 
   GLenum SetParameter(Texture* texture, GLenum pname, GLint param) {
     return texture->SetParameteri(feature_info_.get(), pname, param);
   }
 
-  void DestroyTexture(Texture* texture) {
-    delete texture;
-  }
+  void DestroyTexture(TextureBase* texture) { delete texture; }
 
   scoped_refptr<MailboxManager> manager_;
 
  private:
   scoped_refptr<FeatureInfo> feature_info_;
 
   DISALLOW_COPY_AND_ASSIGN(MailboxManagerTest);
 };
 
 // Tests basic produce/consume behavior.
@@ skipping 228 matching lines @@
   EXPECT_EQ(texture, manager_->ConsumeTexture(name));
 
   // Synchronize
   manager_->PushTextureUpdates(g_sync_token);
   manager2_->PullTextureUpdates(g_sync_token);
 
   EXPECT_CALL(*gl_, GenTextures(1, _))
       .WillOnce(SetArgPointee<1>(kNewTextureId));
   SetupUpdateTexParamExpectations(
       kNewTextureId, GL_LINEAR, GL_LINEAR, GL_REPEAT, GL_REPEAT);
-  Texture* new_texture = manager2_->ConsumeTexture(name);
-  EXPECT_FALSE(new_texture == NULL);
+  Texture* new_texture = static_cast<Texture*>(manager2_->ConsumeTexture(name));
+  EXPECT_NE(nullptr, new_texture);
   EXPECT_NE(texture, new_texture);
   EXPECT_EQ(kNewTextureId, new_texture->service_id());
 
   // Resize original texture
   SetLevelInfo(texture, GL_TEXTURE_2D, 0, GL_RGBA, 16, 32, 1, 0, GL_RGBA,
                GL_UNSIGNED_BYTE, gfx::Rect(16, 32));
   // Should have been orphaned
   EXPECT_TRUE(texture->GetLevelImage(GL_TEXTURE_2D, 0) == NULL);
 
   // Synchronize again
@@ skipping 35 matching lines @@
 // pushed in both directions, i.e. makes sure we don't clobber a shared
 // texture definition with an older version.
 TEST_F(MailboxManagerSyncTest, ProduceConsumeBidirectional) {
   const GLuint kNewTextureId1 = 1234;
   const GLuint kNewTextureId2 = 4321;
 
   Texture* texture1 = DefineTexture();
   Mailbox name1 = Mailbox::Generate();
   Texture* texture2 = DefineTexture();
   Mailbox name2 = Mailbox::Generate();
-  Texture* new_texture1 = NULL;
-  Texture* new_texture2 = NULL;
+  TextureBase* new_texture1 = NULL;
+  TextureBase* new_texture2 = NULL;
 
   manager_->ProduceTexture(name1, texture1);
   manager2_->ProduceTexture(name2, texture2);
 
   // Make visible.
   manager_->PushTextureUpdates(g_sync_token);
   manager2_->PushTextureUpdates(g_sync_token);
 
   // Create textures in the other manager instances for texture1 and texture2,
   // respectively to create a real sharing scenario. Otherwise, there would
@@ skipping 61 matching lines @@
   EXPECT_EQ(texture, manager_->ConsumeTexture(name));
 
   // Synchronize
   manager_->PushTextureUpdates(g_sync_token);
   manager2_->PullTextureUpdates(g_sync_token);
 
   EXPECT_CALL(*gl_, GenTextures(1, _))
       .WillOnce(SetArgPointee<1>(kNewTextureId));
   SetupUpdateTexParamExpectations(
       kNewTextureId, GL_LINEAR, GL_LINEAR, GL_REPEAT, GL_REPEAT);
-  Texture* new_texture = manager2_->ConsumeTexture(name);
-  EXPECT_FALSE(new_texture == NULL);
+  Texture* new_texture = static_cast<Texture*>(manager2_->ConsumeTexture(name));
+  EXPECT_NE(nullptr, new_texture);
   EXPECT_NE(texture, new_texture);
   EXPECT_EQ(kNewTextureId, new_texture->service_id());
 
   Texture* old_texture = texture;
   texture = DefineTexture();
   manager_->ProduceTexture(name, texture);
 
   // Make a change to the new texture
   DCHECK_EQ(static_cast<GLuint>(GL_LINEAR), texture->min_filter());
   EXPECT_EQ(static_cast<GLenum>(GL_NO_ERROR),
@@ skipping 12 matching lines @@
   // Synchronize and expect update
   manager_->PushTextureUpdates(g_sync_token);
   SetupUpdateTexParamExpectations(
       new_texture->service_id(), GL_LINEAR, GL_NEAREST, GL_REPEAT, GL_REPEAT);
   manager2_->PullTextureUpdates(g_sync_token);
 
   EXPECT_CALL(*gl_, GenTextures(1, _))
       .WillOnce(SetArgPointee<1>(kNewTextureId));
   SetupUpdateTexParamExpectations(
       kNewTextureId, GL_NEAREST, GL_LINEAR, GL_REPEAT, GL_REPEAT);
-  Texture* tmp_texture = manager2_->ConsumeTexture(name);
+  TextureBase* tmp_texture = manager2_->ConsumeTexture(name);
   EXPECT_NE(new_texture, tmp_texture);
   DestroyTexture(tmp_texture);
 
   DestroyTexture(old_texture);
   DestroyTexture(texture);
   DestroyTexture(new_texture);
 
   EXPECT_EQ(NULL, manager_->ConsumeTexture(name));
   EXPECT_EQ(NULL, manager2_->ConsumeTexture(name));
 }
@@ skipping 10 matching lines @@
   EXPECT_EQ(texture, manager_->ConsumeTexture(name));
 
   // Synchronize
   manager_->PushTextureUpdates(g_sync_token);
   manager2_->PullTextureUpdates(g_sync_token);
 
   EXPECT_CALL(*gl_, GenTextures(1, _))
       .WillOnce(SetArgPointee<1>(kNewTextureId));
   SetupUpdateTexParamExpectations(
       kNewTextureId, GL_LINEAR, GL_LINEAR, GL_REPEAT, GL_REPEAT);
-  Texture* new_texture = manager2_->ConsumeTexture(name);
-  EXPECT_FALSE(new_texture == NULL);
+  Texture* new_texture = static_cast<Texture*>(manager2_->ConsumeTexture(name));
+  EXPECT_NE(nullptr, new_texture);
   EXPECT_NE(texture, new_texture);
   EXPECT_EQ(kNewTextureId, new_texture->service_id());
   EXPECT_TRUE(texture->SafeToRenderFrom());
 
   // Change cleared to false.
   SetLevelCleared(texture, texture->target(), 0, false);
   EXPECT_FALSE(texture->SafeToRenderFrom());
 
   // Synchronize
   manager_->PushTextureUpdates(g_sync_token);
@@ skipping 26 matching lines @@
   // Synchronize
   manager_->PushTextureUpdates(g_sync_token);
   manager2_->PullTextureUpdates(g_sync_token);
 
   // Should sync to new texture which is not defined.
   EXPECT_CALL(*gl_, GenTextures(1, _))
       .WillOnce(SetArgPointee<1>(kNewTextureId));
   SetupUpdateTexParamExpectations(kNewTextureId, texture->min_filter(),
                                   texture->mag_filter(), texture->wrap_s(),
                                   texture->wrap_t());
-  Texture* new_texture = manager2_->ConsumeTexture(name);
-  ASSERT_TRUE(new_texture);
+  Texture* new_texture = static_cast<Texture*>(manager2_->ConsumeTexture(name));
+  EXPECT_NE(nullptr, new_texture);
   EXPECT_NE(texture, new_texture);
   EXPECT_EQ(kNewTextureId, new_texture->service_id());
   EXPECT_FALSE(new_texture->IsDefined());
 
   // Change cleared to false.
   SetLevelInfo(texture, GL_TEXTURE_2D, 0, GL_RGBA, 1, 1, 1, 0, GL_RGBA,
                GL_UNSIGNED_BYTE, gfx::Rect(1, 1));
   SetParameter(texture, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
   SetParameter(texture, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
   EXPECT_TRUE(texture->IsDefined());
@@ skipping 26 matching lines @@
 
   manager_->ProduceTexture(name1, texture);
 
   // Share
   manager_->PushTextureUpdates(g_sync_token);
   EXPECT_CALL(*gl_, GenTextures(1, _))
       .WillOnce(SetArgPointee<1>(kNewTextureId));
   manager2_->PullTextureUpdates(g_sync_token);
   SetupUpdateTexParamExpectations(
       kNewTextureId, GL_LINEAR, GL_LINEAR, GL_REPEAT, GL_REPEAT);
-  Texture* new_texture = manager2_->ConsumeTexture(name1);
+  TextureBase* new_texture = manager2_->ConsumeTexture(name1);
   EXPECT_EQ(kNewTextureId, new_texture->service_id());
 
   manager_->ProduceTexture(name2, texture);
 
   // Synchronize
   manager_->PushTextureUpdates(g_sync_token);
   manager2_->PullTextureUpdates(g_sync_token);
 
   // name2 should return the same texture
   EXPECT_EQ(new_texture, manager2_->ConsumeTexture(name2));
@@ skipping 17 matching lines @@
   Mailbox name = Mailbox::Generate();
 
   manager_->ProduceTexture(name, texture1);
 
   // Share
   manager_->PushTextureUpdates(g_sync_token);
   EXPECT_CALL(*gl_, GenTextures(1, _))
       .WillOnce(SetArgPointee<1>(kNewTextureId));
   SetupUpdateTexParamExpectations(
       kNewTextureId, GL_LINEAR, GL_LINEAR, GL_REPEAT, GL_REPEAT);
-  Texture* new_texture = manager2_->ConsumeTexture(name);
+  TextureBase* new_texture = manager2_->ConsumeTexture(name);
   EXPECT_EQ(kNewTextureId, new_texture->service_id());
 
   // Clobber
   manager2_->ProduceTexture(name, texture2);
   manager_->ProduceTexture(name, texture1);
 
   // Synchronize manager -> manager2
   manager_->PushTextureUpdates(g_sync_token);
   manager2_->PullTextureUpdates(g_sync_token);
 
   // name should return the original texture, and not texture2 or a new one.
   EXPECT_EQ(new_texture, manager2_->ConsumeTexture(name));
 
   DestroyTexture(texture1);
   DestroyTexture(texture2);
   DestroyTexture(new_texture);
 }
 
 // TODO: Texture::level_infos_[][].size()
 
 // TODO: unsupported targets and formats
 
 }  // namespace gles2
 }  // namespace gpu