OLD | NEW |
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 |
11 * notice, this list of conditions and the following disclaimer in the | 11 * notice, this list of conditions and the following disclaimer in the |
12 * documentation and/or other materials provided with the distribution. | 12 * documentation and/or other materials provided with the distribution. |
13 * 3. Neither the name of Apple Computer, Inc. ("Apple") nor the names of | 13 * 3. Neither the name of Apple Computer, Inc. ("Apple") nor the names of |
14 * its contributors may be used to endorse or promote products derived | 14 * its contributors may be used to endorse or promote products derived |
15 * from this software without specific prior written permission. | 15 * from this software without specific prior written permission. |
16 * | 16 * |
17 * THIS SOFTWARE IS PROVIDED BY APPLE AND ITS CONTRIBUTORS "AS IS" AND ANY | 17 * THIS SOFTWARE IS PROVIDED BY APPLE AND ITS CONTRIBUTORS "AS IS" AND ANY |
18 * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED | 18 * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED |
19 * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE | 19 * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE |
20 * DISCLAIMED. IN NO EVENT SHALL APPLE OR ITS CONTRIBUTORS BE LIABLE FOR ANY | 20 * DISCLAIMED. IN NO EVENT SHALL APPLE OR ITS CONTRIBUTORS BE LIABLE FOR ANY |
21 * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES | 21 * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES |
22 * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; | 22 * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; |
23 * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND | 23 * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND |
24 * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | 24 * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT |
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" | |
30 #include "platform/TaskSynchronizer.h" | 29 #include "platform/TaskSynchronizer.h" |
31 #include "platform/ThreadSafeFunctional.h" | 30 #include "platform/ThreadSafeFunctional.h" |
| 31 #include "platform/audio/HRTFDatabaseLoader.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/PtrUtil.h" |
35 | 36 |
36 namespace blink { | 37 namespace blink { |
37 | 38 |
38 using LoaderMap = HashMap<double, HRTFDatabaseLoader*>; | 39 using LoaderMap = HashMap<double, HRTFDatabaseLoader*>; |
39 | 40 |
40 static LoaderMap& loaderMap() | 41 static LoaderMap& loaderMap() |
41 { | 42 { |
42 DEFINE_STATIC_LOCAL(LoaderMap*, map, (new LoaderMap)); | 43 DEFINE_STATIC_LOCAL(LoaderMap*, map, (new LoaderMap)); |
43 return *map; | 44 return *map; |
44 } | 45 } |
(...skipping 40 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
85 } | 86 } |
86 } | 87 } |
87 | 88 |
88 void HRTFDatabaseLoader::loadAsynchronously() | 89 void HRTFDatabaseLoader::loadAsynchronously() |
89 { | 90 { |
90 ASSERT(isMainThread()); | 91 ASSERT(isMainThread()); |
91 | 92 |
92 MutexLocker locker(m_lock); | 93 MutexLocker locker(m_lock); |
93 if (!m_hrtfDatabase && !m_thread) { | 94 if (!m_hrtfDatabase && !m_thread) { |
94 // Start the asynchronous database loading process. | 95 // Start the asynchronous database loading process. |
95 m_thread = adoptPtr(Platform::current()->createThread("HRTF database loa
der")); | 96 m_thread = wrapUnique(Platform::current()->createThread("HRTF database l
oader")); |
96 // TODO(alexclarke): Should this be posted as a loading task? | 97 // TODO(alexclarke): Should this be posted as a loading task? |
97 m_thread->getWebTaskRunner()->postTask(BLINK_FROM_HERE, threadSafeBind(&
HRTFDatabaseLoader::loadTask, AllowCrossThreadAccess(this))); | 98 m_thread->getWebTaskRunner()->postTask(BLINK_FROM_HERE, threadSafeBind(&
HRTFDatabaseLoader::loadTask, AllowCrossThreadAccess(this))); |
98 } | 99 } |
99 } | 100 } |
100 | 101 |
101 bool HRTFDatabaseLoader::isLoaded() | 102 bool HRTFDatabaseLoader::isLoaded() |
102 { | 103 { |
103 MutexLocker locker(m_lock); | 104 MutexLocker locker(m_lock); |
104 return m_hrtfDatabase.get(); | 105 return m_hrtfDatabase.get(); |
105 } | 106 } |
(...skipping 11 matching lines...) Expand all Loading... |
117 return; | 118 return; |
118 | 119 |
119 TaskSynchronizer sync; | 120 TaskSynchronizer sync; |
120 // TODO(alexclarke): Should this be posted as a loading task? | 121 // TODO(alexclarke): Should this be posted as a loading task? |
121 m_thread->getWebTaskRunner()->postTask(BLINK_FROM_HERE, threadSafeBind(&HRTF
DatabaseLoader::cleanupTask, AllowCrossThreadAccess(this), AllowCrossThreadAcces
s(&sync))); | 122 m_thread->getWebTaskRunner()->postTask(BLINK_FROM_HERE, threadSafeBind(&HRTF
DatabaseLoader::cleanupTask, AllowCrossThreadAccess(this), AllowCrossThreadAcces
s(&sync))); |
122 sync.waitForTaskCompletion(); | 123 sync.waitForTaskCompletion(); |
123 m_thread.reset(); | 124 m_thread.reset(); |
124 } | 125 } |
125 | 126 |
126 } // namespace blink | 127 } // namespace blink |
OLD | NEW |