Update gpu/ to use scoped_refptr<T>::get() rather than implicit "operator T*"

gpu/command_buffer/service/framebuffer_manager_unittest.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/error_state_mock.h"
 #include "gpu/command_buffer/service/framebuffer_manager.h"
 #include "gpu/command_buffer/service/feature_info.h"
 #include "gpu/command_buffer/service/renderbuffer_manager.h"
 #include "gpu/command_buffer/service/test_helper.h"
 #include "gpu/command_buffer/service/texture_manager.h"
@@ skipping 413 matching lines @@
   EXPECT_FALSE(framebuffer_->HasUnclearedAttachment(GL_DEPTH_ATTACHMENT));
   EXPECT_FALSE(framebuffer_->HasUnclearedAttachment(GL_STENCIL_ATTACHMENT));
   EXPECT_FALSE(
       framebuffer_->HasUnclearedAttachment(GL_DEPTH_STENCIL_ATTACHMENT));
   EXPECT_EQ(static_cast<GLenum>(GL_FRAMEBUFFER_INCOMPLETE_MISSING_ATTACHMENT),
             framebuffer_->IsPossiblyComplete());
 
   texture_manager_.CreateTexture(kTextureClient1Id, kTextureService1Id);
   scoped_refptr<TextureRef> texture1(
       texture_manager_.GetTexture(kTextureClient1Id));
-  ASSERT_TRUE(texture1 != NULL);
+  ASSERT_TRUE(texture1.get() != NULL);
 
   // check adding one attachment
   framebuffer_->AttachTexture(
-      GL_COLOR_ATTACHMENT0, texture1, kTarget1, kLevel1);
+      GL_COLOR_ATTACHMENT0, texture1.get(), kTarget1, kLevel1);
   EXPECT_FALSE(framebuffer_->HasUnclearedAttachment(GL_COLOR_ATTACHMENT0));
   EXPECT_EQ(static_cast<GLenum>(GL_FRAMEBUFFER_INCOMPLETE_ATTACHMENT),
             framebuffer_->IsPossiblyComplete());
   EXPECT_TRUE(framebuffer_->IsCleared());
   EXPECT_EQ(static_cast<GLenum>(0), framebuffer_->GetColorAttachmentFormat());
 
   // Try format that doesn't work with COLOR_ATTACHMENT0
-  texture_manager_.SetTarget(texture1, GL_TEXTURE_2D);
-  texture_manager_.SetLevelInfo(
-      texture1, GL_TEXTURE_2D, kLevel1,
-      kBadFormat1, kWidth1, kHeight1, kDepth, kBorder, kBadFormat1, kType,
-      true);
+  texture_manager_.SetTarget(texture1.get(), GL_TEXTURE_2D);
+  texture_manager_.SetLevelInfo(texture1.get(),
+                                GL_TEXTURE_2D,
+                                kLevel1,
+                                kBadFormat1,
+                                kWidth1,
+                                kHeight1,
+                                kDepth,
+                                kBorder,
+                                kBadFormat1,
+                                kType,
+                                true);
   EXPECT_EQ(static_cast<GLenum>(GL_FRAMEBUFFER_INCOMPLETE_ATTACHMENT),
             framebuffer_->IsPossiblyComplete());
 
   // Try a good format.
-  texture_manager_.SetLevelInfo(
-      texture1, GL_TEXTURE_2D, kLevel1,
-      kFormat1, kWidth1, kHeight1, kDepth, kBorder, kFormat1, kType, false);
+  texture_manager_.SetLevelInfo(texture1.get(),
+                                GL_TEXTURE_2D,
+                                kLevel1,
+                                kFormat1,
+                                kWidth1,
+                                kHeight1,
+                                kDepth,
+                                kBorder,
+                                kFormat1,
+                                kType,
+                                false);
   EXPECT_EQ(static_cast<GLenum>(GL_FRAMEBUFFER_COMPLETE),
             framebuffer_->IsPossiblyComplete());
   EXPECT_FALSE(framebuffer_->IsCleared());
