[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.21-584-g1e41756

[mrowe at apple.com]

The following commit has been merged in the webkit-1.1 branch:
commit 822d9e610d3d13720002e6f589bfac3b7ab03459
Author: mrowe at apple.com <mrowe at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Feb 17 04:06:48 2010 +0000

    Fix a handful of leaks seen on the buildbot.
    
    Reviewed by Gavin Barraclough.
    
    * runtime/UStringImpl.h:
    (JSC::UStringOrRopeImpl::deref): Call URopeImpl::destructNonRecursive rather than delete
    to ensure that the rope's fibers are also destroyed.
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@54866 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/JavaScriptCore/ChangeLog b/JavaScriptCore/ChangeLog
index 7c3f664..ef0ca87 100644
--- a/JavaScriptCore/ChangeLog
+++ b/JavaScriptCore/ChangeLog
@@ -1,3 +1,13 @@
+2010-02-16  Mark Rowe  <mrowe at apple.com>
+
+        Reviewed by Gavin Barraclough.
+
+        Fix a handful of leaks seen on the buildbot.
+
+        * runtime/UStringImpl.h:
+        (JSC::UStringOrRopeImpl::deref): Call URopeImpl::destructNonRecursive rather than delete
+        to ensure that the rope's fibers are also destroyed.
+
 2010-02-16  Gavin Barraclough  <barraclough at apple.com>
 
         Reviewed by Oliver Hunt.
diff --git a/JavaScriptCore/runtime/UStringImpl.h b/JavaScriptCore/runtime/UStringImpl.h
index e39d555..906c568 100644
--- a/JavaScriptCore/runtime/UStringImpl.h
+++ b/JavaScriptCore/runtime/UStringImpl.h
@@ -340,6 +340,8 @@ private:
 
     unsigned m_fiberCount;
     Fiber m_fibers[1];
+
+    friend class UStringOrRopeImpl;
 };
 
 inline void UStringOrRopeImpl::deref()
@@ -347,7 +349,7 @@ inline void UStringOrRopeImpl::deref()
     m_refCountAndFlags -= s_refCountIncrement;
     if (!(m_refCountAndFlags & s_refCountMask)) {
         if (isRope())
-            delete static_cast<URopeImpl*>(this);
+            static_cast<URopeImpl*>(this)->destructNonRecursive();
         else if (!s_refCountFlagStatic)
             delete static_cast<UStringImpl*>(this);
     }

-- 
WebKit Debian packaging