Merge 96554 - A little more WebSQLDatabase thread safety.

Source/WebCore/storage/chromium/QuotaTracker.cpp

 /*
- * Copyright (C) 2009 Google Inc. All rights reserved.
+ * Copyright (C) 2011 Google 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:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
  * copyright notice, this list of conditions and the following disclaimer
  * in the documentation and/or other materials provided with the
@@ skipping 20 matching lines @@
 #include "PlatformSupport.h"
 
 #if ENABLE(DATABASE)
 
 #include <wtf/StdLibExtras.h>
 
 namespace WebCore {
 
 QuotaTracker& QuotaTracker::instance()
 {
-    DEFINE_STATIC_LOCAL(QuotaTracker, tracker, ());
+    AtomicallyInitializedStatic(QuotaTracker&, tracker = *new QuotaTracker);
     return tracker;
 }
 
 void QuotaTracker::getDatabaseSizeAndSpaceAvailableToOrigin(
     const String& originIdentifier, const String& databaseName,
     unsigned long long* databaseSize, unsigned long long* spaceAvailable)
 {
     // Extra scope to unlock prior to potentially calling PlatformSupport.
     {
         MutexLocker lockData(m_dataGuard);
@@ skipping 29 matching lines @@
 
 void QuotaTracker::resetSpaceAvailableToOrigin(const String& originIdentifier)
 {
     MutexLocker lockData(m_dataGuard);
     m_spaceAvailableToOrigins.remove(originIdentifier);
 }
 
 } // namespace WebCore
 
 #endif // ENABLE(DATABASE)