Changeset 53860 in webkit

Timestamp:

Jan 26, 2010 11:22:51 AM (14 years ago)

Author:

oliver@apple.com

Message:

2010-01-26 Oliver Hunt <​oliver@apple.com>

Reviewed by Geoffrey Garen.

Using JavaScriptCore API with a webkit vended context can result in slow script dialog
​https://bugs.webkit.org/show_bug.cgi?id=34172

Make the APIShim correctly increment and decrement the timeout
entry counter.

• API/APIShims.h: (JSC::APIEntryShimWithoutLock::APIEntryShimWithoutLock): (JSC::APIEntryShimWithoutLock::~APIEntryShimWithoutLock): (JSC::APICallbackShim::APICallbackShim): (JSC::APICallbackShim::~APICallbackShim):

Location:

trunk/JavaScriptCore

Files:

• API/APIShims.h (modified) (2 diffs)
• ChangeLog (modified) (1 diff)

trunk/JavaScriptCore/API/APIShims.h

@@ -35 +35 @@
 protected:
     APIEntryShimWithoutLock(JSGlobalData* globalData, bool registerThread)
-        : m_entryIdentifierTable(setCurrentIdentifierTable(globalData->identifierTable))
+        : m_globalData(globalData)
+        , m_entryIdentifierTable(setCurrentIdentifierTable(globalData->identifierTable))
     {
         if (registerThread)
             globalData->heap.registerThread();
+        m_globalData->timeoutChecker.start();
     }
 
     ~APIEntryShimWithoutLock()
     {
+        m_globalData->timeoutChecker.stop();
         setCurrentIdentifierTable(m_entryIdentifierTable);
     }
 
 private:
+    JSGlobalData* m_globalData;
     IdentifierTable* m_entryIdentifierTable;
 };
@@ -77 +81 @@
     {
         resetCurrentIdentifierTable();
+        m_globalData->timeoutChecker.start();
     }
 
     ~APICallbackShim()
     {
+        m_globalData->timeoutChecker.stop();
         setCurrentIdentifierTable(m_globalData->identifierTable);
     }

trunk/JavaScriptCore/ChangeLog

@@ +1 @@
+2010-01-26  Oliver Hunt  <oliver@apple.com>
+
+        Reviewed by Geoffrey Garen.
+
+        Using JavaScriptCore API with a webkit vended context can result in slow script dialog
+        https://bugs.webkit.org/show_bug.cgi?id=34172
+
+        Make the APIShim correctly increment and decrement the timeout
+        entry counter.
+
+        * API/APIShims.h:
+        (JSC::APIEntryShimWithoutLock::APIEntryShimWithoutLock):
+        (JSC::APIEntryShimWithoutLock::~APIEntryShimWithoutLock):
+        (JSC::APICallbackShim::APICallbackShim):
+        (JSC::APICallbackShim::~APICallbackShim):
+
 2010-01-26  Simon Hausmann  <simon.hausmann@nokia.com>