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

Unified Diff: content/renderer/renderer_main.cc

Issue 977573002: content: Add an overridable task runner to ChildThreadImpl (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Move GetTaskRunner back to the RenderThread. Created 5 years, 9 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « content/renderer/render_thread_impl_browsertest.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/renderer/renderer_main.cc
diff --git a/content/renderer/renderer_main.cc b/content/renderer/renderer_main.cc
index a76df805790ff7d12a0b4b62fb67518edaaa36da..36258e8ac2ed1a1c54ed5bde7d06b574a731b81a 100644
--- a/content/renderer/renderer_main.cc
+++ b/content/renderer/renderer_main.cc
@@ -28,6 +28,7 @@
#include "content/renderer/render_process_impl.h"
#include "content/renderer/render_thread_impl.h"
#include "content/renderer/renderer_main_platform_delegate.h"
+#include "content/renderer/scheduler/renderer_scheduler.h"
#include "ui/base/ui_base_switches.h"
#if defined(OS_ANDROID)
@@ -147,6 +148,8 @@ int RendererMain(const MainFunctionParams& parameters) {
main_message_loop->AddTaskObserver(&task_observer);
base::PlatformThread::SetName("CrRendererMain");
+ scoped_ptr<RendererScheduler> renderer_scheduler =
+ RendererScheduler::Create();
bool no_sandbox = parsed_command_line.HasSwitch(switches::kNoSandbox);
@@ -191,7 +194,7 @@ int RendererMain(const MainFunctionParams& parameters) {
// TODO(markus): Check if it is OK to unconditionally move this
// instruction down.
RenderProcessImpl render_process;
- new RenderThreadImpl(main_message_loop.Pass());
+ new RenderThreadImpl(main_message_loop.Pass(), renderer_scheduler.Pass());
#endif
bool run_loop = true;
if (!no_sandbox) {
@@ -207,7 +210,7 @@ int RendererMain(const MainFunctionParams& parameters) {
}
#if defined(OS_POSIX) && !defined(OS_MACOSX)
RenderProcessImpl render_process;
- new RenderThreadImpl(main_message_loop.Pass());
+ new RenderThreadImpl(main_message_loop.Pass(), renderer_scheduler.Pass());
#endif
base::HighResolutionTimerManager hi_res_timer_manager;
« no previous file with comments | « content/renderer/render_thread_impl_browsertest.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698