Changeset 57034 in webkit

Timestamp:

Apr 2, 2010 5:06:57 PM (14 years ago)

Author:

eric@webkit.org

Message:

2010-04-02 Michael Nordman <Michael Nordman>

Reviewed by Nate Chapin.

Set the close policy used by the DatabaseCloseTask in a constructor argument
instead of hard coding it.
​https://bugs.webkit.org/show_bug.cgi?id=37037

No new tests, new new functionality.

• storage/Database.cpp: This callsite passes in DoNotRemoveFromDatabaseContext to retain its current behavior. (WebCore::Database::markAsDeletedAndClose):
• storage/DatabaseTask.cpp: (WebCore::DatabaseCloseTask::DatabaseCloseTask): (WebCore::DatabaseCloseTask::doPerformTask):
• storage/DatabaseTask.h: (WebCore::DatabaseCloseTask::create):

2010-04-02 Michael Nordman <Michael Nordman>

Reviewed by Nate Chapin.

Set the close policy used by the DatabaseCloseTask at this callsite to
RemoveDatabaseFromContext. This restores its behavior to what it was prior to
r56293.
​https://bugs.webkit.org/show_bug.cgi?id=37037

• src/WebDatabase.cpp: (WebKit::WebDatabase::closeDatabaseImmediately):

Location:

trunk

Files:

• WebCore/ChangeLog (modified) (1 diff)
• WebCore/storage/Database.cpp (modified) (1 diff)
• WebCore/storage/DatabaseTask.cpp (modified) (2 diffs)
• WebCore/storage/DatabaseTask.h (modified) (4 diffs)
• WebKit/chromium/ChangeLog (modified) (1 diff)
• WebKit/chromium/src/WebDatabase.cpp (modified) (1 diff)

trunk/WebCore/ChangeLog

@@ +1 @@
+2010-04-02  Michael Nordman  <michaeln@google.com>
+
+        Reviewed by Nate Chapin.
+
+        Set the close policy used by the DatabaseCloseTask in a constructor argument
+        instead of hard coding it.
+        https://bugs.webkit.org/show_bug.cgi?id=37037
+
+        No new tests, new new functionality.
+
+        * storage/Database.cpp: This callsite passes in DoNotRemoveFromDatabaseContext to retain its current behavior.
+        (WebCore::Database::markAsDeletedAndClose):
+        * storage/DatabaseTask.cpp:
+        (WebCore::DatabaseCloseTask::DatabaseCloseTask):
+        (WebCore::DatabaseCloseTask::doPerformTask):
+        * storage/DatabaseTask.h:
+        (WebCore::DatabaseCloseTask::create):
+
 2010-04-02  James Robinson  <jamesr@chromium.org>
 

trunk/WebCore/storage/Database.cpp

@@ -385 +385 @@
 
     DatabaseTaskSynchronizer synchronizer;
-    OwnPtr<DatabaseCloseTask> task = DatabaseCloseTask::create(this, &synchronizer);
+    OwnPtr<DatabaseCloseTask> task = DatabaseCloseTask::create(this, DoNotRemoveDatabaseFromContext, &synchronizer);
 
     m_scriptExecutionContext->databaseThread()->scheduleImmediateTask(task.release());

trunk/WebCore/storage/DatabaseTask.cpp

@@ -111 +111 @@
 // Closes the database.
 
-DatabaseCloseTask::DatabaseCloseTask(Database* database, DatabaseTaskSynchronizer* synchronizer)
+DatabaseCloseTask::DatabaseCloseTask(Database* database, Database::ClosePolicy closePolicy, DatabaseTaskSynchronizer* synchronizer)
     : DatabaseTask(database, synchronizer)
+    , m_closePolicy(closePolicy)
 {
 }
@@ -118 +119 @@
 void DatabaseCloseTask::doPerformTask()
 {
-    // Tell the database not to call back to the context thread; we'll handle it.
-    database()->close(Database::DoNotRemoveDatabaseFromContext);
+    database()->close(m_closePolicy);
 }
 

trunk/WebCore/storage/DatabaseTask.h

@@ -30 +30 @@
 
 #if ENABLE(DATABASE)
+#include "Database.h"
 #include "ExceptionCode.h"
 #include "PlatformString.h"
@@ -40 +41 @@
 namespace WebCore {
 
-class Database;
 class DatabaseTask;
 class DatabaseThread;
@@ -111 +111 @@
 class DatabaseCloseTask : public DatabaseTask {
 public:
-    static PassOwnPtr<DatabaseCloseTask> create(Database* db, DatabaseTaskSynchronizer* synchronizer)
+    static PassOwnPtr<DatabaseCloseTask> create(Database* db, Database::ClosePolicy closePolicy, DatabaseTaskSynchronizer* synchronizer)
     { 
-        return new DatabaseCloseTask(db, synchronizer);
+        return new DatabaseCloseTask(db, closePolicy, synchronizer);
     }
 
 private:
-    DatabaseCloseTask(Database*, DatabaseTaskSynchronizer*);
+    DatabaseCloseTask(Database*, Database::ClosePolicy, DatabaseTaskSynchronizer*);
 
     virtual void doPerformTask();
@@ -123 +123 @@
     virtual const char* debugTaskName() const;
 #endif
+
+    Database::ClosePolicy m_closePolicy;
 };
 

trunk/WebKit/chromium/ChangeLog

@@ +1 @@
+2010-04-02  Michael Nordman  <michaeln@google.com>
+
+        Reviewed by Nate Chapin.
+
+        Set the close policy used by the DatabaseCloseTask at this callsite to
+        RemoveDatabaseFromContext. This restores its behavior to what it was prior to
+        r56293.
+        https://bugs.webkit.org/show_bug.cgi?id=37037
+
+        * src/WebDatabase.cpp:
+        (WebKit::WebDatabase::closeDatabaseImmediately):
+
 2010-04-02  Evan Stade  <estade@chromium.org>
 

trunk/WebKit/chromium/src/WebDatabase.cpp

@@ -120 +120 @@
         if (databaseThread && !databaseThread->terminationRequested()) {
             database->stop();
-            databaseThread->scheduleTask(DatabaseCloseTask::create(database, 0));
+            databaseThread->scheduleTask(DatabaseCloseTask::create(database, Database::RemoveDatabaseFromContext, 0));
         }
     }