[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.19-706-ge5415e9

[mrowe at apple.com]

The following commit has been merged in the webkit-1.1 branch:
commit 7da9cdc78474173b0540aaf49acd35b3c57fd766
Author: mrowe at apple.com <mrowe at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Jan 21 01:11:40 2010 +0000

    Build fix.
    
    * wtf/FastMalloc.cpp:
    (WTF::TCMalloc_PageHeap::initializeScavenger): Remove unnecessary function call.
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@53584 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/JavaScriptCore/ChangeLog b/JavaScriptCore/ChangeLog
index db150a4..ca3e083 100644
--- a/JavaScriptCore/ChangeLog
+++ b/JavaScriptCore/ChangeLog
@@ -1,5 +1,12 @@
 2010-01-20  Mark Rowe  <mrowe at apple.com>
 
+        Build fix.
+
+        * wtf/FastMalloc.cpp:
+        (WTF::TCMalloc_PageHeap::initializeScavenger): Remove unnecessary function call.
+
+2010-01-20  Mark Rowe  <mrowe at apple.com>
+
         Reviewed by Oliver Hunt.
 
         Use the inline i386 assembly for x86_64 as well rather than falling back to using pthread mutexes.
diff --git a/JavaScriptCore/wtf/FastMalloc.cpp b/JavaScriptCore/wtf/FastMalloc.cpp
index 88fd0fd..fad0bd8 100644
--- a/JavaScriptCore/wtf/FastMalloc.cpp
+++ b/JavaScriptCore/wtf/FastMalloc.cpp
@@ -1466,7 +1466,6 @@ void TCMalloc_PageHeap::initializeScavenger()
   m_scavengeTimer = dispatch_source_create(DISPATCH_SOURCE_TYPE_TIMER, 0, 0, m_scavengeQueue);
   dispatch_time_t startTime = dispatch_time(DISPATCH_TIME_NOW, kScavengeTimerDelayInSeconds * NSEC_PER_SEC);
   dispatch_source_set_timer(m_scavengeTimer, startTime, kScavengeTimerDelayInSeconds * NSEC_PER_SEC, 1000 * NSEC_PER_USEC);
-  dispatch_source_set_context(m_scavengeTimer, this);
   dispatch_source_set_event_handler(m_scavengeTimer, ^{ periodicScavenge(); });
   m_scavengingScheduled = false;
 }

-- 
WebKit Debian packaging