[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 20c03ed010192595d32bed29cc7fa4249b3d8dbe
Author: paroga at webkit.org <paroga at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Sat Jan 15 00:29:29 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
    
            * wtf/FastMalloc.cpp:
            (WTF::TCMalloc_PageHeap::scheduleScavenger): Added missing this pointer to CreateTimerQueueTimer().
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@75839 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/Source/JavaScriptCore/ChangeLog b/Source/JavaScriptCore/ChangeLog
index 60c8d42..4f01a8b 100644
--- a/Source/JavaScriptCore/ChangeLog
+++ b/Source/JavaScriptCore/ChangeLog
@@ -5,6 +5,16 @@
         Use the Windows thread pool instead of an extra thread for FastMalloc scavenging
         https://bugs.webkit.org/show_bug.cgi?id=45186
 
+        * wtf/FastMalloc.cpp:
+        (WTF::TCMalloc_PageHeap::scheduleScavenger): Added missing this pointer to CreateTimerQueueTimer().
+
+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:
diff --git a/Source/JavaScriptCore/wtf/FastMalloc.cpp b/Source/JavaScriptCore/wtf/FastMalloc.cpp
index 2a2e230..882f10d 100644
--- a/Source/JavaScriptCore/wtf/FastMalloc.cpp
+++ b/Source/JavaScriptCore/wtf/FastMalloc.cpp
@@ -1566,7 +1566,7 @@ ALWAYS_INLINE void TCMalloc_PageHeap::scheduleScavenger()
     // We need to use WT_EXECUTEONLYONCE here and reschedule the timer, because
     // Windows will fire the timer event even when the function is already running.
     ASSERT(IsHeld(pageheap_lock));
-    CreateTimerQueueTimer(&m_scavengeQueueTimer, 0, scavengerTimerFired, 0, kScavengeDelayInSeconds * 1000, 0, WT_EXECUTEONLYONCE);
+    CreateTimerQueueTimer(&m_scavengeQueueTimer, 0, scavengerTimerFired, this, kScavengeDelayInSeconds * 1000, 0, WT_EXECUTEONLYONCE);
 }
 
 ALWAYS_INLINE void TCMalloc_PageHeap::rescheduleScavenger()

-- 
WebKit Debian packaging