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

[barraclough at apple.com]

The following commit has been merged in the webkit-1.2 branch:
commit 366da8ad3882d521031dc59b12c484decb436f17
Author: barraclough at apple.com <barraclough at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Mar 11 07:07:03 2010 +0000

    Fix for r55825, threadsafeCopy no longer needs to special-case for
    empty strings (in fact, doing so results in leaks).
    
    Reviewed by Mark Rowe.
    
    * platform/text/StringImpl.cpp:
    (WebCore::StringImpl::threadsafeCopy):
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@55832 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 42829dd..c81bff2 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,13 @@
+2010-03-10  Gavin Barraclough  <barraclough at apple.com>
+
+        Reviewed by Mark Rowe.
+
+        Fix for r55825, threadsafeCopy no longer needs to special-case for
+        empty strings (in fact, doing so results in leaks).
+
+        * platform/text/StringImpl.cpp:
+        (WebCore::StringImpl::threadsafeCopy):
+
 2010-03-10  Chang Shu  <chang.shu at nokia.com>
 
         Reviewed by Darin Adler.
diff --git a/WebCore/platform/text/StringImpl.cpp b/WebCore/platform/text/StringImpl.cpp
index 96c44ec..edddd28 100644
--- a/WebCore/platform/text/StringImpl.cpp
+++ b/WebCore/platform/text/StringImpl.cpp
@@ -1005,9 +1005,6 @@ PassRefPtr<StringImpl> StringImpl::createWithTerminatingNullCharacter(const Stri
 
 PassRefPtr<StringImpl> StringImpl::threadsafeCopy() const
 {
-    // Special-case empty strings to make sure that per-thread empty string instance isn't returned.
-    if (m_length == 0)
-        return adoptRef(new StringImpl);
     return create(m_data, m_length);
 }
 

-- 
WebKit Debian packaging