Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(815)

Side by Side Diff: content/renderer/render_thread_impl.cc

Issue 2107143003: Revert of Make RenderProcessHost/RenderThread use MojoChildConnection/MojoShellConnection (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@rph2
Patch Set: Created 4 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « content/public/test/mock_render_thread.cc ('k') | services/shell/public/cpp/connection.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 573 matching lines...) Expand 10 before | Expand all | Expand 10 after
584 return lazy_tls.Pointer()->Get(); 584 return lazy_tls.Pointer()->Get();
585 } 585 }
586 586
587 RenderThreadImpl::RenderThreadImpl( 587 RenderThreadImpl::RenderThreadImpl(
588 const InProcessChildThreadParams& params, 588 const InProcessChildThreadParams& params,
589 std::unique_ptr<scheduler::RendererScheduler> scheduler, 589 std::unique_ptr<scheduler::RendererScheduler> scheduler,
590 scoped_refptr<base::SingleThreadTaskRunner>& resource_task_queue) 590 scoped_refptr<base::SingleThreadTaskRunner>& resource_task_queue)
591 : ChildThreadImpl(Options::Builder() 591 : ChildThreadImpl(Options::Builder()
592 .InBrowserProcess(params) 592 .InBrowserProcess(params)
593 .UseMojoChannel(true) 593 .UseMojoChannel(true)
594 .UseMojoShellConnection(true)
595 .Build()), 594 .Build()),
596 renderer_scheduler_(std::move(scheduler)), 595 renderer_scheduler_(std::move(scheduler)),
597 categorized_worker_pool_(new CategorizedWorkerPool()) { 596 categorized_worker_pool_(new CategorizedWorkerPool()) {
598 Init(resource_task_queue); 597 Init(resource_task_queue);
599 } 598 }
600 599
601 // When we run plugins in process, we actually run them on the render thread, 600 // When we run plugins in process, we actually run them on the render thread,
602 // which means that we need to make the render thread pump UI events. 601 // which means that we need to make the render thread pump UI events.
603 RenderThreadImpl::RenderThreadImpl( 602 RenderThreadImpl::RenderThreadImpl(
604 std::unique_ptr<base::MessageLoop> main_message_loop, 603 std::unique_ptr<base::MessageLoop> main_message_loop,
605 std::unique_ptr<scheduler::RendererScheduler> scheduler) 604 std::unique_ptr<scheduler::RendererScheduler> scheduler)
606 : ChildThreadImpl(Options::Builder().UseMojoChannel(true). 605 : ChildThreadImpl(Options::Builder().UseMojoChannel(true).Build()),
607 UseMojoShellConnection(true).Build()),
608 renderer_scheduler_(std::move(scheduler)), 606 renderer_scheduler_(std::move(scheduler)),
609 main_message_loop_(std::move(main_message_loop)), 607 main_message_loop_(std::move(main_message_loop)),
610 categorized_worker_pool_(new CategorizedWorkerPool()) { 608 categorized_worker_pool_(new CategorizedWorkerPool()) {
611 scoped_refptr<base::SingleThreadTaskRunner> test_task_counter; 609 scoped_refptr<base::SingleThreadTaskRunner> test_task_counter;
612 Init(test_task_counter); 610 Init(test_task_counter);
613 } 611 }
614 612
615 void RenderThreadImpl::Init( 613 void RenderThreadImpl::Init(
616 scoped_refptr<base::SingleThreadTaskRunner>& resource_task_queue) { 614 scoped_refptr<base::SingleThreadTaskRunner>& resource_task_queue) {
617 TRACE_EVENT0("startup", "RenderThreadImpl::Init"); 615 TRACE_EVENT0("startup", "RenderThreadImpl::Init");
(...skipping 1591 matching lines...) Expand 10 before | Expand all | Expand 10 after
2209 v8_memory_pressure_level == v8::MemoryPressureLevel::kCritical) 2207 v8_memory_pressure_level == v8::MemoryPressureLevel::kCritical)
2210 v8_memory_pressure_level = v8::MemoryPressureLevel::kModerate; 2208 v8_memory_pressure_level = v8::MemoryPressureLevel::kModerate;
2211 2209
2212 blink::mainThreadIsolate()->MemoryPressureNotification( 2210 blink::mainThreadIsolate()->MemoryPressureNotification(
2213 v8_memory_pressure_level); 2211 v8_memory_pressure_level);
2214 blink::MemoryPressureNotificationToWorkerThreadIsolates( 2212 blink::MemoryPressureNotificationToWorkerThreadIsolates(
2215 v8_memory_pressure_level); 2213 v8_memory_pressure_level);
2216 } 2214 }
2217 2215
2218 } // namespace content 2216 } // namespace content
OLDNEW
« no previous file with comments | « content/public/test/mock_render_thread.cc ('k') | services/shell/public/cpp/connection.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698