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

Side by Side Diff: third_party/WebKit/Source/platform/audio/HRTFDatabaseLoader.cpp

Issue 1818233003: Merge WTF::initializeMainThread into WTF::initialize (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 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 unified diff | Download patch
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2010 Google Inc. All rights reserved. 2 * Copyright (C) 2010 Google Inc. All rights reserved.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions 5 * modification, are permitted provided that the following conditions
6 * are met: 6 * are met:
7 * 7 *
8 * 1. Redistributions of source code must retain the above copyright 8 * 1. Redistributions of source code must retain the above copyright
9 * notice, this list of conditions and the following disclaimer. 9 * notice, this list of conditions and the following disclaimer.
10 * 2. Redistributions in binary form must reproduce the above copyright 10 * 2. Redistributions in binary form must reproduce the above copyright
(...skipping 14 matching lines...) Expand all
25 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF 25 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
26 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 26 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
27 */ 27 */
28 28
29 #include "platform/audio/HRTFDatabaseLoader.h" 29 #include "platform/audio/HRTFDatabaseLoader.h"
30 #include "platform/TaskSynchronizer.h" 30 #include "platform/TaskSynchronizer.h"
31 #include "platform/ThreadSafeFunctional.h" 31 #include "platform/ThreadSafeFunctional.h"
32 #include "public/platform/Platform.h" 32 #include "public/platform/Platform.h"
33 #include "public/platform/WebTaskRunner.h" 33 #include "public/platform/WebTaskRunner.h"
34 #include "public/platform/WebTraceLocation.h" 34 #include "public/platform/WebTraceLocation.h"
35 #include "wtf/MainThread.h"
36 35
37 namespace blink { 36 namespace blink {
38 37
39 using LoaderMap = HashMap<double, HRTFDatabaseLoader*>; 38 using LoaderMap = HashMap<double, HRTFDatabaseLoader*>;
40 39
41 static LoaderMap& loaderMap() 40 static LoaderMap& loaderMap()
42 { 41 {
43 DEFINE_STATIC_LOCAL(LoaderMap*, map, (new LoaderMap)); 42 DEFINE_STATIC_LOCAL(LoaderMap*, map, (new LoaderMap));
44 return *map; 43 return *map;
45 } 44 }
(...skipping 72 matching lines...) Expand 10 before | Expand all | Expand 10 after
118 return; 117 return;
119 118
120 TaskSynchronizer sync; 119 TaskSynchronizer sync;
121 // TODO(alexclarke): Should this be posted as a loading task? 120 // TODO(alexclarke): Should this be posted as a loading task?
122 m_thread->getWebTaskRunner()->postTask(BLINK_FROM_HERE, threadSafeBind(&HRTF DatabaseLoader::cleanupTask, AllowCrossThreadAccess(this), AllowCrossThreadAcces s(&sync))); 121 m_thread->getWebTaskRunner()->postTask(BLINK_FROM_HERE, threadSafeBind(&HRTF DatabaseLoader::cleanupTask, AllowCrossThreadAccess(this), AllowCrossThreadAcces s(&sync)));
123 sync.waitForTaskCompletion(); 122 sync.waitForTaskCompletion();
124 m_thread.clear(); 123 m_thread.clear();
125 } 124 }
126 125
127 } // namespace blink 126 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698