Index: content/renderer/renderer_blink_platform_impl.cc |
diff --git a/content/renderer/renderer_blink_platform_impl.cc b/content/renderer/renderer_blink_platform_impl.cc |
index 2aa359bd43f7460f886ce95cdefcaf1717c91c2c..198dd28a57f67dfab553871cad242f4328afca74 100644 |
--- a/content/renderer/renderer_blink_platform_impl.cc |
+++ b/content/renderer/renderer_blink_platform_impl.cc |
@@ -228,8 +228,10 @@ class RendererBlinkPlatformImpl::SandboxSupport |
//------------------------------------------------------------------------------ |
RendererBlinkPlatformImpl::RendererBlinkPlatformImpl( |
- RendererScheduler* renderer_scheduler) |
- : web_scheduler_(new WebSchedulerImpl(renderer_scheduler)), |
+ RendererScheduler* renderer_scheduler, |
+ scoped_refptr<base::SingleThreadTaskRunner> main_thread_task_runner) |
+ : BlinkPlatformImpl(main_thread_task_runner), |
rmcilroy
2014/11/06 22:31:20
Could we only have a renderer_scheduler as an argu
Sami
2014/11/06 22:39:35
Oh yeah, good idea.
alex clarke (OOO till 29th)
2014/11/06 22:54:37
Done.
alex clarke (OOO till 29th)
2014/11/06 22:54:37
Acknowledged.
|
+ web_scheduler_(new WebSchedulerImpl(renderer_scheduler)), |
clipboard_client_(new RendererClipboardClient), |
clipboard_(new WebClipboardImpl(clipboard_client_.get())), |
mime_registry_(new RendererBlinkPlatformImpl::MimeRegistry), |
@@ -255,6 +257,8 @@ RendererBlinkPlatformImpl::RendererBlinkPlatformImpl( |
web_database_observer_impl_.reset( |
new WebDatabaseObserverImpl(sync_message_filter_.get())); |
} |
+ |
+ shared_timer_.SetTaskRunner(main_thread_task_runner_); |
Sami
2014/11/06 22:20:44
Couldn't we do this in the base class since we're
alex clarke (OOO till 29th)
2014/11/06 22:28:34
Done.
|
} |
RendererBlinkPlatformImpl::~RendererBlinkPlatformImpl() { |
@@ -263,11 +267,6 @@ RendererBlinkPlatformImpl::~RendererBlinkPlatformImpl() { |
//------------------------------------------------------------------------------ |
-void RendererBlinkPlatformImpl::callOnMainThread(void (*func)(void*), |
- void* context) { |
- default_task_runner_->PostTask(FROM_HERE, base::Bind(func, context)); |
-} |
- |
blink::WebScheduler* RendererBlinkPlatformImpl::scheduler() { |
return web_scheduler_.get(); |
} |