-  texture_manager_.SetLevelInfo(
-      texture1, GL_TEXTURE_2D, kLevel1,
-      kFormat1, kWidth1, kHeight1, kDepth, kBorder, kFormat1, kType, true);
+  texture_manager_.SetLevelInfo(texture1.get(),
+                                GL_TEXTURE_2D,
+                                kLevel1,
+                                kFormat1,
+                                kWidth1,
+                                kHeight1,
+                                kDepth,
+                                kBorder,
+                                kFormat1,
+                                kType,
+                                true);
   EXPECT_EQ(static_cast<GLenum>(GL_FRAMEBUFFER_COMPLETE),
             framebuffer_->IsPossiblyComplete());
   EXPECT_TRUE(framebuffer_->IsCleared());
   EXPECT_EQ(static_cast<GLenum>(kFormat1),
             framebuffer_->GetColorAttachmentFormat());
 
   const Framebuffer::Attachment* attachment =
       framebuffer_->GetAttachment(GL_COLOR_ATTACHMENT0);
   ASSERT_TRUE(attachment != NULL);
   EXPECT_EQ(kWidth1, attachment->width());
   EXPECT_EQ(kHeight1, attachment->height());
   EXPECT_EQ(kSamples1, attachment->samples());
   EXPECT_EQ(kFormat1, attachment->internal_format());
   EXPECT_TRUE(attachment->cleared());
 
   // Check replacing an attachment
   texture_manager_.CreateTexture(kTextureClient2Id, kTextureService2Id);
   scoped_refptr<TextureRef> texture2(
       texture_manager_.GetTexture(kTextureClient2Id));
-  ASSERT_TRUE(texture2 != NULL);
-  texture_manager_.SetTarget(texture2, GL_TEXTURE_2D);
-  texture_manager_.SetLevelInfo(
-      texture2, GL_TEXTURE_2D, kLevel2,
-      kFormat2, kWidth2, kHeight2, kDepth, kBorder, kFormat2, kType, true);
+  ASSERT_TRUE(texture2.get() != NULL);
+  texture_manager_.SetTarget(texture2.get(), GL_TEXTURE_2D);
+  texture_manager_.SetLevelInfo(texture2.get(),
+                                GL_TEXTURE_2D,
+                                kLevel2,
+                                kFormat2,
+                                kWidth2,
+                                kHeight2,
+                                kDepth,
+                                kBorder,
+                                kFormat2,
+                                kType,
+                                true);
 
   framebuffer_->AttachTexture(
-      GL_COLOR_ATTACHMENT0, texture2, kTarget2, kLevel2);
+      GL_COLOR_ATTACHMENT0, texture2.get(), kTarget2, kLevel2);
   EXPECT_EQ(static_cast<GLenum>(kFormat2),
             framebuffer_->GetColorAttachmentFormat());
   EXPECT_EQ(static_cast<GLenum>(GL_FRAMEBUFFER_COMPLETE),
             framebuffer_->IsPossiblyComplete());
   EXPECT_TRUE(framebuffer_->IsCleared());
 
   attachment = framebuffer_->GetAttachment(GL_COLOR_ATTACHMENT0);
   ASSERT_TRUE(attachment != NULL);
   EXPECT_EQ(kWidth2, attachment->width());
   EXPECT_EQ(kHeight2, attachment->height());
   EXPECT_EQ(kSamples2, attachment->samples());
   EXPECT_EQ(kFormat2, attachment->internal_format());
   EXPECT_TRUE(attachment->cleared());
 
   // Check changing attachment
-  texture_manager_.SetLevelInfo(
-      texture2, GL_TEXTURE_2D, kLevel3,
-      kFormat3, kWidth3, kHeight3, kDepth, kBorder, kFormat3, kType, false);
+  texture_manager_.SetLevelInfo(texture2.get(),
+                                GL_TEXTURE_2D,
+                                kLevel3,
+                                kFormat3,
+                                kWidth3,
+                                kHeight3,
+                                kDepth,
+                                kBorder,
+                                kFormat3,
+                                kType,
+                                false);
   attachment = framebuffer_->GetAttachment(GL_COLOR_ATTACHMENT0);
   ASSERT_TRUE(attachment != NULL);
   EXPECT_EQ(kWidth3, attachment->width());
   EXPECT_EQ(kHeight3, attachment->height());
   EXPECT_EQ(kSamples3, attachment->samples());
   EXPECT_EQ(kFormat3, attachment->internal_format());
   EXPECT_FALSE(attachment->cleared());
   EXPECT_EQ(static_cast<GLenum>(kFormat3),
             framebuffer_->GetColorAttachmentFormat());
   EXPECT_EQ(static_cast<GLenum>(GL_FRAMEBUFFER_COMPLETE),
             framebuffer_->IsPossiblyComplete());
   EXPECT_FALSE(framebuffer_->IsCleared());
 
   // Set to size 0
