Changeset 56604 in webkit

Timestamp:

Mar 25, 2010 11:06:18 PM (14 years ago)

Author:

eric@webkit.org

Message:

2010-03-25 Eric Uhrhane <​ericu@chromium.org>

Reviewed by David Levin.

Missing lock in call to doneCreatingDatabase
​https://bugs.webkit.org/show_bug.cgi?id=36473

Added new test storage/open-database-over-quota.html.

• storage/open-database-over-quota.html: Added.
• storage/open-database-over-quota-expected.txt: Added.

2010-03-25 Eric Uhrhane <​ericu@chromium.org>

Reviewed by David Levin.

Missing lock in call to doneCreatingDatabase
​https://bugs.webkit.org/show_bug.cgi?id=36473

Added new test storage/open-database-over-quota.html.

• storage/DatabaseTracker.cpp: (WebCore::DatabaseTracker::canEstablishDatabase): Added missing lock call.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/storage/open-database-over-quota-expected.txt (added)
• LayoutTests/storage/open-database-over-quota.html (added)
• WebCore/ChangeLog (modified) (1 diff)
• WebCore/storage/DatabaseTracker.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2010-03-25  Eric Uhrhane  <ericu@chromium.org>
+
+        Reviewed by David Levin.
+
+        Missing lock in call to doneCreatingDatabase
+        https://bugs.webkit.org/show_bug.cgi?id=36473
+
+        Added new test storage/open-database-over-quota.html.
+
+        * storage/open-database-over-quota.html: Added.
+        * storage/open-database-over-quota-expected.txt: Added.
+
 2010-03-25  Tony Chang  <tony@chromium.org>
 

trunk/WebCore/ChangeLog

@@ +1 @@
+2010-03-25  Eric Uhrhane  <ericu@chromium.org>
+
+        Reviewed by David Levin.
+
+        Missing lock in call to doneCreatingDatabase
+        https://bugs.webkit.org/show_bug.cgi?id=36473
+
+        Added new test storage/open-database-over-quota.html.
+
+        * storage/DatabaseTracker.cpp:
+        (WebCore::DatabaseTracker::canEstablishDatabase):  Added missing lock call.
+
 2010-03-25  Ojan Vafai  <ojan@chromium.org>
 

trunk/WebCore/storage/DatabaseTracker.cpp

@@ -169 +169 @@
     // Drop all locks before calling out; we don't know what they'll do.
     context->databaseExceededQuota(name);
-    {
-        MutexLocker lockDatabase(m_databaseGuard);
-        m_proposedDatabases.remove(&details);
-    }
+
+    MutexLocker lockDatabase(m_databaseGuard);
+
+    m_proposedDatabases.remove(&details);
 
     // If the database will fit now, allow its creation.
-    if (requirement <= quotaForOrigin(origin))
+    if (requirement <= quotaForOriginNoLock(origin))
         return true;
 
     doneCreatingDatabase(origin, name);
+
     return false;
 }