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

Unified Diff: third_party/WebKit/Source/modules/webdatabase/Database.cpp

Issue 2691073004: Remove SafePointAwareMutexLocker (Closed)
Patch Set: Created 3 years, 10 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
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);
}
« no previous file with comments | « no previous file | third_party/WebKit/Source/platform/heap/Heap.h » ('j') | third_party/WebKit/Source/platform/heap/Heap.cpp » ('J')

Powered by Google App Engine
This is Rietveld 408576698