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

[commit-queue at webkit.org]

The following commit has been merged in the debian/experimental branch:
commit 09afb6fe2a98f849fee7e88c0c9efac21c2ea1b6
Author: commit-queue at webkit.org <commit-queue at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Oct 18 00:04:27 2010 +0000

    2010-10-17  Hyung Song  <beergun at company100.net>
    
            Reviewed by David Levin.
    
            Add !SINGLE_THREADED guard.
            https://bugs.webkit.org/show_bug.cgi?id=47608
    
            For SINGLE_THREADED ports LockingMutex.tryLock() returns false.
            This will prevent interrupt() from falling into infinite loop.
    
            * platform/sql/SQLiteDatabase.cpp:
            (WebCore::SQLiteDatabase::interrupt):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@69935 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 71c9976..1eda1aa 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,16 @@
+2010-10-17  Hyung Song  <beergun at company100.net>
+
+        Reviewed by David Levin.
+
+        Add !SINGLE_THREADED guard.
+        https://bugs.webkit.org/show_bug.cgi?id=47608
+
+        For SINGLE_THREADED ports LockingMutex.tryLock() returns false.
+        This will prevent interrupt() from falling into infinite loop.
+
+        * platform/sql/SQLiteDatabase.cpp:
+        (WebCore::SQLiteDatabase::interrupt):
+
 2010-10-17  Simon Fraser  <simon.fraser at apple.com>
 
         Reviewed by Nikolas Zimmermann.
diff --git a/WebCore/platform/sql/SQLiteDatabase.cpp b/WebCore/platform/sql/SQLiteDatabase.cpp
index 7096dfc..ae963bb 100644
--- a/WebCore/platform/sql/SQLiteDatabase.cpp
+++ b/WebCore/platform/sql/SQLiteDatabase.cpp
@@ -101,6 +101,7 @@ void SQLiteDatabase::close()
 
 void SQLiteDatabase::interrupt()
 {
+#if !ENABLE(SINGLE_THREADED)
     m_interrupted = true;
     while (!m_lockingMutex.tryLock()) {
         MutexLocker locker(m_databaseClosingMutex);
@@ -111,6 +112,7 @@ void SQLiteDatabase::interrupt()
     }
 
     m_lockingMutex.unlock();
+#endif
 }
 
 bool SQLiteDatabase::isInterrupted()

-- 
WebKit Debian packaging