From f486d19d62f1bc33246748b14b14a9dfa617b57f Mon Sep 17 00:00:00 2001 From: Iain Merrick Date: Thu, 19 Aug 2010 17:55:56 +0100 Subject: Merge WebKit at r65615 : Initial merge by git. Change-Id: Ifbf384f4531e3b58475a662e38195c2d9152ae79 --- WebCore/storage/DatabaseTask.cpp | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'WebCore/storage/DatabaseTask.cpp') diff --git a/WebCore/storage/DatabaseTask.cpp b/WebCore/storage/DatabaseTask.cpp index 3526d9d..343ae1e 100644 --- a/WebCore/storage/DatabaseTask.cpp +++ b/WebCore/storage/DatabaseTask.cpp @@ -37,6 +37,9 @@ namespace WebCore { DatabaseTaskSynchronizer::DatabaseTaskSynchronizer() : m_taskCompleted(false) +#ifndef NDEBUG + , m_hasCheckedForTermination(false) +#endif { } @@ -67,6 +70,7 @@ DatabaseTask::DatabaseTask(Database* database, DatabaseTaskSynchronizer* synchro DatabaseTask::~DatabaseTask() { + ASSERT(m_complete || !m_synchronizer); } void DatabaseTask::performTask() @@ -81,6 +85,10 @@ void DatabaseTask::performTask() if (m_synchronizer) m_synchronizer->taskCompleted(); + +#ifndef NDEBUG + m_complete = true; +#endif } // *** DatabaseOpenTask *** -- cgit v1.1