Changeset 52370 in webkit

Timestamp:

Dec 18, 2009 6:03:00 PM (14 years ago)

Author:

dumi@chromium.org

Message:

Make DatabaseTrackerChromium::removeOpenDatabase() send and IPC on
the main thread when a database is being closed.

Reviewed by Eric Seidel.

​https://bugs.webkit.org/show_bug.cgi?id=32627

• storage/chromium/DatabaseTrackerChromium.cpp:

(WebCore::removeOpenDatabaseOnMainThread):
(WebCore::DatabaseTracker::removeOpenDatabase):

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (2 diffs)
• storage/chromium/DatabaseTrackerChromium.cpp (modified) (1 diff)

trunk/WebCore/ChangeLog

@@ +1 @@
+2009-12-18  Dumitru Daniliuc  <dumi@chromium.org>
+
+        Reviewed by Eric Seidel.
+
+        Make DatabaseTrackerChromium::removeOpenDatabase() send and IPC on
+        the main thread when a database is being closed.
+
+        https://bugs.webkit.org/show_bug.cgi?id=32627
+
+        * storage/chromium/DatabaseTrackerChromium.cpp:
+        (WebCore::removeOpenDatabaseOnMainThread):
+        (WebCore::DatabaseTracker::removeOpenDatabase):
+
 2009-12-18  Brent Fulgham  <bfulgham@webkit.org>
 
@@ -8 +21 @@
           Safari-only call.
 
-2009-12-16  Dumitru Daniliuc  <dumi@chromium.org>
+2009-12-18  Dumitru Daniliuc  <dumi@chromium.org>
 
         Reviewed by Dmitry Titov.

trunk/WebCore/storage/chromium/DatabaseTrackerChromium.cpp

@@ -78 +78 @@
     DatabaseObserver::databaseOpened(database);
 }
+static void removeOpenDatabaseOnMainThread(void* context)
+{
+    Database* database = static_cast<Database*>(context);
+    DatabaseTracker::tracker().removeOpenDatabase(database);
+    database->deref();
+}
 
 void DatabaseTracker::removeOpenDatabase(Database* database)
 {
-    // FIXME: once we know how to use this information, figure out
-    //        how to get this method called on the main thread
-    //ASSERT(isMainThread());
-    //DatabaseObserver::databaseClosed(database);
+    if (!isMainThread()) {
+        database->ref();
+        callOnMainThread(removeOpenDatabaseOnMainThread, database);
+        return;
+    }
+
+    DatabaseObserver::databaseClosed(database);
 }