1 files changed, 8 insertions, 5 deletions
diff --git a/WebCore/storage/DatabaseTracker.cpp b/WebCore/storage/DatabaseTracker.cpp
index 9a78dc8..d139283 100644
--- a/WebCore/storage/DatabaseTracker.cpp
+++ b/WebCore/storage/DatabaseTracker.cpp
@@ -41,6 +41,7 @@
 #include "SecurityOriginHash.h"
 #include "SQLiteStatement.h"
 #include <wtf/MainThread.h>
+#include <wtf/StdLibExtras.h>
 
 using namespace std;
 
@@ -55,7 +56,7 @@ OriginQuotaManager& DatabaseTracker::originQuotaManager()
 
 DatabaseTracker& DatabaseTracker::tracker()
 {
-    static DatabaseTracker tracker;
+    DEFINE_STATIC_LOCAL(DatabaseTracker, tracker, ());
     return tracker;
 }
 
@@ -771,13 +772,15 @@ void DatabaseTracker::setClient(DatabaseTrackerClient* client)
 
 static Mutex& notificationMutex()
 {
-    static Mutex mutex;
+    DEFINE_STATIC_LOCAL(Mutex, mutex, ());
     return mutex;
 }
 
-static Vector<pair<SecurityOrigin*, String> >& notificationQueue()
+typedef Vector<pair<SecurityOrigin*, String> > NotificationQueue;
+
+static NotificationQueue& notificationQueue()
 {
-    static Vector<pair<SecurityOrigin*, String> > queue;
+    DEFINE_STATIC_LOCAL(NotificationQueue, queue, ());
     return queue;
 }
 
@@ -807,7 +810,7 @@ void DatabaseTracker::notifyDatabasesChanged(void*)
     // mechanism to include which tracker the notification goes out on as well.
     DatabaseTracker& theTracker(tracker());
 
-    Vector<pair<SecurityOrigin*, String> > notifications;
+    NotificationQueue notifications;
     {
         MutexLocker locker(notificationMutex());