| Index: content/common/gpu/client/context_provider_command_buffer.cc
|
| diff --git a/content/common/gpu/client/context_provider_command_buffer.cc b/content/common/gpu/client/context_provider_command_buffer.cc
|
| index 74bbf375caece9a56c5883ca887dfb2db98dbfb7..5aa148499e85420e87f71fbd67564b31e9b39e94 100644
|
| --- a/content/common/gpu/client/context_provider_command_buffer.cc
|
| +++ b/content/common/gpu/client/context_provider_command_buffer.cc
|
| @@ -292,9 +292,9 @@ bool ContextProviderCommandBuffer::BindToCurrentThread() {
|
| return false;
|
| }
|
|
|
| - if (command_buffer_->GetLastError() != gpu::error::kNoError) {
|
| + if (command_buffer_->GetLastState().error != gpu::error::kNoError) {
|
| DLOG(ERROR) << "Context dead on arrival. Last error: "
|
| - << command_buffer_->GetLastError();
|
| + << command_buffer_->GetLastState().error;
|
| return false;
|
| }
|
|
|
| @@ -454,6 +454,9 @@ bool ContextProviderCommandBuffer::OnMemoryDump(
|
| if (support_locking_)
|
| hold.emplace(context_lock_);
|
|
|
| + gles2_impl_->OnMemoryDump(args, pmd);
|
| + gles2_helper_->OnMemoryDump(args, pmd);
|
| +
|
| context_thread_checker_.DetachFromThread();
|
| SkiaGpuTraceMemoryDump trace_memory_dump(
|
| pmd, gles2_impl_->ShareGroupTracingGUID());
|
|
|