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 583 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
594 } | 594 } |
595 | 595 |
596 RenderThreadImpl::RenderThreadImpl( | 596 RenderThreadImpl::RenderThreadImpl( |
597 const InProcessChildThreadParams& params, | 597 const InProcessChildThreadParams& params, |
598 std::unique_ptr<scheduler::RendererScheduler> scheduler, | 598 std::unique_ptr<scheduler::RendererScheduler> scheduler, |
599 scoped_refptr<base::SingleThreadTaskRunner>& resource_task_queue) | 599 scoped_refptr<base::SingleThreadTaskRunner>& resource_task_queue) |
600 : ChildThreadImpl(Options::Builder() | 600 : ChildThreadImpl(Options::Builder() |
601 .InBrowserProcess(params) | 601 .InBrowserProcess(params) |
602 .UseMojoChannel(true) | 602 .UseMojoChannel(true) |
603 .AutoStartMojoShellConnection(false) | 603 .AutoStartMojoShellConnection(false) |
| 604 .ConnectToBrowser(true) |
604 .Build()), | 605 .Build()), |
605 renderer_scheduler_(std::move(scheduler)), | 606 renderer_scheduler_(std::move(scheduler)), |
606 categorized_worker_pool_(new CategorizedWorkerPool()) { | 607 categorized_worker_pool_(new CategorizedWorkerPool()) { |
607 Init(resource_task_queue); | 608 Init(resource_task_queue); |
608 } | 609 } |
609 | 610 |
610 // When we run plugins in process, we actually run them on the render thread, | 611 // When we run plugins in process, we actually run them on the render thread, |
611 // which means that we need to make the render thread pump UI events. | 612 // which means that we need to make the render thread pump UI events. |
612 RenderThreadImpl::RenderThreadImpl( | 613 RenderThreadImpl::RenderThreadImpl( |
613 std::unique_ptr<base::MessageLoop> main_message_loop, | 614 std::unique_ptr<base::MessageLoop> main_message_loop, |
614 std::unique_ptr<scheduler::RendererScheduler> scheduler) | 615 std::unique_ptr<scheduler::RendererScheduler> scheduler) |
615 : ChildThreadImpl(Options::Builder() | 616 : ChildThreadImpl(Options::Builder() |
616 .UseMojoChannel(true) | 617 .UseMojoChannel(true) |
617 .AutoStartMojoShellConnection(false) | 618 .AutoStartMojoShellConnection(false) |
| 619 .ConnectToBrowser(true) |
618 .Build()), | 620 .Build()), |
619 renderer_scheduler_(std::move(scheduler)), | 621 renderer_scheduler_(std::move(scheduler)), |
620 main_message_loop_(std::move(main_message_loop)), | 622 main_message_loop_(std::move(main_message_loop)), |
621 categorized_worker_pool_(new CategorizedWorkerPool()) { | 623 categorized_worker_pool_(new CategorizedWorkerPool()) { |
622 scoped_refptr<base::SingleThreadTaskRunner> test_task_counter; | 624 scoped_refptr<base::SingleThreadTaskRunner> test_task_counter; |
623 Init(test_task_counter); | 625 Init(test_task_counter); |
624 } | 626 } |
625 | 627 |
626 void RenderThreadImpl::Init( | 628 void RenderThreadImpl::Init( |
627 scoped_refptr<base::SingleThreadTaskRunner>& resource_task_queue) { | 629 scoped_refptr<base::SingleThreadTaskRunner>& resource_task_queue) { |
(...skipping 1611 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2239 v8_memory_pressure_level == v8::MemoryPressureLevel::kCritical) | 2241 v8_memory_pressure_level == v8::MemoryPressureLevel::kCritical) |
2240 v8_memory_pressure_level = v8::MemoryPressureLevel::kModerate; | 2242 v8_memory_pressure_level = v8::MemoryPressureLevel::kModerate; |
2241 | 2243 |
2242 blink::mainThreadIsolate()->MemoryPressureNotification( | 2244 blink::mainThreadIsolate()->MemoryPressureNotification( |
2243 v8_memory_pressure_level); | 2245 v8_memory_pressure_level); |
2244 blink::MemoryPressureNotificationToWorkerThreadIsolates( | 2246 blink::MemoryPressureNotificationToWorkerThreadIsolates( |
2245 v8_memory_pressure_level); | 2247 v8_memory_pressure_level); |
2246 } | 2248 } |
2247 | 2249 |
2248 } // namespace content | 2250 } // namespace content |
OLD | NEW |