diff options
| author | Allan Sandfeld Jensen <allan.jensen@digia.com> | 2013-09-13 12:51:20 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-09-19 20:50:05 +0200 |
| commit | d441d6f39bb846989d95bcf5caf387b42414718d (patch) | |
| tree | e367e64a75991c554930278175d403c072de6bb8 /Source/JavaScriptCore/heap/HeapTimer.h | |
| parent | 0060b2994c07842f4c59de64b5e3e430525c4b90 (diff) | |
| download | qtwebkit-d441d6f39bb846989d95bcf5caf387b42414718d.tar.gz | |
Import Qt5x2 branch of QtWebkit for Qt 5.2
Importing a new snapshot of webkit.
Change-Id: I2d01ad12cdc8af8cb015387641120a9d7ea5f10c
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@digia.com>
Diffstat (limited to 'Source/JavaScriptCore/heap/HeapTimer.h')
| -rw-r--r-- | Source/JavaScriptCore/heap/HeapTimer.h | 18 |
1 files changed, 11 insertions, 7 deletions
diff --git a/Source/JavaScriptCore/heap/HeapTimer.h b/Source/JavaScriptCore/heap/HeapTimer.h index 66d28f228..f7576edd9 100644 --- a/Source/JavaScriptCore/heap/HeapTimer.h +++ b/Source/JavaScriptCore/heap/HeapTimer.h @@ -38,11 +38,13 @@ #include <QMutex> #include <QObject> #include <QThread> +#elif PLATFORM(EFL) +typedef struct _Ecore_Timer Ecore_Timer; #endif namespace JSC { -class JSGlobalData; +class VM; #if PLATFORM(QT) && !USE(CF) class HeapTimer : public QObject { @@ -51,20 +53,17 @@ class HeapTimer { #endif public: #if USE(CF) - HeapTimer(JSGlobalData*, CFRunLoopRef); + HeapTimer(VM*, CFRunLoopRef); static void timerDidFire(CFRunLoopTimerRef, void*); #else - HeapTimer(JSGlobalData*); + HeapTimer(VM*); #endif virtual ~HeapTimer(); - - void didStartVMShutdown(); - virtual void synchronize(); virtual void doWork() = 0; protected: - JSGlobalData* m_globalData; + VM* m_vm; #if USE(CF) static const CFTimeInterval s_decade; @@ -84,6 +83,11 @@ protected: QBasicTimer m_timer; QThread* m_newThread; QMutex m_mutex; +#elif PLATFORM(EFL) + static bool timerEvent(void*); + Ecore_Timer* add(double delay, void* agent); + void stop(); + Ecore_Timer* m_timer; #endif private: |