OLD | NEW |
1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include "content/browser/compositor/gpu_process_transport_factory.h" | 5 #include "content/browser/compositor/gpu_process_transport_factory.h" |
6 | 6 |
7 #include <string> | 7 #include <string> |
8 | 8 |
9 #include "base/bind.h" | 9 #include "base/bind.h" |
10 #include "base/command_line.h" | 10 #include "base/command_line.h" |
(...skipping 229 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
240 #endif | 240 #endif |
241 create_gpu_output_surface = false; | 241 create_gpu_output_surface = false; |
242 } | 242 } |
243 | 243 |
244 scoped_refptr<ContextProviderCommandBuffer> context_provider; | 244 scoped_refptr<ContextProviderCommandBuffer> context_provider; |
245 if (create_gpu_output_surface) { | 245 if (create_gpu_output_surface) { |
246 // Try to reuse existing worker context provider. | 246 // Try to reuse existing worker context provider. |
247 if (shared_worker_context_provider_) { | 247 if (shared_worker_context_provider_) { |
248 base::AutoLock lock(*shared_worker_context_provider_->GetLock()); | 248 base::AutoLock lock(*shared_worker_context_provider_->GetLock()); |
249 if (shared_worker_context_provider_->ContextGL() | 249 if (shared_worker_context_provider_->ContextGL() |
250 ->GetGraphicsResetStatusKHR() != GL_NO_ERROR) | 250 ->GetGraphicsResetStatusKHR() != GL_NO_ERROR) { |
| 251 shared_worker_context_provider_->Destroy(); |
251 shared_worker_context_provider_ = nullptr; | 252 shared_worker_context_provider_ = nullptr; |
| 253 } |
252 } | 254 } |
253 scoped_refptr<GpuChannelHost> gpu_channel_host = | 255 scoped_refptr<GpuChannelHost> gpu_channel_host = |
254 BrowserGpuChannelHostFactory::instance()->GetGpuChannel(); | 256 BrowserGpuChannelHostFactory::instance()->GetGpuChannel(); |
255 if (gpu_channel_host.get()) { | 257 if (gpu_channel_host.get()) { |
256 context_provider = ContextProviderCommandBuffer::Create( | 258 context_provider = ContextProviderCommandBuffer::Create( |
257 GpuProcessTransportFactory::CreateContextCommon(gpu_channel_host, | 259 GpuProcessTransportFactory::CreateContextCommon(gpu_channel_host, |
258 data->surface_id), | 260 data->surface_id), |
259 BROWSER_COMPOSITOR_ONSCREEN_CONTEXT); | 261 BROWSER_COMPOSITOR_ONSCREEN_CONTEXT); |
260 if (context_provider && !context_provider->BindToCurrentThread()) | 262 if (context_provider && !context_provider->BindToCurrentThread()) |
261 context_provider = nullptr; | 263 context_provider = nullptr; |
262 if (!shared_worker_context_provider_) { | 264 if (!shared_worker_context_provider_) { |
263 shared_worker_context_provider_ = ContextProviderCommandBuffer::Create( | 265 shared_worker_context_provider_ = ContextProviderCommandBuffer::Create( |
264 GpuProcessTransportFactory::CreateContextCommon(gpu_channel_host, | 266 GpuProcessTransportFactory::CreateContextCommon(gpu_channel_host, |
265 0), | 267 0), |
266 BROWSER_WORKER_CONTEXT); | 268 BROWSER_WORKER_CONTEXT); |
267 if (shared_worker_context_provider_ && | 269 if (shared_worker_context_provider_ && |
268 !shared_worker_context_provider_->BindToCurrentThread()) | 270 !shared_worker_context_provider_->BindToCurrentThread()) |
269 shared_worker_context_provider_ = nullptr; | 271 shared_worker_context_provider_ = nullptr; |
| 272 if (shared_worker_context_provider_) |
| 273 shared_worker_context_provider_->SetupLock(); |
270 } | 274 } |
271 } | 275 } |
272 | 276 |
273 bool created_gpu_browser_compositor = | 277 bool created_gpu_browser_compositor = |
274 !!context_provider && !!shared_worker_context_provider_; | 278 !!context_provider && !!shared_worker_context_provider_; |
275 | 279 |
276 UMA_HISTOGRAM_BOOLEAN("Aura.CreatedGpuBrowserCompositor", | 280 UMA_HISTOGRAM_BOOLEAN("Aura.CreatedGpuBrowserCompositor", |
277 created_gpu_browser_compositor); | 281 created_gpu_browser_compositor); |
278 | 282 |
279 if (!created_gpu_browser_compositor) { | 283 if (!created_gpu_browser_compositor) { |
(...skipping 346 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
626 FOR_EACH_OBSERVER(ImageTransportFactoryObserver, | 630 FOR_EACH_OBSERVER(ImageTransportFactoryObserver, |
627 observer_list_, | 631 observer_list_, |
628 OnLostResources()); | 632 OnLostResources()); |
629 | 633 |
630 // Kill things that use the shared context before killing the shared context. | 634 // Kill things that use the shared context before killing the shared context. |
631 lost_gl_helper.reset(); | 635 lost_gl_helper.reset(); |
632 lost_shared_main_thread_contexts = NULL; | 636 lost_shared_main_thread_contexts = NULL; |
633 } | 637 } |
634 | 638 |
635 } // namespace content | 639 } // namespace content |
OLD | NEW |