Add a thread-safety assertion in DEFINE_STATIC_LOCAL

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 130 matching lines @@
 {
     AtomicallyInitializedStaticReference(RecursiveMutex, mutex, new RecursiveMutex);
     return mutex;
 }
 
 typedef HashMap<DatabaseGuid, String> GuidVersionMap;
 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;
 }
 
 // NOTE: Caller must lock guidMutex().
 static inline void updateGuidVersionMap(DatabaseGuid guid, String newVersion)
 {
     // Ensure the the mutex is locked.
     ASSERT(guidMutex().locked());
 
     // Note: It is not safe to put an empty string into the guidToVersionMap()
     // map. That's because the map is cross-thread, but empty strings are
     // per-thread. The copy() function makes a version of the string you can
     // use on the current thread, but we need a string we can keep in a
     // cross-thread data structure.
     // FIXME: This is a quite-awkward restriction to have to program with.
 
     // Map null string to empty string (see comment above).
     guidToVersionMap().set(guid, newVersion.isEmpty() ? String() : newVersion.isolatedCopy());
 }
 
 typedef HashMap<DatabaseGuid, HashSet<Database*>*> GuidDatabaseMap;
 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;
 }
 
 static DatabaseGuid guidForOriginAndName(const String& origin, const String& name)
 {
     // Ensure the the mutex is locked.
     ASSERT(guidMutex().locked());
 
     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;
         guid = currentNewGUID++;
         stringIdentifierToGUIDMap.set(stringID, guid);
     }
 
     return guid;
 }
 
@@ skipping 720 matching lines @@
 SecurityOrigin* Database::securityOrigin() const
 {
     if (executionContext()->isContextThread())
         return m_contextThreadSecurityOrigin.get();
     if (databaseContext()->databaseThread()->isDatabaseThread())
         return m_databaseThreadSecurityOrigin.get();
     return 0;
 }
 
 } // namespace blink