-  texture_manager_.SetLevelInfo(
-      texture2, GL_TEXTURE_2D, kLevel3,
-      kFormat3, 0, 0, kDepth, kBorder, kFormat3, kType, false);
+  texture_manager_.SetLevelInfo(texture2.get(),
+                                GL_TEXTURE_2D,
+                                kLevel3,
+                                kFormat3,
+                                0,
+                                0,
+                                kDepth,
+                                kBorder,
+                                kFormat3,
+                                kType,
+                                false);
   EXPECT_EQ(static_cast<GLenum>(GL_FRAMEBUFFER_INCOMPLETE_ATTACHMENT),
             framebuffer_->IsPossiblyComplete());
 
   // Check removing it.
   framebuffer_->AttachTexture(GL_COLOR_ATTACHMENT0, NULL, 0, 0);
   EXPECT_TRUE(framebuffer_->GetAttachment(GL_COLOR_ATTACHMENT0) == NULL);
   EXPECT_EQ(static_cast<GLenum>(0), framebuffer_->GetColorAttachmentFormat());
 
   EXPECT_EQ(static_cast<GLenum>(GL_FRAMEBUFFER_INCOMPLETE_MISSING_ATTACHMENT),
             framebuffer_->IsPossiblyComplete());
@@ skipping 39 matching lines @@
   const GLuint kTextureClient1Id = 33;
   const GLuint kTextureService1Id = 333;
   const GLuint kTextureClient2Id = 34;
   const GLuint kTextureService2Id = 334;
   const GLenum kTarget1 = GL_TEXTURE_2D;
   const GLint kLevel1 = 0;
 
   texture_manager_.CreateTexture(kTextureClient1Id, kTextureService1Id);
   scoped_refptr<TextureRef> texture1(
       texture_manager_.GetTexture(kTextureClient1Id));
-  ASSERT_TRUE(texture1 != NULL);
+  ASSERT_TRUE(texture1.get() != NULL);
   texture_manager_.CreateTexture(kTextureClient2Id, kTextureService2Id);
   scoped_refptr<TextureRef> texture2(
       texture_manager_.GetTexture(kTextureClient2Id));
-  ASSERT_TRUE(texture2 != NULL);
+  ASSERT_TRUE(texture2.get() != NULL);
 
   // Attach to 2 attachment points.
   framebuffer_->AttachTexture(
-      GL_COLOR_ATTACHMENT0, texture1, kTarget1, kLevel1);
+      GL_COLOR_ATTACHMENT0, texture1.get(), kTarget1, kLevel1);
   framebuffer_->AttachTexture(
-      GL_DEPTH_ATTACHMENT, texture1, kTarget1, kLevel1);
+      GL_DEPTH_ATTACHMENT, texture1.get(), kTarget1, kLevel1);
   // Check they were attached.
   EXPECT_TRUE(framebuffer_->GetAttachment(GL_COLOR_ATTACHMENT0) != NULL);
   EXPECT_TRUE(framebuffer_->GetAttachment(GL_DEPTH_ATTACHMENT) != NULL);
   // Unbind unattached texture.
-  framebuffer_->UnbindTexture(kTarget1, texture2);
+  framebuffer_->UnbindTexture(kTarget1, texture2.get());
   // Should be no-op.
   EXPECT_TRUE(framebuffer_->GetAttachment(GL_COLOR_ATTACHMENT0) != NULL);
   EXPECT_TRUE(framebuffer_->GetAttachment(GL_DEPTH_ATTACHMENT) != NULL);
   // Unbind texture.
