[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.22-985-g3c00f00

[eric at webkit.org]

The following commit has been merged in the webkit-1.1 branch:
commit 5a768163ab4615675b60c268ed1bf9c85f6c25c4
Author: eric at webkit.org <eric at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Mar 12 14:53:09 2010 +0000

    2010-03-12  Kent Hansen  <kent.hansen at nokia.com>
    
            Reviewed by Darin Adler.
    
            Webkit doesn't build with workers on and database off
            https://bugs.webkit.org/show_bug.cgi?id=35997
    
            Added missing ENABLE(DATABASE) guards.
    
            * workers/WorkerThread.cpp:
            (WebCore::WorkerThreadShutdownStartTask::performTask):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@55896 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 361ce4d..0dab13d 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,15 @@
+2010-03-12  Kent Hansen  <kent.hansen at nokia.com>
+
+        Reviewed by Darin Adler.
+
+        Webkit doesn't build with workers on and database off
+        https://bugs.webkit.org/show_bug.cgi?id=35997
+
+        Added missing ENABLE(DATABASE) guards.
+
+        * workers/WorkerThread.cpp:
+        (WebCore::WorkerThreadShutdownStartTask::performTask):
+
 2010-03-12  Dan Winship  <danw at gnome.org>
 
         Reviewed by Gustavo Noronha.
diff --git a/WebCore/workers/WorkerThread.cpp b/WebCore/workers/WorkerThread.cpp
index 05fbe65..3823ad4 100644
--- a/WebCore/workers/WorkerThread.cpp
+++ b/WebCore/workers/WorkerThread.cpp
@@ -183,10 +183,12 @@ public:
         ASSERT(context->isWorkerContext());
         WorkerContext* workerContext = static_cast<WorkerContext*>(context);
 
+#if ENABLE(DATABASE)
         // We currently ignore any DatabasePolicy used for the document's
         // databases; if it's actually used anywhere, this should be revisited.
         DatabaseTaskSynchronizer cleanupSync;
         workerContext->stopDatabases(&cleanupSync);
+#endif
 
         workerContext->stopActiveDOMObjects();
 
@@ -195,9 +197,11 @@ public:
         workerContext->removeAllEventListeners();
         workerContext->clearScript();
 
+#if ENABLE(DATABASE)
         // We wait for the database thread to clean up all its stuff so that we
         // can do more stringent leak checks as we exit.
         cleanupSync.waitForTaskCompletion();
+#endif
 
         // Stick a shutdown command at the end of the queue, so that we deal
         // with all the cleanup tasks the databases post first.

-- 
WebKit Debian packaging