diff options
| author | Zeno Albisser <zeno.albisser@theqtcompany.com> | 2014-12-05 15:04:29 +0100 |
|---|---|---|
| committer | Andras Becsi <andras.becsi@theqtcompany.com> | 2014-12-09 10:49:28 +0100 |
| commit | af6588f8d723931a298c995fa97259bb7f7deb55 (patch) | |
| tree | 060ca707847ba1735f01af2372e0d5e494dc0366 /chromium/base/threading/thread.cc | |
| parent | 2fff84d821cc7b1c785f6404e0f8091333283e74 (diff) | |
BASELINE: Update chromium to 40.0.2214.28 and ninja to 1.5.3.
Change-Id: I759465284fd64d59ad120219cbe257f7402c4181
Reviewed-by: Andras Becsi <andras.becsi@theqtcompany.com>
Diffstat (limited to 'chromium/base/threading/thread.cc')
| -rw-r--r-- | chromium/base/threading/thread.cc | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/chromium/base/threading/thread.cc b/chromium/base/threading/thread.cc index 7877b193548..ad1360be3e4 100644 --- a/chromium/base/threading/thread.cc +++ b/chromium/base/threading/thread.cc @@ -51,12 +51,14 @@ struct Thread::StartupData { Thread::Options::Options() : message_loop_type(MessageLoop::TYPE_DEFAULT), + timer_slack(TIMER_SLACK_NONE), stack_size(0) { } Thread::Options::Options(MessageLoop::Type type, size_t size) : message_loop_type(type), + timer_slack(TIMER_SLACK_NONE), stack_size(size) { } @@ -202,6 +204,7 @@ void Thread::ThreadMain() { PlatformThread::SetName(name_.c_str()); ANNOTATE_THREAD_NAME(name_.c_str()); // Tell the name to race detector. message_loop->set_thread_name(name_); + message_loop->SetTimerSlack(startup_data_->options.timer_slack); message_loop_ = message_loop.get(); #if defined(OS_WIN) |