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

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

Issue 874203002: Add a thread-safety assertion in DEFINE_STATIC_LOCAL (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: added noncopyable Created 5 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: Source/modules/webdatabase/Database.cpp
diff --git a/Source/modules/webdatabase/Database.cpp b/Source/modules/webdatabase/Database.cpp
index 11904b2a2cc34bdc3a24a6a8da7848afc064094f..87ef4bfac91fdc8d8ef4df8bb57f88bdc58d4c6b 100644
--- a/Source/modules/webdatabase/Database.cpp
+++ b/Source/modules/webdatabase/Database.cpp
@@ -148,7 +148,7 @@ static GuidVersionMap& guidToVersionMap()
{
// Ensure the the mutex is locked.
ASSERT(guidMutex().locked());
- DEFINE_STATIC_LOCAL(GuidVersionMap, map, ());
+ DEFINE_STATIC_LOCAL_NOASSERT(GuidVersionMap, map, ());
return map;
}
@@ -174,7 +174,7 @@ static GuidDatabaseMap& guidToDatabaseMap()
{
// Ensure the the mutex is locked.
ASSERT(guidMutex().locked());
- DEFINE_STATIC_LOCAL(GuidDatabaseMap, map, ());
+ DEFINE_STATIC_LOCAL_NOASSERT(GuidDatabaseMap, map, ());
return map;
}
@@ -186,7 +186,7 @@ static DatabaseGuid guidForOriginAndName(const String& origin, const String& nam
String stringID = origin + "/" + name;
typedef HashMap<String, int> IDGuidMap;
- DEFINE_STATIC_LOCAL(IDGuidMap, stringIdentifierToGUIDMap, ());
+ DEFINE_STATIC_LOCAL_NOASSERT(IDGuidMap, stringIdentifierToGUIDMap, ());
DatabaseGuid guid = stringIdentifierToGUIDMap.get(stringID);
if (!guid) {
static int currentNewGUID = 1;

Powered by Google App Engine
This is Rietveld 408576698