OLD | NEW |
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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/renderer/render_widget.h" | 5 #include "content/renderer/render_widget.h" |
6 | 6 |
7 #include "base/auto_reset.h" | 7 #include "base/auto_reset.h" |
8 #include "base/bind.h" | 8 #include "base/bind.h" |
9 #include "base/command_line.h" | 9 #include "base/command_line.h" |
10 #include "base/logging.h" | 10 #include "base/logging.h" |
(...skipping 1004 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1015 if (!use_software) { | 1015 if (!use_software) { |
1016 context_provider = ContextProviderCommandBuffer::Create( | 1016 context_provider = ContextProviderCommandBuffer::Create( |
1017 CreateGraphicsContext3D(true), RENDER_COMPOSITOR_CONTEXT); | 1017 CreateGraphicsContext3D(true), RENDER_COMPOSITOR_CONTEXT); |
1018 if (!context_provider.get()) { | 1018 if (!context_provider.get()) { |
1019 // Cause the compositor to wait and try again. | 1019 // Cause the compositor to wait and try again. |
1020 return scoped_ptr<cc::OutputSurface>(); | 1020 return scoped_ptr<cc::OutputSurface>(); |
1021 } | 1021 } |
1022 | 1022 |
1023 worker_context_provider = ContextProviderCommandBuffer::Create( | 1023 worker_context_provider = ContextProviderCommandBuffer::Create( |
1024 CreateGraphicsContext3D(false), RENDER_WORKER_CONTEXT); | 1024 CreateGraphicsContext3D(false), RENDER_WORKER_CONTEXT); |
1025 if (!worker_context_provider.get()) { | 1025 if (!worker_context_provider.get() || |
| 1026 !worker_context_provider->BindToCurrentThread()) { |
1026 // Cause the compositor to wait and try again. | 1027 // Cause the compositor to wait and try again. |
1027 return scoped_ptr<cc::OutputSurface>(); | 1028 return scoped_ptr<cc::OutputSurface>(); |
1028 } | 1029 } |
| 1030 worker_context_provider->SetupLock(); |
| 1031 // Detach from thread to allow context to be destroyed on a different |
| 1032 // thread without being used. |
| 1033 worker_context_provider->DetachFromThread(); |
1029 } | 1034 } |
1030 | 1035 |
1031 uint32 output_surface_id = next_output_surface_id_++; | 1036 uint32 output_surface_id = next_output_surface_id_++; |
1032 if (command_line.HasSwitch(switches::kEnableDelegatedRenderer)) { | 1037 if (command_line.HasSwitch(switches::kEnableDelegatedRenderer)) { |
1033 DCHECK(compositor_deps_->GetCompositorImplThreadTaskRunner()); | 1038 DCHECK(compositor_deps_->GetCompositorImplThreadTaskRunner()); |
1034 return scoped_ptr<cc::OutputSurface>(new DelegatedCompositorOutputSurface( | 1039 return scoped_ptr<cc::OutputSurface>(new DelegatedCompositorOutputSurface( |
1035 routing_id(), output_surface_id, context_provider, | 1040 routing_id(), output_surface_id, context_provider, |
1036 worker_context_provider, frame_swap_message_queue_)); | 1041 worker_context_provider, frame_swap_message_queue_)); |
1037 } | 1042 } |
1038 if (!context_provider.get()) { | 1043 if (!context_provider.get()) { |
(...skipping 1419 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2458 void RenderWidget::RegisterVideoHoleFrame(RenderFrameImpl* frame) { | 2463 void RenderWidget::RegisterVideoHoleFrame(RenderFrameImpl* frame) { |
2459 video_hole_frames_.AddObserver(frame); | 2464 video_hole_frames_.AddObserver(frame); |
2460 } | 2465 } |
2461 | 2466 |
2462 void RenderWidget::UnregisterVideoHoleFrame(RenderFrameImpl* frame) { | 2467 void RenderWidget::UnregisterVideoHoleFrame(RenderFrameImpl* frame) { |
2463 video_hole_frames_.RemoveObserver(frame); | 2468 video_hole_frames_.RemoveObserver(frame); |
2464 } | 2469 } |
2465 #endif // defined(VIDEO_HOLE) | 2470 #endif // defined(VIDEO_HOLE) |
2466 | 2471 |
2467 } // namespace content | 2472 } // namespace content |
OLD | NEW |