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

Unified Diff: Source/platform/audio/HRTFDatabaseLoader.cpp

Issue 666213003: HRTFDatabaseLoader needs to acquire a lock when accessing m_hrtfDatabase (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 6 years, 2 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « Source/platform/audio/HRTFDatabaseLoader.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/platform/audio/HRTFDatabaseLoader.cpp
diff --git a/Source/platform/audio/HRTFDatabaseLoader.cpp b/Source/platform/audio/HRTFDatabaseLoader.cpp
index a64f0ddbfb449dafb27502d0c02b9e69d0fb795b..4731ec45d3d6a8be06b0b257329d7dbbc731b987 100644
--- a/Source/platform/audio/HRTFDatabaseLoader.cpp
+++ b/Source/platform/audio/HRTFDatabaseLoader.cpp
@@ -72,6 +72,7 @@ HRTFDatabaseLoader::~HRTFDatabaseLoader()
{
ASSERT(isMainThread());
+ MutexLocker locker(m_lock);
waitForLoaderThreadCompletion();
m_hrtfDatabase.clear();
}
@@ -79,6 +80,7 @@ HRTFDatabaseLoader::~HRTFDatabaseLoader()
void HRTFDatabaseLoader::load()
{
ASSERT(!isMainThread());
+ MutexLocker locker(m_lock);
if (!m_hrtfDatabase) {
// Load the default HRTF database.
m_hrtfDatabase = HRTFDatabase::create(m_databaseSampleRate);
@@ -89,8 +91,7 @@ void HRTFDatabaseLoader::loadAsynchronously()
{
ASSERT(isMainThread());
- MutexLocker locker(m_threadLock);
-
+ MutexLocker locker(m_lock);
if (!m_hrtfDatabase && !m_databaseLoaderThread) {
// Start the asynchronous database loading process.
m_databaseLoaderThread = adoptPtr(Platform::current()->createThread("HRTF database loader"));
@@ -98,14 +99,14 @@ void HRTFDatabaseLoader::loadAsynchronously()
}
}
-bool HRTFDatabaseLoader::isLoaded() const
+bool HRTFDatabaseLoader::isLoaded()
{
+ MutexLocker locker(m_lock);
return m_hrtfDatabase;
}
void HRTFDatabaseLoader::waitForLoaderThreadCompletion()
{
- MutexLocker locker(m_threadLock);
m_databaseLoaderThread.clear();
}
« no previous file with comments | « Source/platform/audio/HRTFDatabaseLoader.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698