| 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 |
| (...skipping 10 matching lines...) Expand all Loading... |
| 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" | 29 #include "platform/audio/HRTFDatabaseLoader.h" |
| 30 | 30 |
| 31 #include "platform/CrossThreadFunctional.h" | |
| 32 #include "platform/TaskSynchronizer.h" | 31 #include "platform/TaskSynchronizer.h" |
| 33 #include "public/platform/Platform.h" | 32 #include "public/platform/Platform.h" |
| 34 #include "public/platform/WebTaskRunner.h" | 33 #include "public/platform/WebTaskRunner.h" |
| 35 #include "public/platform/WebTraceLocation.h" | 34 #include "public/platform/WebTraceLocation.h" |
| 35 #include "wtf/Functional.h" |
| 36 #include "wtf/PtrUtil.h" | 36 #include "wtf/PtrUtil.h" |
| 37 | 37 |
| 38 namespace blink { | 38 namespace blink { |
| 39 | 39 |
| 40 using LoaderMap = HashMap<double, HRTFDatabaseLoader*>; | 40 using LoaderMap = HashMap<double, HRTFDatabaseLoader*>; |
| 41 | 41 |
| 42 static LoaderMap& loaderMap() | 42 static LoaderMap& loaderMap() |
| 43 { | 43 { |
| 44 DEFINE_STATIC_LOCAL(LoaderMap*, map, (new LoaderMap)); | 44 DEFINE_STATIC_LOCAL(LoaderMap*, map, (new LoaderMap)); |
| 45 return *map; | 45 return *map; |
| (...skipping 73 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 119 return; | 119 return; |
| 120 | 120 |
| 121 TaskSynchronizer sync; | 121 TaskSynchronizer sync; |
| 122 // TODO(alexclarke): Should this be posted as a loading task? | 122 // TODO(alexclarke): Should this be posted as a loading task? |
| 123 m_thread->getWebTaskRunner()->postTask(BLINK_FROM_HERE, crossThreadBind(&HRT
FDatabaseLoader::cleanupTask, crossThreadUnretained(this), crossThreadUnretained
(&sync))); | 123 m_thread->getWebTaskRunner()->postTask(BLINK_FROM_HERE, crossThreadBind(&HRT
FDatabaseLoader::cleanupTask, crossThreadUnretained(this), crossThreadUnretained
(&sync))); |
| 124 sync.waitForTaskCompletion(); | 124 sync.waitForTaskCompletion(); |
| 125 m_thread.reset(); | 125 m_thread.reset(); |
| 126 } | 126 } |
| 127 | 127 |
| 128 } // namespace blink | 128 } // namespace blink |
| OLD | NEW |