diff options
| author | Andras Becsi <andras.becsi@digia.com> | 2014-03-18 13:16:26 +0100 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-03-20 15:55:39 +0100 |
| commit | 3f0f86b0caed75241fa71c95a5d73bc0164348c5 (patch) | |
| tree | 92b9fb00f2e9e90b0be2262093876d4f43b6cd13 /chromium/content/browser/browser_thread_impl.cc | |
| parent | e90d7c4b152c56919d963987e2503f9909a666d2 (diff) | |
| download | qtwebengine-chromium-3f0f86b0caed75241fa71c95a5d73bc0164348c5.tar.gz | |
Update to new stable branch 1750
This also includes an updated ninja and chromium dependencies
needed on Windows.
Change-Id: Icd597d80ed3fa4425933c9f1334c3c2e31291c42
Reviewed-by: Zoltan Arvai <zarvai@inf.u-szeged.hu>
Reviewed-by: Zeno Albisser <zeno.albisser@digia.com>
Diffstat (limited to 'chromium/content/browser/browser_thread_impl.cc')
| -rw-r--r-- | chromium/content/browser/browser_thread_impl.cc | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/chromium/content/browser/browser_thread_impl.cc b/chromium/content/browser/browser_thread_impl.cc index fb6feac452f..099ec3b72a4 100644 --- a/chromium/content/browser/browser_thread_impl.cc +++ b/chromium/content/browser/browser_thread_impl.cc @@ -167,7 +167,7 @@ MSVC_POP_WARNING() MSVC_ENABLE_OPTIMIZE(); void BrowserThreadImpl::Run(base::MessageLoop* message_loop) { - BrowserThread::ID thread_id; + BrowserThread::ID thread_id = ID_COUNT; if (!GetCurrentThreadIdentifier(&thread_id)) return Thread::Run(message_loop); @@ -248,7 +248,7 @@ bool BrowserThreadImpl::PostTaskHelper( // Note: since the array is so small, ok to loop instead of creating a map, // which would require a lock because std::map isn't thread safe, defeating // the whole purpose of this optimization. - BrowserThread::ID current_thread; + BrowserThread::ID current_thread = ID_COUNT; bool target_thread_outlives_current = GetCurrentThreadIdentifier(¤t_thread) && current_thread >= identifier; @@ -316,6 +316,7 @@ bool BrowserThread::PostBlockingPoolTask( return g_globals.Get().blocking_pool->PostWorkerTask(from_here, task); } +// static bool BrowserThread::PostBlockingPoolTaskAndReply( const tracked_objects::Location& from_here, const base::Closure& task, |