Index: Source/modules/webdatabase/DatabaseThread.cpp |
diff --git a/Source/modules/webdatabase/DatabaseThread.cpp b/Source/modules/webdatabase/DatabaseThread.cpp |
index 2fdfec70175e376872234049dec17d19973e5757..f3eeb14916ce6c5152192d5e411655b5cf9c10c5 100644 |
--- a/Source/modules/webdatabase/DatabaseThread.cpp |
+++ b/Source/modules/webdatabase/DatabaseThread.cpp |
@@ -91,8 +91,13 @@ |
m_thread->postTask(new Task(WTF::bind(&DatabaseThread::cleanupDatabaseThread, this))); |
} |
-bool DatabaseThread::terminationRequested() const |
+bool DatabaseThread::terminationRequested(TaskSynchronizer* taskSynchronizer) const |
{ |
+#if ENABLE(ASSERT) |
+ if (taskSynchronizer) |
+ taskSynchronizer->setHasCheckedForTermination(); |
+#endif |
+ |
MutexLocker lock(m_terminationRequestedMutex); |
return m_terminationRequested; |
} |
@@ -152,7 +157,7 @@ |
void DatabaseThread::scheduleTask(PassOwnPtr<DatabaseTask> task) |
{ |
ASSERT(m_thread); |
- ASSERT(!terminationRequested()); |
+ ASSERT(!task->hasSynchronizer() || task->hasCheckedForTermination()); |
// WebThread takes ownership of the task. |
m_thread->postTask(task.leakPtr()); |
} |