diff options
author | Miikka Heikkinen <miikka.heikkinen@digia.com> | 2009-08-21 15:56:57 +0300 |
---|---|---|
committer | Miikka Heikkinen <miikka.heikkinen@digia.com> | 2009-08-21 15:56:57 +0300 |
commit | 34679dd23213881a9632e21e4858377ff90a9006 (patch) | |
tree | deb9ebf681d4954b2d44858ca1a14d251c31e8eb /src/3rdparty/webkit/JavaScriptCore/runtime/TimeoutChecker.h | |
parent | 7669f91c33328505fbe52f4913bd3f8745b76d31 (diff) | |
parent | 4aa6869877d4906fcfaac5388294748512cace25 (diff) |
Merge branch 'master' of git@scm.dev.troll.no:qt/qt-s60-public
Conflicts:
src/corelib/io/qfilesystemwatcher_symbian.cpp
src/corelib/io/qfilesystemwatcher_symbian_p.h
Diffstat (limited to 'src/3rdparty/webkit/JavaScriptCore/runtime/TimeoutChecker.h')
-rw-r--r-- | src/3rdparty/webkit/JavaScriptCore/runtime/TimeoutChecker.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/3rdparty/webkit/JavaScriptCore/runtime/TimeoutChecker.h b/src/3rdparty/webkit/JavaScriptCore/runtime/TimeoutChecker.h index 7bfa6d083..1680d6d1e 100644 --- a/src/3rdparty/webkit/JavaScriptCore/runtime/TimeoutChecker.h +++ b/src/3rdparty/webkit/JavaScriptCore/runtime/TimeoutChecker.h @@ -38,8 +38,10 @@ namespace JSC { class TimeoutChecker { public: TimeoutChecker(); + virtual ~TimeoutChecker(); void setTimeoutInterval(unsigned timeoutInterval) { m_timeoutInterval = timeoutInterval; } + void setCheckInterval(unsigned checkInterval) { if (checkInterval) m_intervalBetweenChecks = checkInterval; } unsigned ticksUntilNextCheck() { return m_ticksUntilNextCheck; } @@ -58,7 +60,7 @@ namespace JSC { void reset(); - bool didTimeOut(ExecState*); + virtual bool didTimeOut(ExecState*); private: unsigned m_timeoutInterval; @@ -66,6 +68,7 @@ namespace JSC { unsigned m_timeExecuting; unsigned m_startCount; unsigned m_ticksUntilNextCheck; + unsigned m_intervalBetweenChecks; }; } // namespace JSC |