1 files changed, 10 insertions, 12 deletions
diff --git a/WebCore/storage/OriginQuotaManager.cpp b/WebCore/storage/OriginQuotaManager.cpp
index 2b98ab7..30b3271 100644
--- a/WebCore/storage/OriginQuotaManager.cpp
+++ b/WebCore/storage/OriginQuotaManager.cpp
@@ -75,25 +75,25 @@ bool OriginQuotaManager::tracksOrigin(SecurityOrigin* origin) const
 void OriginQuotaManager::addDatabase(SecurityOrigin* origin, const String& databaseIdentifier, const String& fullPath)
 {
     ASSERT(m_usageRecordGuardLocked);
-    
+
     OriginUsageRecord* usageRecord = m_usageMap.get(origin);
     ASSERT(usageRecord);
-    
-    usageRecord->addDatabase(databaseIdentifier.copy(), fullPath.copy());
+
+    usageRecord->addDatabase(databaseIdentifier.threadsafeCopy(), fullPath.threadsafeCopy());
 }
 
 void OriginQuotaManager::removeDatabase(SecurityOrigin* origin, const String& databaseIdentifier)
 {
     ASSERT(m_usageRecordGuardLocked);
-    
-    if (OriginUsageRecord* usageRecord = m_usageMap.get(origin))    
+
+    if (OriginUsageRecord* usageRecord = m_usageMap.get(origin))
         usageRecord->removeDatabase(databaseIdentifier);
 }
 
 void OriginQuotaManager::removeOrigin(SecurityOrigin* origin)
 {
     ASSERT(m_usageRecordGuardLocked);
-    
+
     if (OriginUsageRecord* usageRecord = m_usageMap.get(origin)) {
         m_usageMap.remove(origin);
         delete usageRecord;
@@ -104,24 +104,22 @@ void OriginQuotaManager::markDatabase(Database* database)
 {
     ASSERT(database);
     ASSERT(m_usageRecordGuardLocked);
-    RefPtr<SecurityOrigin> origin = database->securityOriginCopy();
-    OriginUsageRecord* usageRecord = m_usageMap.get(origin);
+    OriginUsageRecord* usageRecord = m_usageMap.get(database->securityOrigin());
     ASSERT(usageRecord);
-    
+
     usageRecord->markDatabase(database->stringIdentifier());
 }
 
 unsigned long long OriginQuotaManager::diskUsage(SecurityOrigin* origin) const
 {
     ASSERT(m_usageRecordGuardLocked);
-    
+
     OriginUsageRecord* usageRecord = m_usageMap.get(origin);
     ASSERT(usageRecord);
-    
+
     return usageRecord->diskUsage();
 }
 
-
 }
 
 #endif // ENABLE(DATABASE)