| Index: content/browser/compositor/gpu_process_transport_factory.cc
|
| diff --git a/content/browser/compositor/gpu_process_transport_factory.cc b/content/browser/compositor/gpu_process_transport_factory.cc
|
| index 1af8acddf2f52bebd54a77a27337dfe8e441fa45..a5b14336ab766d262cf57c47b317d497ab7b1980 100644
|
| --- a/content/browser/compositor/gpu_process_transport_factory.cc
|
| +++ b/content/browser/compositor/gpu_process_transport_factory.cc
|
| @@ -244,14 +244,11 @@
|
| scoped_refptr<ContextProviderCommandBuffer> context_provider;
|
| if (create_gpu_output_surface) {
|
| // Try to reuse existing worker context provider.
|
| - bool shared_worker_context_provider_lost = false;
|
| if (shared_worker_context_provider_) {
|
| - // Note: If context is lost, we delete reference after releasing the lock.
|
| base::AutoLock lock(*shared_worker_context_provider_->GetLock());
|
| if (shared_worker_context_provider_->ContextGL()
|
| - ->GetGraphicsResetStatusKHR() != GL_NO_ERROR) {
|
| - shared_worker_context_provider_lost = true;
|
| - }
|
| + ->GetGraphicsResetStatusKHR() != GL_NO_ERROR)
|
| + shared_worker_context_provider_ = nullptr;
|
| }
|
| scoped_refptr<GpuChannelHost> gpu_channel_host =
|
| BrowserGpuChannelHostFactory::instance()->GetGpuChannel();
|
| @@ -262,8 +259,7 @@
|
| BROWSER_COMPOSITOR_ONSCREEN_CONTEXT);
|
| if (context_provider && !context_provider->BindToCurrentThread())
|
| context_provider = nullptr;
|
| - if (!shared_worker_context_provider_ ||
|
| - shared_worker_context_provider_lost) {
|
| + if (!shared_worker_context_provider_) {
|
| shared_worker_context_provider_ = ContextProviderCommandBuffer::Create(
|
| GpuProcessTransportFactory::CreateContextCommon(gpu_channel_host,
|
| 0),
|
| @@ -271,8 +267,6 @@
|
| if (shared_worker_context_provider_ &&
|
| !shared_worker_context_provider_->BindToCurrentThread())
|
| shared_worker_context_provider_ = nullptr;
|
| - if (shared_worker_context_provider_)
|
| - shared_worker_context_provider_->SetupLock();
|
| }
|
| }
|
|
|
|
|