Index: Source/core/workers/WorkerThread.h |
diff --git a/Source/core/workers/WorkerThread.h b/Source/core/workers/WorkerThread.h |
index a58d1e7210f8386f38f266b3ee47b6a08cdb1191..cb196607d2530526b7f7a95d27e5742f09cef43d 100644 |
--- a/Source/core/workers/WorkerThread.h |
+++ b/Source/core/workers/WorkerThread.h |
@@ -29,6 +29,7 @@ |
#include "core/frame/ContentSecurityPolicy.h" |
#include "core/workers/WorkerRunLoop.h" |
+#include "heap/Handle.h" |
#include "platform/weborigin/SecurityOrigin.h" |
#include "wtf/Forward.h" |
#include "wtf/OwnPtr.h" |
@@ -46,11 +47,12 @@ namespace WebCore { |
class WorkerGlobalScope; |
class WorkerLoaderProxy; |
class WorkerReportingProxy; |
- struct WorkerThreadStartupData; |
+ class WorkerThreadStartupData; |
enum WorkerThreadStartMode { DontPauseWorkerGlobalScopeOnStart, PauseWorkerGlobalScopeOnStart }; |
- class WorkerThread : public RefCounted<WorkerThread> { |
+ class WorkerThread : public RefCountedWillBeGarbageCollectedFinalized<WorkerThread> { |
+ DECLARE_GC_INFO; |
public: |
virtual ~WorkerThread(); |
@@ -73,11 +75,13 @@ namespace WebCore { |
NotificationClient* getNotificationClient() { return m_notificationClient; } |
void setNotificationClient(NotificationClient* client) { m_notificationClient = client; } |
+ void trace(Visitor*); |
Mads Ager (chromium)
2014/02/24 13:27:53
Please make this virtual and make sure to implemen
|
+ |
protected: |
- WorkerThread(WorkerLoaderProxy&, WorkerReportingProxy&, PassOwnPtr<WorkerThreadStartupData>); |
+ WorkerThread(WorkerLoaderProxy&, WorkerReportingProxy&, PassOwnPtrWillBeRawPtr<WorkerThreadStartupData>); |
// Factory method for creating a new worker context for the thread. |
- virtual PassRefPtr<WorkerGlobalScope> createWorkerGlobalScope(PassOwnPtr<WorkerThreadStartupData>) = 0; |
+ virtual PassRefPtrWillBeRawPtr<WorkerGlobalScope> createWorkerGlobalScope(PassOwnPtrWillBeRawPtr<WorkerThreadStartupData>) = 0; |
// Executes the event loop for the worker thread. Derived classes can override to perform actions before/after entering the event loop. |
virtual void runEventLoop(); |
@@ -95,10 +99,10 @@ namespace WebCore { |
WorkerLoaderProxy& m_workerLoaderProxy; |
WorkerReportingProxy& m_workerReportingProxy; |
- RefPtr<WorkerGlobalScope> m_workerGlobalScope; |
+ RefPtrWillBeMember<WorkerGlobalScope> m_workerGlobalScope; |
Mutex m_threadCreationMutex; |
- OwnPtr<WorkerThreadStartupData> m_startupData; |
+ OwnPtrWillBeMember<WorkerThreadStartupData> m_startupData; |
NotificationClient* m_notificationClient; |