Chromium Code Reviews| Index: gpu/ipc/service/gpu_command_buffer_stub.cc |
| diff --git a/gpu/ipc/service/gpu_command_buffer_stub.cc b/gpu/ipc/service/gpu_command_buffer_stub.cc |
| index 412d9a97182600dd249a90304302123b615ba887..5f9390b21c649f39b53548c37019edbdd9049d57 100644 |
| --- a/gpu/ipc/service/gpu_command_buffer_stub.cc |
| +++ b/gpu/ipc/service/gpu_command_buffer_stub.cc |
| @@ -275,6 +275,12 @@ bool GpuCommandBufferStub::Send(IPC::Message* message) { |
| return channel_->Send(message); |
| } |
| +void GpuCommandBufferStub::ReportProgress() { |
| + if (auto* watchdog = channel_->watchdog()) { |
| + watchdog->CheckArmed(); |
| + } |
| +} |
| + |
| bool GpuCommandBufferStub::IsScheduled() { |
| return (!executor_.get() || executor_->scheduled()); |
| } |
| @@ -469,7 +475,7 @@ bool GpuCommandBufferStub::Initialize( |
| manager->shader_translator_cache(), |
| manager->framebuffer_completeness_cache(), feature_info, |
| init_params.attribs.bind_generates_resource, |
| - gmb_factory ? gmb_factory->AsImageFactory() : nullptr); |
| + gmb_factory ? gmb_factory->AsImageFactory() : nullptr, this); |
|
danakj
2016/10/05 21:36:15
Can you /* progress_reporter */ on the |this|
ericrk
2016/10/05 22:36:17
Done.
|
| } |
| #if defined(OS_MACOSX) |