[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc

[andreip at google.com]

The following commit has been merged in the debian/experimental branch:
commit 073c3d61d957b820e1b34a9870685f81bcbad509
Author: andreip at google.com <andreip at google.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Sep 24 15:23:35 2010 +0000

    2010-09-24  Andrei Popescu  <andreip at google.com>
    
            Reviewed by Jeremy Orlow.
    
            IDBTransactionCoordinator incorrectly assumes that aborted transactions must have been started or running.
            https://bugs.webkit.org/show_bug.cgi?id=46459
    
            No new tests, storage/indexeddb/transaction-basics.html covers this.
    
            Also fixes http://code.google.com/p/chromium/issues/detail?id=56732
    
            * storage/IDBTransactionCoordinator.cpp:
            (WebCore::IDBTransactionCoordinator::didFinishTransaction):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@68254 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 265d608..b75acf8 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,17 @@
+2010-09-24  Andrei Popescu  <andreip at google.com>
+
+        Reviewed by Jeremy Orlow.
+
+        IDBTransactionCoordinator incorrectly assumes that aborted transactions must have been started or running.
+        https://bugs.webkit.org/show_bug.cgi?id=46459
+
+        No new tests, storage/indexeddb/transaction-basics.html covers this.
+
+        Also fixes http://code.google.com/p/chromium/issues/detail?id=56732
+
+        * storage/IDBTransactionCoordinator.cpp:
+        (WebCore::IDBTransactionCoordinator::didFinishTransaction):
+
 2010-09-24  Hans Wennborg  <hans at chromium.org>
 
         Reviewed by Steve Block.
diff --git a/WebCore/storage/IDBTransactionCoordinator.cpp b/WebCore/storage/IDBTransactionCoordinator.cpp
index 4b06371..0ece309 100644
--- a/WebCore/storage/IDBTransactionCoordinator.cpp
+++ b/WebCore/storage/IDBTransactionCoordinator.cpp
@@ -67,10 +67,9 @@ void IDBTransactionCoordinator::didFinishTransaction(IDBTransactionBackendImpl*
     if (m_startedTransactions.contains(transaction)) {
         ASSERT(!m_runningTransactions.contains(transaction));
         m_startedTransactions.remove(transaction);
-    } else {
-        ASSERT(m_runningTransactions.contains(transaction));
+    } else if (m_runningTransactions.contains(transaction))
         m_runningTransactions.remove(transaction);
-    }
+
     m_transactions.remove(transaction->id());
 
     processStartedTransactions();

-- 
WebKit Debian packaging