diff options
Diffstat (limited to 'Source/JavaScriptCore/heap/HeapTimer.h')
| -rw-r--r-- | Source/JavaScriptCore/heap/HeapTimer.h | 24 |
1 files changed, 13 insertions, 11 deletions
diff --git a/Source/JavaScriptCore/heap/HeapTimer.h b/Source/JavaScriptCore/heap/HeapTimer.h index f7576edd9..740a71f57 100644 --- a/Source/JavaScriptCore/heap/HeapTimer.h +++ b/Source/JavaScriptCore/heap/HeapTimer.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2012 Apple Inc. All rights reserved. + * Copyright (C) 2012, 2015 Apple Inc. All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -26,24 +26,26 @@ #ifndef HeapTimer_h #define HeapTimer_h +#include <wtf/Lock.h> #include <wtf/RetainPtr.h> #include <wtf/Threading.h> #if USE(CF) #include <CoreFoundation/CoreFoundation.h> -#elif PLATFORM(BLACKBERRY) -#include <BlackBerryPlatformTimer.h> +#endif + +#if USE(GLIB) && !PLATFORM(EFL) && !PLATFORM(QT) +#include <wtf/glib/GRefPtr.h> #elif PLATFORM(QT) #include <QBasicTimer> #include <QMutex> #include <QObject> #include <QThread> -#elif PLATFORM(EFL) -typedef struct _Ecore_Timer Ecore_Timer; #endif namespace JSC { +class JSLock; class VM; #if PLATFORM(QT) && !USE(CF) @@ -59,7 +61,7 @@ public: HeapTimer(VM*); #endif - virtual ~HeapTimer(); + JS_EXPORT_PRIVATE virtual ~HeapTimer(); virtual void doWork() = 0; protected: @@ -72,11 +74,7 @@ protected: RetainPtr<CFRunLoopRef> m_runLoop; CFRunLoopTimerContext m_context; - Mutex m_shutdownMutex; -#elif PLATFORM(BLACKBERRY) - void timerDidFire(); - - BlackBerry::Platform::Timer<HeapTimer> m_timer; + Lock m_shutdownMutex; #elif PLATFORM(QT) void timerEvent(QTimerEvent*); void customEvent(QEvent*); @@ -88,6 +86,10 @@ protected: Ecore_Timer* add(double delay, void* agent); void stop(); Ecore_Timer* m_timer; +#elif USE(GLIB) + void timerDidFire(); + RefPtr<JSLock> m_apiLock; + GRefPtr<GSource> m_timer; #endif private: |