-  framebuffer_->UnbindTexture(kTarget1, texture1);
+  framebuffer_->UnbindTexture(kTarget1, texture1.get());
   // Check they were detached
   EXPECT_TRUE(framebuffer_->GetAttachment(GL_COLOR_ATTACHMENT0) == NULL);
   EXPECT_TRUE(framebuffer_->GetAttachment(GL_DEPTH_ATTACHMENT) == NULL);
 }
 
 TEST_F(FramebufferInfoTest, IsCompleteMarkAsComplete) {
   const GLuint kRenderbufferClient1Id = 33;
   const GLuint kRenderbufferService1Id = 333;
   const GLuint kTextureClient2Id = 34;
   const GLuint kTextureService2Id = 334;
   const GLenum kTarget1 = GL_TEXTURE_2D;
   const GLint kLevel1 = 0;
 
   renderbuffer_manager_.CreateRenderbuffer(
       kRenderbufferClient1Id, kRenderbufferService1Id);
   Renderbuffer* renderbuffer1 =
       renderbuffer_manager_.GetRenderbuffer(kRenderbufferClient1Id);
   ASSERT_TRUE(renderbuffer1 != NULL);
   texture_manager_.CreateTexture(kTextureClient2Id, kTextureService2Id);
   scoped_refptr<TextureRef> texture2(
       texture_manager_.GetTexture(kTextureClient2Id));
-  ASSERT_TRUE(texture2 != NULL);
+  ASSERT_TRUE(texture2.get() != NULL);
 
   // Check MarkAsComlete marks as complete.
   manager_.MarkAsComplete(framebuffer_);
   EXPECT_TRUE(manager_.IsComplete(framebuffer_));
 
   // Check at attaching marks as not complete.
   framebuffer_->AttachTexture(
-      GL_COLOR_ATTACHMENT0, texture2, kTarget1, kLevel1);
+      GL_COLOR_ATTACHMENT0, texture2.get(), kTarget1, kLevel1);
   EXPECT_FALSE(manager_.IsComplete(framebuffer_));
   manager_.MarkAsComplete(framebuffer_);
   EXPECT_TRUE(manager_.IsComplete(framebuffer_));
   framebuffer_->AttachRenderbuffer(GL_DEPTH_ATTACHMENT, renderbuffer1);
   EXPECT_FALSE(manager_.IsComplete(framebuffer_));
 
   // Check MarkAttachmentsAsCleared marks as complete.
   manager_.MarkAttachmentsAsCleared(
       framebuffer_, &renderbuffer_manager_, &texture_manager_);
   EXPECT_TRUE(manager_.IsComplete(framebuffer_));
 
   // Check Unbind marks as not complete.
   framebuffer_->UnbindRenderbuffer(GL_RENDERBUFFER, renderbuffer1);
   EXPECT_FALSE(manager_.IsComplete(framebuffer_));
   manager_.MarkAsComplete(framebuffer_);
   EXPECT_TRUE(manager_.IsComplete(framebuffer_));
-  framebuffer_->UnbindTexture(kTarget1, texture2);
+  framebuffer_->UnbindTexture(kTarget1, texture2.get());
   EXPECT_FALSE(manager_.IsComplete(framebuffer_));
 }
 
 TEST_F(FramebufferInfoTest, GetStatus) {
   const GLuint kRenderbufferClient1Id = 33;
   const GLuint kRenderbufferService1Id = 333;
   const GLuint kTextureClient2Id = 34;
   const GLuint kTextureService2Id = 334;
   const GLenum kTarget1 = GL_TEXTURE_2D;
   const GLint kLevel1 = 0;
 
   renderbuffer_manager_.CreateRenderbuffer(
       kRenderbufferClient1Id, kRenderbufferService1Id);
   Renderbuffer* renderbuffer1 =
       renderbuffer_manager_.GetRenderbuffer(kRenderbufferClient1Id);
   ASSERT_TRUE(renderbuffer1 != NULL);
   texture_manager_.CreateTexture(kTextureClient2Id, kTextureService2Id);
   scoped_refptr<TextureRef> texture2(
       texture_manager_.GetTexture(kTextureClient2Id));
-  ASSERT_TRUE(texture2 != NULL);
-  texture_manager_.SetTarget(texture2, GL_TEXTURE_2D);
+  ASSERT_TRUE(texture2.get() != NULL);
+  texture_manager_.SetTarget(texture2.get(), GL_TEXTURE_2D);
 
   EXPECT_CALL(*gl_, CheckFramebufferStatusEXT(GL_FRAMEBUFFER))
       .WillOnce(Return(GL_FRAMEBUFFER_COMPLETE))
       .RetiresOnSaturation();
   framebuffer_->GetStatus(&texture_manager_, GL_FRAMEBUFFER);
 
   // Check a second call for the same type does not call anything
   if (!framebuffer_->AllowFramebufferComboCompleteMapForTesting()) {
     EXPECT_CALL(*gl_, CheckFramebufferStatusEXT(GL_FRAMEBUFFER))
         .WillOnce(Return(GL_FRAMEBUFFER_COMPLETE))
         .RetiresOnSaturation();
   }
   framebuffer_->GetStatus(&texture_manager_, GL_FRAMEBUFFER);
 
   // Check changing the attachments calls CheckFramebufferStatus.
   framebuffer_->AttachTexture(
-      GL_COLOR_ATTACHMENT0, texture2, kTarget1, kLevel1);
+      GL_COLOR_ATTACHMENT0, texture2.get(), kTarget1, kLevel1);
   EXPECT_CALL(*gl_, CheckFramebufferStatusEXT(GL_FRAMEBUFFER))
