| 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_thread_impl.h" | 5 #include "content/renderer/render_thread_impl.h" |
| 6 | 6 |
| 7 #include <algorithm> | 7 #include <algorithm> |
| 8 #include <limits> | 8 #include <limits> |
| 9 #include <map> | 9 #include <map> |
| 10 #include <utility> | 10 #include <utility> |
| (...skipping 582 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 593 mojom::RenderMessageFilter* render_message_filter) { | 593 mojom::RenderMessageFilter* render_message_filter) { |
| 594 g_render_message_filter_for_testing = render_message_filter; | 594 g_render_message_filter_for_testing = render_message_filter; |
| 595 } | 595 } |
| 596 | 596 |
| 597 RenderThreadImpl::RenderThreadImpl( | 597 RenderThreadImpl::RenderThreadImpl( |
| 598 const InProcessChildThreadParams& params, | 598 const InProcessChildThreadParams& params, |
| 599 std::unique_ptr<blink::scheduler::RendererScheduler> scheduler, | 599 std::unique_ptr<blink::scheduler::RendererScheduler> scheduler, |
| 600 scoped_refptr<base::SingleThreadTaskRunner>& resource_task_queue) | 600 scoped_refptr<base::SingleThreadTaskRunner>& resource_task_queue) |
| 601 : ChildThreadImpl(Options::Builder() | 601 : ChildThreadImpl(Options::Builder() |
| 602 .InBrowserProcess(params) | 602 .InBrowserProcess(params) |
| 603 .UseMojoChannel(true) | |
| 604 .AutoStartMojoShellConnection(false) | 603 .AutoStartMojoShellConnection(false) |
| 605 .ConnectToBrowser(true) | 604 .ConnectToBrowser(true) |
| 606 .Build()), | 605 .Build()), |
| 607 renderer_scheduler_(std::move(scheduler)), | 606 renderer_scheduler_(std::move(scheduler)), |
| 608 time_zone_monitor_binding_(this), | 607 time_zone_monitor_binding_(this), |
| 609 categorized_worker_pool_(new CategorizedWorkerPool()), | 608 categorized_worker_pool_(new CategorizedWorkerPool()), |
| 610 renderer_binding_(this) { | 609 renderer_binding_(this) { |
| 611 Init(resource_task_queue); | 610 Init(resource_task_queue); |
| 612 } | 611 } |
| 613 | 612 |
| 614 // When we run plugins in process, we actually run them on the render thread, | 613 // When we run plugins in process, we actually run them on the render thread, |
| 615 // which means that we need to make the render thread pump UI events. | 614 // which means that we need to make the render thread pump UI events. |
| 616 RenderThreadImpl::RenderThreadImpl( | 615 RenderThreadImpl::RenderThreadImpl( |
| 617 std::unique_ptr<base::MessageLoop> main_message_loop, | 616 std::unique_ptr<base::MessageLoop> main_message_loop, |
| 618 std::unique_ptr<blink::scheduler::RendererScheduler> scheduler) | 617 std::unique_ptr<blink::scheduler::RendererScheduler> scheduler) |
| 619 : ChildThreadImpl(Options::Builder() | 618 : ChildThreadImpl(Options::Builder() |
| 620 .UseMojoChannel(true) | |
| 621 .AutoStartMojoShellConnection(false) | 619 .AutoStartMojoShellConnection(false) |
| 622 .ConnectToBrowser(true) | 620 .ConnectToBrowser(true) |
| 623 .Build()), | 621 .Build()), |
| 624 renderer_scheduler_(std::move(scheduler)), | 622 renderer_scheduler_(std::move(scheduler)), |
| 625 time_zone_monitor_binding_(this), | 623 time_zone_monitor_binding_(this), |
| 626 main_message_loop_(std::move(main_message_loop)), | 624 main_message_loop_(std::move(main_message_loop)), |
| 627 categorized_worker_pool_(new CategorizedWorkerPool()), | 625 categorized_worker_pool_(new CategorizedWorkerPool()), |
| 628 renderer_binding_(this) { | 626 renderer_binding_(this) { |
| 629 scoped_refptr<base::SingleThreadTaskRunner> test_task_counter; | 627 scoped_refptr<base::SingleThreadTaskRunner> test_task_counter; |
| 630 Init(test_task_counter); | 628 Init(test_task_counter); |
| (...skipping 1700 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2331 } | 2329 } |
| 2332 } | 2330 } |
| 2333 | 2331 |
| 2334 void RenderThreadImpl::OnRendererInterfaceRequest( | 2332 void RenderThreadImpl::OnRendererInterfaceRequest( |
| 2335 mojom::RendererAssociatedRequest request) { | 2333 mojom::RendererAssociatedRequest request) { |
| 2336 DCHECK(!renderer_binding_.is_bound()); | 2334 DCHECK(!renderer_binding_.is_bound()); |
| 2337 renderer_binding_.Bind(std::move(request)); | 2335 renderer_binding_.Bind(std::move(request)); |
| 2338 } | 2336 } |
| 2339 | 2337 |
| 2340 } // namespace content | 2338 } // namespace content |
| OLD | NEW |