| Index: third_party/WebKit/Source/modules/webdatabase/Database.cpp
|
| diff --git a/third_party/WebKit/Source/modules/webdatabase/Database.cpp b/third_party/WebKit/Source/modules/webdatabase/Database.cpp
|
| index 61d55c2666bd8a722e5b2fb9a48192a3f6a23576..9ea1dbf3d83136e2773d9b23e2c4e2ba9c620775 100644
|
| --- a/third_party/WebKit/Source/modules/webdatabase/Database.cpp
|
| +++ b/third_party/WebKit/Source/modules/webdatabase/Database.cpp
|
| @@ -236,7 +236,7 @@ Database::Database(DatabaseContext* databaseContext,
|
| m_name = "";
|
|
|
| {
|
| - SafePointAwareMutexLocker locker(guidMutex());
|
| + MutexLocker locker(guidMutex());
|
| m_guid = guidForOriginAndName(getSecurityOrigin()->toString(), name);
|
| guidCount().add(m_guid);
|
| }
|
| @@ -389,7 +389,7 @@ void Database::closeDatabase() {
|
| // 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)) {
|
| @@ -454,7 +454,7 @@ bool Database::performOpenAndVerify(bool shouldSetVersionInNewDatabase,
|
|
|
| String currentVersion;
|
| {
|
| - SafePointAwareMutexLocker locker(guidMutex());
|
| + MutexLocker locker(guidMutex());
|
|
|
| GuidVersionMap::iterator entry = guidToVersionMap().find(m_guid);
|
| if (entry != guidToVersionMap().end()) {
|
| @@ -668,13 +668,13 @@ void Database::setExpectedVersion(const String& version) {
|
| }
|
|
|
| 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);
|
| }
|
|
|
|
|