Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(204)

Unified Diff: gpu/command_buffer/service/gles2_cmd_decoder_unittest_textures.cc

Issue 500243002: Remove implicit conversions from scoped_refptr to T* in gpu/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Revert silliness Created 6 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: gpu/command_buffer/service/gles2_cmd_decoder_unittest_textures.cc
diff --git a/gpu/command_buffer/service/gles2_cmd_decoder_unittest_textures.cc b/gpu/command_buffer/service/gles2_cmd_decoder_unittest_textures.cc
index 07e0979c3812b7d984fdf6182dbab63744af833d..7a4bf66d6f3b6c3b1d4f897f819c8c7c87ac0dff 100644
--- a/gpu/command_buffer/service/gles2_cmd_decoder_unittest_textures.cc
+++ b/gpu/command_buffer/service/gles2_cmd_decoder_unittest_textures.cc
@@ -2317,11 +2317,11 @@ TEST_P(GLES2DecoderWithShaderTest, UseTexImage) {
GetImageManager()->AddImage(image.get(), kImageId);
// Bind image to texture.
- EXPECT_CALL(*image, BindTexImage(GL_TEXTURE_2D))
+ EXPECT_CALL(*image.get(), BindTexImage(GL_TEXTURE_2D))
.Times(1)
.WillOnce(Return(true))
.RetiresOnSaturation();
- EXPECT_CALL(*image, GetSize())
+ EXPECT_CALL(*image.get(), GetSize())
.Times(1)
.WillOnce(Return(gfx::Size(1, 1)))
.RetiresOnSaturation();
@@ -2345,8 +2345,8 @@ TEST_P(GLES2DecoderWithShaderTest, UseTexImage) {
.WillOnce(Return(GL_NO_ERROR))
.RetiresOnSaturation();
EXPECT_CALL(*gl_, ActiveTexture(GL_TEXTURE0)).Times(3).RetiresOnSaturation();
- EXPECT_CALL(*image, WillUseTexImage()).Times(1).RetiresOnSaturation();
- EXPECT_CALL(*image, DidUseTexImage()).Times(1).RetiresOnSaturation();
+ EXPECT_CALL(*image.get(), WillUseTexImage()).Times(1).RetiresOnSaturation();
+ EXPECT_CALL(*image.get(), DidUseTexImage()).Times(1).RetiresOnSaturation();
EXPECT_CALL(*gl_, DrawArrays(GL_TRIANGLES, 0, kNumVertices))
.Times(1)
.RetiresOnSaturation();
@@ -2367,7 +2367,7 @@ TEST_P(GLES2DecoderWithShaderTest, UseTexImage) {
.Times(2)
.RetiresOnSaturation();
// Image will be 'in use' as long as bound to a framebuffer.
- EXPECT_CALL(*image, WillUseTexImage()).Times(1).RetiresOnSaturation();
+ EXPECT_CALL(*image.get(), WillUseTexImage()).Times(1).RetiresOnSaturation();
EXPECT_CALL(*gl_,
FramebufferTexture2DEXT(GL_FRAMEBUFFER,
GL_COLOR_ATTACHMENT0,
@@ -2405,7 +2405,7 @@ TEST_P(GLES2DecoderWithShaderTest, UseTexImage) {
.Times(2)
.RetiresOnSaturation();
// Image should no longer be 'in use' after being unbound from framebuffer.
- EXPECT_CALL(*image, DidUseTexImage()).Times(1).RetiresOnSaturation();
+ EXPECT_CALL(*image.get(), DidUseTexImage()).Times(1).RetiresOnSaturation();
EXPECT_CALL(*gl_, GetError())
.WillOnce(Return(GL_NO_ERROR))
.WillOnce(Return(GL_NO_ERROR))
@@ -2444,7 +2444,7 @@ TEST_P(GLES2DecoderManualInitTest, DrawWithGLImageExternal) {
GL_UNSIGNED_BYTE,
true);
group().texture_manager()->SetLevelImage(
- texture_ref, GL_TEXTURE_EXTERNAL_OES, 0, image);
+ texture_ref, GL_TEXTURE_EXTERNAL_OES, 0, image.get());
DoBindTexture(GL_TEXTURE_EXTERNAL_OES, client_texture_id_, kServiceTextureId);
EXPECT_EQ(GL_NO_ERROR, GetGLError());
@@ -2460,7 +2460,7 @@ TEST_P(GLES2DecoderManualInitTest, DrawWithGLImageExternal) {
.WillOnce(Return(GL_NO_ERROR))
.RetiresOnSaturation();
EXPECT_CALL(*gl_, ActiveTexture(GL_TEXTURE0)).Times(1).RetiresOnSaturation();
- EXPECT_CALL(*image, WillUseTexImage()).Times(1).RetiresOnSaturation();
+ EXPECT_CALL(*image.get(), WillUseTexImage()).Times(1).RetiresOnSaturation();
EXPECT_CALL(*gl_, GetError())
.WillOnce(Return(GL_NO_ERROR))
.RetiresOnSaturation();
@@ -2469,7 +2469,7 @@ TEST_P(GLES2DecoderManualInitTest, DrawWithGLImageExternal) {
.WillOnce(Return(GL_NO_ERROR))
.RetiresOnSaturation();
EXPECT_CALL(*gl_, ActiveTexture(GL_TEXTURE0)).Times(1).RetiresOnSaturation();
- EXPECT_CALL(*image, DidUseTexImage()).Times(1).RetiresOnSaturation();
+ EXPECT_CALL(*image.get(), DidUseTexImage()).Times(1).RetiresOnSaturation();
EXPECT_CALL(*gl_, GetError())
.WillOnce(Return(GL_NO_ERROR))
.RetiresOnSaturation();
« no previous file with comments | « gpu/command_buffer/service/gles2_cmd_decoder_unittest_base.cc ('k') | gpu/command_buffer/service/gpu_scheduler.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698