Rename threadSafeBind() to crossThreadBind()

third_party/WebKit/Source/platform/audio/HRTFDatabaseLoader.cpp

 /*
  * Copyright (C) 2010 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  *
  * 1.  Redistributions of source code must retain the above copyright
  *     notice, this list of conditions and the following disclaimer.
  * 2.  Redistributions in binary form must reproduce the above copyright
  *     notice, this list of conditions and the following disclaimer in the
  *     documentation and/or other materials provided with the distribution.
  * 3.  Neither the name of Apple Computer, Inc. ("Apple") nor the names of
  *     its contributors may be used to endorse or promote products derived
  *     from this software without specific prior written permission.
  *
  * THIS SOFTWARE IS PROVIDED BY APPLE AND ITS CONTRIBUTORS "AS IS" AND ANY
  * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
  * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
  * DISCLAIMED. IN NO EVENT SHALL APPLE OR ITS CONTRIBUTORS BE LIABLE FOR ANY
  * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
  * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
  * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
  * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+#include "platform/audio/HRTFDatabaseLoader.h"
+
+#include "platform/CrossThreadFunctional.h"
 #include "platform/TaskSynchronizer.h"
-#include "platform/ThreadSafeFunctional.h"
-#include "platform/audio/HRTFDatabaseLoader.h"
 #include "public/platform/Platform.h"
 #include "public/platform/WebTaskRunner.h"
 #include "public/platform/WebTraceLocation.h"
 #include "wtf/PtrUtil.h"
 
 namespace blink {
 
 using LoaderMap = HashMap<double, HRTFDatabaseLoader*>;
 
 static LoaderMap& loaderMap()
@@ skipping 46 matching lines @@
 
 void HRTFDatabaseLoader::loadAsynchronously()
 {
     ASSERT(isMainThread());
 
     MutexLocker locker(m_lock);
     if (!m_hrtfDatabase && !m_thread) {
         // Start the asynchronous database loading process.
         m_thread = wrapUnique(Platform::current()->createThread("HRTF database loader"));
         // TODO(alexclarke): Should this be posted as a loading task?
-        m_thread->getWebTaskRunner()->postTask(BLINK_FROM_HERE, threadSafeBind(&HRTFDatabaseLoader::loadTask, crossThreadUnretained(this)));
+        m_thread->getWebTaskRunner()->postTask(BLINK_FROM_HERE, crossThreadBind(&HRTFDatabaseLoader::loadTask, crossThreadUnretained(this)));
     }
 }
 
 bool HRTFDatabaseLoader::isLoaded()
 {
     MutexLocker locker(m_lock);
     return m_hrtfDatabase.get();
 }
 
 // This cleanup task is needed just to make sure that the loader thread finishes
 // the load task and thus the loader thread doesn't touch m_thread any more.
 void HRTFDatabaseLoader::cleanupTask(TaskSynchronizer* sync)
 {
     sync->taskCompleted();
 }
 
 void HRTFDatabaseLoader::waitForLoaderThreadCompletion()
 {
     if (!m_thread)
         return;
 
     TaskSynchronizer sync;
     // TODO(alexclarke): Should this be posted as a loading task?
-    m_thread->getWebTaskRunner()->postTask(BLINK_FROM_HERE, threadSafeBind(&HRTFDatabaseLoader::cleanupTask, crossThreadUnretained(this), crossThreadUnretained(&sync)));
+    m_thread->getWebTaskRunner()->postTask(BLINK_FROM_HERE, crossThreadBind(&HRTFDatabaseLoader::cleanupTask, crossThreadUnretained(this), crossThreadUnretained(&sync)));
     sync.waitForTaskCompletion();
     m_thread.reset();
 }
 
 } // namespace blink