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

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

Issue 2449993005: Remove GLImage::Destroy(). (Closed)
Patch Set: One more Destroy() call on Mac. Created 4 years, 2 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 5b0036a401f9ade9f75317bf615e5a3475166810..cffb15c924815cecf2cceb837b7eac0b08a6d20e 100644
--- a/gpu/command_buffer/service/gles2_cmd_decoder_unittest_textures.cc
+++ b/gpu/command_buffer/service/gles2_cmd_decoder_unittest_textures.cc
@@ -3797,7 +3797,6 @@ class MockGLImage : public gl::GLImage {
// Overridden from gl::GLImage:
MOCK_METHOD0(GetSize, gfx::Size());
MOCK_METHOD0(GetInternalFormat, unsigned());
- MOCK_METHOD1(Destroy, void(bool));
MOCK_METHOD1(BindTexImage, bool(unsigned));
MOCK_METHOD1(ReleaseTexImage, void(unsigned));
MOCK_METHOD1(CopyTexImage, bool(unsigned));
@@ -3933,7 +3932,6 @@ TEST_P(GLES2DecoderWithShaderTest, CopyTexImage) {
EXPECT_EQ(error::kNoError, ExecuteCmd(fbtex_cmd));
EXPECT_EQ(GL_NO_ERROR, GetGLError());
- EXPECT_CALL(*image.get(), Destroy(true)).Times(1).RetiresOnSaturation();
image = nullptr;
}
« no previous file with comments | « gpu/command_buffer/service/gles2_cmd_decoder_passthrough.cc ('k') | gpu/command_buffer/service/image_manager.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698