| Index: gpu/command_buffer/service/gles2_cmd_decoder_unittest_async_pixel.cc
|
| diff --git a/gpu/command_buffer/service/gles2_cmd_decoder_unittest_async_pixel.cc b/gpu/command_buffer/service/gles2_cmd_decoder_unittest_async_pixel.cc
|
| index d32870d9a1a1599a0b8132940755438a9208a9dd..657619232aa9592e7ab80c2a75a5fcdf11bb1485 100644
|
| --- a/gpu/command_buffer/service/gles2_cmd_decoder_unittest_async_pixel.cc
|
| +++ b/gpu/command_buffer/service/gles2_cmd_decoder_unittest_async_pixel.cc
|
| @@ -35,6 +35,7 @@
|
|
|
| using ::gfx::MockGLInterface;
|
| using ::testing::_;
|
| +using ::testing::An;
|
| using ::testing::DoAll;
|
| using ::testing::InSequence;
|
| using ::testing::Invoke;
|
| @@ -117,7 +118,8 @@ TEST_P(GLES2DecoderManualInitTest, AsyncPixelTransfers) {
|
| {
|
| // Create transfer state since it doesn't exist.
|
| EXPECT_EQ(texture_ref->num_observers(), 0);
|
| - EXPECT_CALL(*manager, CreatePixelTransferDelegateImpl(texture_ref, _))
|
| + EXPECT_CALL(*manager, CreatePixelTransferDelegateImpl(
|
| + texture_ref, An<const AsyncTexImage2DParams&>()))
|
| .WillOnce(Return(
|
| delegate = new StrictMock<gpu::MockAsyncPixelTransferDelegate>))
|
| .RetiresOnSaturation();
|
| @@ -177,7 +179,8 @@ TEST_P(GLES2DecoderManualInitTest, AsyncPixelTransfers) {
|
| texture->SetImmutable(false);
|
| {
|
| // Create transfer state since it doesn't exist.
|
| - EXPECT_CALL(*manager, CreatePixelTransferDelegateImpl(texture_ref, _))
|
| + EXPECT_CALL(*manager, CreatePixelTransferDelegateImpl(
|
| + texture_ref, An<const AsyncTexImage2DParams&>()))
|
| .WillOnce(Return(
|
| delegate = new StrictMock<gpu::MockAsyncPixelTransferDelegate>))
|
| .RetiresOnSaturation();
|
| @@ -249,7 +252,8 @@ TEST_P(GLES2DecoderManualInitTest, AsyncPixelTransfers) {
|
| texture = texture_ref->texture();
|
| texture->SetImmutable(false);
|
| // Create transfer state since it doesn't exist.
|
| - EXPECT_CALL(*manager, CreatePixelTransferDelegateImpl(texture_ref, _))
|
| + EXPECT_CALL(*manager, CreatePixelTransferDelegateImpl(
|
| + texture_ref, An<const AsyncTexImage2DParams&>()))
|
| .WillOnce(Return(
|
| delegate = new StrictMock<gpu::MockAsyncPixelTransferDelegate>))
|
| .RetiresOnSaturation();
|
| @@ -289,7 +293,8 @@ TEST_P(GLES2DecoderManualInitTest, AsyncPixelTransfers) {
|
| texture = texture_ref->texture();
|
| texture->SetImmutable(false);
|
| // Create transfer state since it doesn't exist.
|
| - EXPECT_CALL(*manager, CreatePixelTransferDelegateImpl(texture_ref, _))
|
| + EXPECT_CALL(*manager, CreatePixelTransferDelegateImpl(
|
| + texture_ref, An<const AsyncTexImage2DParams&>()))
|
| .WillOnce(Return(
|
| delegate = new StrictMock<gpu::MockAsyncPixelTransferDelegate>))
|
| .RetiresOnSaturation();
|
| @@ -355,7 +360,8 @@ TEST_P(GLES2DecoderManualInitTest, AsyncPixelTransferManager) {
|
|
|
| // Create delegate on AsyncTexImage2D.
|
| {
|
| - EXPECT_CALL(*manager, CreatePixelTransferDelegateImpl(texture_ref, _))
|
| + EXPECT_CALL(*manager, CreatePixelTransferDelegateImpl(
|
| + texture_ref, An<const AsyncTexImage2DParams&>()))
|
| .WillOnce(Return(
|
| delegate = new StrictMock<gpu::MockAsyncPixelTransferDelegate>))
|
| .RetiresOnSaturation();
|
|
|