Remove SafePointAwareMutexLocker

third_party/WebKit/Source/modules/webdatabase/Database.cpp

 /*
  * Copyright (C) 2013 Apple 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
@@ skipping 218 matching lines @@
   DCHECK(isMainThread());
   m_contextThreadSecurityOrigin =
       m_databaseContext->getSecurityOrigin()->isolatedCopy();
 
   m_databaseAuthorizer = DatabaseAuthorizer::create(infoTableName);
 
   if (m_name.isNull())
     m_name = "";
 
   {
-    SafePointAwareMutexLocker locker(guidMutex());
+    MutexLocker locker(guidMutex());
     m_guid = guidForOriginAndName(getSecurityOrigin()->toString(), name);
     guidCount().add(m_guid);
   }
 
   m_filename = DatabaseManager::manager().fullPathForDatabase(
       getSecurityOrigin(), m_name);
 
   m_databaseThreadSecurityOrigin =
       m_contextThreadSecurityOrigin->isolatedCopy();
   ASSERT(m_databaseContext->databaseThread());
@@ skipping 132 matching lines @@
 
 void Database::closeDatabase() {
   if (!m_opened)
     return;
 
   releaseStore(&m_opened, 0);
   m_sqliteDatabase.close();
   // See comment at the top this file regarding calling removeOpenDatabase().
   DatabaseTracker::tracker().removeOpenDatabase(this);
   {
-    SafePointAwareMutexLocker locker(guidMutex());
+    MutexLocker locker(guidMutex());
 
     ASSERT(guidCount().contains(m_guid));
     if (guidCount().remove(m_guid)) {
       guidToVersionMap().erase(m_guid);
     }
   }
 }
 
 String Database::version() const {
   // Note: In multi-process browsers the cached value may be accurate, but we
@@ skipping 44 matching lines @@
   }
   if (!m_sqliteDatabase.turnOnIncrementalAutoVacuum())
     DLOG(ERROR) << "Unable to turn on incremental auto-vacuum ("
                 << m_sqliteDatabase.lastError() << " "
                 << m_sqliteDatabase.lastErrorMsg() << ")";
 
   m_sqliteDatabase.setBusyTimeout(maxSqliteBusyWaitTime);
 
   String currentVersion;
   {
-    SafePointAwareMutexLocker locker(guidMutex());
+    MutexLocker locker(guidMutex());
 
     GuidVersionMap::iterator entry = guidToVersionMap().find(m_guid);
     if (entry != guidToVersionMap().end()) {
       // Map null string to empty string (see updateGuidVersionMap()).
       currentVersion =
           entry->value.isNull() ? emptyString : entry->value.isolatedCopy();
       STORAGE_DVLOG(1) << "Current cached version for guid " << m_guid << " is "
                        << currentVersion;
 
       // Note: In multi-process browsers the cached value may be
@@ skipping 193 matching lines @@
   m_databaseAuthorizer->enable();
 
   return result;
 }
 
 void Database::setExpectedVersion(const String& version) {
   m_expectedVersion = version.isolatedCopy();
 }
 
 String Database::getCachedVersion() const {
-  SafePointAwareMutexLocker locker(guidMutex());
+  MutexLocker locker(guidMutex());
   return guidToVersionMap().get(m_guid).isolatedCopy();
 }
 
 void Database::setCachedVersion(const String& actualVersion) {
   // Update the in memory database version map.
-  SafePointAwareMutexLocker locker(guidMutex());
+  MutexLocker locker(guidMutex());
   updateGuidVersionMap(m_guid, actualVersion);
 }
 
 bool Database::getActualVersionForTransaction(String& actualVersion) {
   ASSERT(m_sqliteDatabase.transactionInProgress());
   // Note: In multi-process browsers the cached value may be inaccurate. So we
   // retrieve the value from the database and update the cached value here.
   return getVersionFromDatabase(actualVersion, true);
 }
 
@@ skipping 258 matching lines @@
   if (getDatabaseContext()->databaseThread()->isDatabaseThread())
     return m_databaseThreadSecurityOrigin.get();
   return nullptr;
 }
 
 bool Database::opened() {
   return static_cast<bool>(acquireLoad(&m_opened));
 }
 
 }  // namespace blink