-      .WillOnce(Return(GL_FRAMEBUFFER_COMPLETE))
-      .RetiresOnSaturation();
+      .WillOnce(Return(GL_FRAMEBUFFER_COMPLETE)).RetiresOnSaturation();
   framebuffer_->GetStatus(&texture_manager_, GL_FRAMEBUFFER);
 
   // Check a second call for the same type does not call anything.
   if (!framebuffer_->AllowFramebufferComboCompleteMapForTesting()) {
     EXPECT_CALL(*gl_, CheckFramebufferStatusEXT(GL_FRAMEBUFFER))
         .WillOnce(Return(GL_FRAMEBUFFER_COMPLETE))
         .RetiresOnSaturation();
   }
   framebuffer_->GetStatus(&texture_manager_, GL_FRAMEBUFFER);
 
@@ skipping 20 matching lines @@
 
   // Check a second call for the same type does not call anything.
   if (!framebuffer_->AllowFramebufferComboCompleteMapForTesting()) {
     EXPECT_CALL(*gl_, CheckFramebufferStatusEXT(GL_READ_FRAMEBUFFER))
         .WillOnce(Return(GL_FRAMEBUFFER_COMPLETE))
         .RetiresOnSaturation();
   }
   framebuffer_->GetStatus(&texture_manager_, GL_READ_FRAMEBUFFER);
 
   // Check changing the format calls CheckFramebuffferStatus.
-  TestHelper::SetTexParameterWithExpectations(
-      gl_.get(), error_state_.get(), &texture_manager_,
-      texture2, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE, GL_NO_ERROR);
+  TestHelper::SetTexParameterWithExpectations(gl_.get(),
+                                              error_state_.get(),
+                                              &texture_manager_,
+                                              texture2.get(),
+                                              GL_TEXTURE_WRAP_S,
+                                              GL_CLAMP_TO_EDGE,
+                                              GL_NO_ERROR);
 
   EXPECT_CALL(*gl_, CheckFramebufferStatusEXT(GL_READ_FRAMEBUFFER))
       .WillOnce(Return(GL_FRAMEBUFFER_INCOMPLETE_ATTACHMENT))
       .WillOnce(Return(GL_FRAMEBUFFER_COMPLETE))
       .RetiresOnSaturation();
   framebuffer_->GetStatus(&texture_manager_, GL_READ_FRAMEBUFFER);
 
   // Check since it did not return FRAMEBUFFER_COMPLETE that it calls
   // CheckFramebufferStatus
   framebuffer_->GetStatus(&texture_manager_, GL_READ_FRAMEBUFFER);
 
   // Check putting it back does not call CheckFramebufferStatus.
   if (!framebuffer_->AllowFramebufferComboCompleteMapForTesting()) {
     EXPECT_CALL(*gl_, CheckFramebufferStatusEXT(GL_READ_FRAMEBUFFER))
         .WillOnce(Return(GL_FRAMEBUFFER_COMPLETE))
         .RetiresOnSaturation();
   }
-  TestHelper::SetTexParameterWithExpectations(
-      gl_.get(), error_state_.get(), &texture_manager_,
-      texture2, GL_TEXTURE_WRAP_S, GL_REPEAT, GL_NO_ERROR);
+  TestHelper::SetTexParameterWithExpectations(gl_.get(),
+                                              error_state_.get(),
+                                              &texture_manager_,
+                                              texture2.get(),
+                                              GL_TEXTURE_WRAP_S,
+                                              GL_REPEAT,
+                                              GL_NO_ERROR);
   framebuffer_->GetStatus(&texture_manager_, GL_READ_FRAMEBUFFER);
 
   // Check Unbinding does not call CheckFramebufferStatus
   framebuffer_->UnbindRenderbuffer(GL_RENDERBUFFER, renderbuffer1);
   if (!framebuffer_->AllowFramebufferComboCompleteMapForTesting()) {
     EXPECT_CALL(*gl_, CheckFramebufferStatusEXT(GL_READ_FRAMEBUFFER))
         .WillOnce(Return(GL_FRAMEBUFFER_COMPLETE))
         .RetiresOnSaturation();
   }
   framebuffer_->GetStatus(&texture_manager_, GL_READ_FRAMEBUFFER);
 }
 
 }  // namespace gles2
 }  // namespace gpu