| Index: gpu/command_buffer/client/client_test_helper.cc
|
| diff --git a/gpu/command_buffer/client/client_test_helper.cc b/gpu/command_buffer/client/client_test_helper.cc
|
| index 3c50f6b20cc2bb5753fc8ee6ef07bab66ff8aae9..4ba5fdc4178ddd6e99edc27f6778baf661739fa7 100644
|
| --- a/gpu/command_buffer/client/client_test_helper.cc
|
| +++ b/gpu/command_buffer/client/client_test_helper.cc
|
| @@ -89,7 +89,9 @@ scoped_refptr<Buffer> MockCommandBufferBase::GetTransferBuffer(int32 id) {
|
| return transfer_buffer_buffers_[id - kTransferBufferBaseId];
|
| }
|
|
|
| -void MockCommandBufferBase::FlushHelper(int32 put_offset) {
|
| +void MockCommandBufferBase::FlushHelper(
|
| + int32 put_offset,
|
| + const std::vector<uint32>& sync_points) {
|
| put_offset_ = put_offset;
|
| }
|
|
|
| @@ -126,8 +128,9 @@ MockClientCommandBuffer::MockClientCommandBuffer() {
|
| MockClientCommandBuffer::~MockClientCommandBuffer() {
|
| }
|
|
|
| -void MockClientCommandBuffer::Flush(int32 put_offset) {
|
| - FlushHelper(put_offset);
|
| +void MockClientCommandBuffer::Flush(int32 put_offset,
|
| + const std::vector<uint32>& sync_points) {
|
| + FlushHelper(put_offset, sync_points);
|
| }
|
|
|
| void MockClientCommandBuffer::DelegateToFake() {
|
| @@ -145,9 +148,8 @@ MockClientCommandBufferMockFlush::~MockClientCommandBufferMockFlush() {
|
|
|
| void MockClientCommandBufferMockFlush::DelegateToFake() {
|
| MockClientCommandBuffer::DelegateToFake();
|
| - ON_CALL(*this, Flush(_))
|
| - .WillByDefault(Invoke(
|
| - this, &MockCommandBufferBase::FlushHelper));
|
| + ON_CALL(*this, Flush(_, _))
|
| + .WillByDefault(Invoke(this, &MockCommandBufferBase::FlushHelper));
|
| }
|
|
|
| MockClientGpuControl::MockClientGpuControl() {
|
|
|