summaryrefslogtreecommitdiffstats
path: root/src/3rdparty/webkit/WebCore/storage/DatabaseTracker.cpp
diff options
context:
space:
mode:
authorJocelyn Turcotte <jocelyn.turcotte@nokia.com>2009-10-22 17:50:52 (GMT)
committerJocelyn Turcotte <jocelyn.turcotte@nokia.com>2009-10-22 18:34:20 (GMT)
commit57f1983c164bc8553c6b6aa7ac320f00e5405548 (patch)
tree6cfbec33f6e385ceb5cbfa0168f4a9f27f0c8e57 /src/3rdparty/webkit/WebCore/storage/DatabaseTracker.cpp
parent5baebfc68dd67def412bcbaa7c61b43d05e6ee42 (diff)
downloadQt-57f1983c164bc8553c6b6aa7ac320f00e5405548.zip
Qt-57f1983c164bc8553c6b6aa7ac320f00e5405548.tar.gz
Qt-57f1983c164bc8553c6b6aa7ac320f00e5405548.tar.bz2
Updated WebKit from /home/jturcott/dev/webkit/ to qtwebkit-4.6-snapshot-22102009 ( 0639bb8e812c8923287cd5523248ca64fa5f7a50 )
Changes in WebKit/qt since the last update: Jocelyn: fatal error from script, sha1 in src/3rdparty/webkit/VERSION is bad
Diffstat (limited to 'src/3rdparty/webkit/WebCore/storage/DatabaseTracker.cpp')
-rw-r--r--src/3rdparty/webkit/WebCore/storage/DatabaseTracker.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/3rdparty/webkit/WebCore/storage/DatabaseTracker.cpp b/src/3rdparty/webkit/WebCore/storage/DatabaseTracker.cpp
index 491e6f1..265cd0d 100644
--- a/src/3rdparty/webkit/WebCore/storage/DatabaseTracker.cpp
+++ b/src/3rdparty/webkit/WebCore/storage/DatabaseTracker.cpp
@@ -762,7 +762,7 @@ void DatabaseTracker::scheduleNotifyDatabaseChanged(SecurityOrigin* origin, cons
{
MutexLocker locker(notificationMutex());
- notificationQueue().append(pair<SecurityOrigin*, String>(origin, name.copy()));
+ notificationQueue().append(pair<SecurityOrigin*, String>(origin, name.crossThreadString()));
scheduleForNotification();
}