[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.19-706-ge5415e9

[eric at webkit.org]

The following commit has been merged in the webkit-1.1 branch:
commit 4e9be9a6bcb66085bf0646e823b7cda4c4a9935d
Author: eric at webkit.org <eric at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Jan 22 09:19:41 2010 +0000

    2010-01-22  Kwang Yul Seo  <skyul at company100.net>
    
            Reviewed by Dmitry Titov.
    
            ENABLE(DATABASE) guard is missing in ScriptExecutionContext::~ScriptExecutionContext
            https://bugs.webkit.org/show_bug.cgi?id=33990
    
            Add missing ENABLE(DATABASE) guard.
    
            * dom/ScriptExecutionContext.cpp:
            (WebCore::ScriptExecutionContext::~ScriptExecutionContext):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@53688 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 97099d6..1411c36 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,15 @@
+2010-01-22  Kwang Yul Seo  <skyul at company100.net>
+
+        Reviewed by Dmitry Titov.
+
+        ENABLE(DATABASE) guard is missing in ScriptExecutionContext::~ScriptExecutionContext
+        https://bugs.webkit.org/show_bug.cgi?id=33990
+
+        Add missing ENABLE(DATABASE) guard.
+
+        * dom/ScriptExecutionContext.cpp:
+        (WebCore::ScriptExecutionContext::~ScriptExecutionContext):
+
 2010-01-22  Xan Lopez  <xlopez at igalia.com>
 
         Reviewed by Gustavo Noronha.
diff --git a/WebCore/dom/ScriptExecutionContext.cpp b/WebCore/dom/ScriptExecutionContext.cpp
index 80eb9a8..c2fe120 100644
--- a/WebCore/dom/ScriptExecutionContext.cpp
+++ b/WebCore/dom/ScriptExecutionContext.cpp
@@ -77,10 +77,12 @@ ScriptExecutionContext::~ScriptExecutionContext()
         ASSERT((*iter)->scriptExecutionContext() == this);
         (*iter)->contextDestroyed();
     }
+#if ENABLE(DATABASE)
     if (m_databaseThread) {
         ASSERT(m_databaseThread->terminationRequested());
         m_databaseThread = 0;
     }
+#endif
 }
 
 #if ENABLE(DATABASE)

-- 
WebKit Debian packaging