[SCM] WebKit Debian packaging branch, webkit-1.3, updated. upstream/1.3.7-4207-g178b198

[paroga at webkit.org]

The following commit has been merged in the webkit-1.3 branch:
commit ffdd239e99320152202ed06fa5e7723f9205e49f
Author: paroga at webkit.org <paroga at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Jan 14 23:36:39 2011 +0000

    2011-01-14  Patrick Gansterer  <paroga at webkit.org>
    
            Reviewed by Adam Roben.
    
            Use the Windows thread pool instead of an extra thread for FastMalloc scavenging
            https://bugs.webkit.org/show_bug.cgi?id=45186
    
            r75819 accidentally changed the initial state of the scavenge timer.
    
            * wtf/FastMalloc.cpp:
            (WTF::TCMalloc_PageHeap::initializeScavenger): Changed initial state of m_scavengingSuspended to true.
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@75830 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/Source/JavaScriptCore/ChangeLog b/Source/JavaScriptCore/ChangeLog
index 38e5594..60c8d42 100644
--- a/Source/JavaScriptCore/ChangeLog
+++ b/Source/JavaScriptCore/ChangeLog
@@ -1,5 +1,17 @@
 2011-01-14  Patrick Gansterer  <paroga at webkit.org>
 
+        Reviewed by Adam Roben.
+
+        Use the Windows thread pool instead of an extra thread for FastMalloc scavenging
+        https://bugs.webkit.org/show_bug.cgi?id=45186
+
+        r75819 accidentally changed the initial state of the scavenge timer.
+
+        * wtf/FastMalloc.cpp:
+        (WTF::TCMalloc_PageHeap::initializeScavenger): Changed initial state of m_scavengingSuspended to true.
+
+2011-01-14  Patrick Gansterer  <paroga at webkit.org>
+
         Unreviewed Windows Release build fix.
 
         * wtf/FastMalloc.cpp:
diff --git a/Source/JavaScriptCore/wtf/FastMalloc.cpp b/Source/JavaScriptCore/wtf/FastMalloc.cpp
index 0b4d0e6..2a2e230 100644
--- a/Source/JavaScriptCore/wtf/FastMalloc.cpp
+++ b/Source/JavaScriptCore/wtf/FastMalloc.cpp
@@ -1515,7 +1515,7 @@ void TCMalloc_PageHeap::initializeScavenger()
     dispatch_time_t startTime = dispatch_time(DISPATCH_TIME_NOW, kScavengeDelayInSeconds * NSEC_PER_SEC);
     dispatch_source_set_timer(m_scavengeTimer, startTime, kScavengeDelayInSeconds * NSEC_PER_SEC, 1000 * NSEC_PER_USEC);
     dispatch_source_set_event_handler(m_scavengeTimer, ^{ periodicScavenge(); });
-    m_scavengingSuspended = false;
+    m_scavengingSuspended = true;
 }
 
 ALWAYS_INLINE bool TCMalloc_PageHeap::isScavengerSuspended()

-- 
WebKit Debian packaging