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

[ggaren at apple.com]

The following commit has been merged in the webkit-1.1 branch:
commit 4d826c61918697003a73afb2138782ef539c0a03
Author: ggaren at apple.com <ggaren at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Feb 15 21:09:49 2010 +0000

    Removed some mistaken code added in http://trac.webkit.org/changeset/53860.
    
    Reviewed by Oliver Hunt.
    
    * API/APIShims.h:
    (JSC::APICallbackShim::APICallbackShim):
    (JSC::APICallbackShim::~APICallbackShim): No need to start/stop the
    timeout checker when calling out from the API to the client; we want to
    monitor the VM for timeouts, not the client. This mistake was harmless /
    undetectable, since it's totally redundant with the APIEntryShim, which
    also starts / stops the timeout checker.
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@54790 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/JavaScriptCore/API/APIShims.h b/JavaScriptCore/API/APIShims.h
index d7276ec..9a6cacb 100644
--- a/JavaScriptCore/API/APIShims.h
+++ b/JavaScriptCore/API/APIShims.h
@@ -80,12 +80,10 @@ public:
         , m_globalData(&exec->globalData())
     {
         resetCurrentIdentifierTable();
-        m_globalData->timeoutChecker.start();
     }
 
     ~APICallbackShim()
     {
-        m_globalData->timeoutChecker.stop();
         setCurrentIdentifierTable(m_globalData->identifierTable);
     }
 
diff --git a/JavaScriptCore/ChangeLog b/JavaScriptCore/ChangeLog
index e79d598..087070e 100644
--- a/JavaScriptCore/ChangeLog
+++ b/JavaScriptCore/ChangeLog
@@ -1,3 +1,17 @@
+2010-02-15  Geoffrey Garen  <ggaren at apple.com>
+
+        Reviewed by Oliver Hunt.
+
+        Removed some mistaken code added in http://trac.webkit.org/changeset/53860.
+
+        * API/APIShims.h:
+        (JSC::APICallbackShim::APICallbackShim):
+        (JSC::APICallbackShim::~APICallbackShim): No need to start/stop the
+        timeout checker when calling out from the API to the client; we want to
+        monitor the VM for timeouts, not the client. This mistake was harmless /
+        undetectable, since it's totally redundant with the APIEntryShim, which
+        also starts / stops the timeout checker.
+
 2010-02-15  Gavin Barraclough  <barraclough at apple.com>
 
         Reviewed by Geoff Garen.

-- 
WebKit Debian packaging