[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.15.1-1414-gc69ee75

[levin at chromium.org]

The following commit has been merged in the webkit-1.1 branch:
commit fcb2e68571d6dd487a31260b465ad7917cc73cd1
Author: levin at chromium.org <levin at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Oct 6 08:11:55 2009 +0000

    Speculative build fix for windows (due to r49160).
    
    Patch by David Levin <levin at chromium.org> on 2009-10-06
    Reviewed by NOBODY (windows build fix).
    
    * WebDownloadCFNet.cpp:
    (WebDownload::initToResumeWithBundle):
    * WebIconDatabase.cpp:
    (WebIconDatabase::dispatchDidAddIconForPageURL):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@49162 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/win/ChangeLog b/WebKit/win/ChangeLog
index 81f51f1..14d1c31 100644
--- a/WebKit/win/ChangeLog
+++ b/WebKit/win/ChangeLog
@@ -1,3 +1,14 @@
+2009-10-06  David Levin  <levin at chromium.org>
+
+        Reviewed by NOBODY (windows build fix).
+
+        Speculative build fix for windows (due to r49160).
+
+        * WebDownloadCFNet.cpp:
+        (WebDownload::initToResumeWithBundle):
+        * WebIconDatabase.cpp:
+        (WebIconDatabase::dispatchDidAddIconForPageURL):
+
 2009-10-05  Pavel Feldman  <pfeldman at chromium.org>
 
         Reviewed by Timothy Hatcher.
diff --git a/WebKit/win/WebDownloadCFNet.cpp b/WebKit/win/WebDownloadCFNet.cpp
index c2605ac..144a6a5 100644
--- a/WebKit/win/WebDownloadCFNet.cpp
+++ b/WebKit/win/WebDownloadCFNet.cpp
@@ -194,7 +194,7 @@ HRESULT STDMETHODCALLTYPE WebDownload::initToResumeWithBundle(
     // Attempt to remove the ".download" extension from the bundle for the final file destination
     // Failing that, we clear m_destination and will ask the delegate later once the download starts
     if (m_bundlePath.endsWith(bundleExtension(), false)) {
-        m_destination = m_bundlePath.copy();
+        m_destination = m_bundlePath.threadsafeCopy();
         m_destination.truncate(m_destination.length() - bundleExtension().length());
     } else
         m_destination = String();
diff --git a/WebKit/win/WebIconDatabase.cpp b/WebKit/win/WebIconDatabase.cpp
index 8aab6af..315db9e 100644
--- a/WebKit/win/WebIconDatabase.cpp
+++ b/WebKit/win/WebIconDatabase.cpp
@@ -311,7 +311,7 @@ void WebIconDatabase::dispatchDidRemoveAllIcons()
 void WebIconDatabase::dispatchDidAddIconForPageURL(const String& pageURL)
 {   
     MutexLocker locker(m_notificationMutex);
-    m_notificationQueue.append(pageURL.copy());
+    m_notificationQueue.append(pageURL.threadsafeCopy());
     scheduleNotificationDelivery();
 }
 

-- 
WebKit Debian packaging