[SCM] WebKit Debian packaging branch, webkit-1.2, updated. upstream/1.1.90-6072-g9a69373

[xan at webkit.org]

The following commit has been merged in the webkit-1.2 branch:
commit afb0fb7c02f2bbc7e25741405e5a869bbeeb7e09
Author: xan at webkit.org <xan at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Oct 29 17:53:16 2009 +0000

    2009-10-29  Xan Lopez  <xlopez at igalia.com>
    
            Reviewed by Oliver Hunt.
    
            [GTK] Threading problems with some of the tests
            https://bugs.webkit.org/show_bug.cgi?id=30814
    
            Create strings shared among threads with crossThreadString
            constructor method.
    
            * storage/Database.cpp:
            (WebCore::Database::Database):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@50285 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index df29ee7..079c17b 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,16 @@
+2009-10-29  Xan Lopez  <xlopez at igalia.com>
+
+        Reviewed by Oliver Hunt.
+
+        [GTK] Threading problems with some of the tests
+        https://bugs.webkit.org/show_bug.cgi?id=30814
+
+        Create strings shared among threads with crossThreadString
+        constructor method.
+
+        * storage/Database.cpp:
+        (WebCore::Database::Database):
+
 2009-10-29  Sebastian Dröge  <sebastian.droege at collabora.co.uk>
 
         Reviewed by Gustavo Noronha.
diff --git a/WebCore/storage/Database.cpp b/WebCore/storage/Database.cpp
index 5aaa26f..2f82743 100644
--- a/WebCore/storage/Database.cpp
+++ b/WebCore/storage/Database.cpp
@@ -152,8 +152,8 @@ Database::Database(Document* document, const String& name, const String& expecte
     , m_document(document)
     , m_name(name.crossThreadString())
     , m_guid(0)
-    , m_expectedVersion(expectedVersion)
-    , m_displayName(displayName)
+    , m_expectedVersion(expectedVersion.crossThreadString())
+    , m_displayName(displayName.crossThreadString())
     , m_estimatedSize(estimatedSize)
     , m_deleted(false)
     , m_stopped(false)

-- 
WebKit Debian packaging