Index: Source/core/workers/WorkerGlobalScope.h |
diff --git a/Source/core/workers/WorkerGlobalScope.h b/Source/core/workers/WorkerGlobalScope.h |
index 634949cc176c2eb2b2cf5eee26b691ac3ea64728..814635916ba9c57b03c1d9122a3b2d780d7bd497 100644 |
--- a/Source/core/workers/WorkerGlobalScope.h |
+++ b/Source/core/workers/WorkerGlobalScope.h |
@@ -36,7 +36,6 @@ |
#include "core/frame/ContentSecurityPolicy.h" |
#include "core/workers/WorkerConsole.h" |
#include "core/workers/WorkerEventQueue.h" |
-#include "core/workers/WorkerSupplementable.h" |
#include "wtf/Assertions.h" |
#include "wtf/HashMap.h" |
#include "wtf/OwnPtr.h" |
@@ -57,8 +56,8 @@ namespace WebCore { |
class WorkerNavigator; |
class WorkerThread; |
- class WorkerGlobalScope : public RefCounted<WorkerGlobalScope>, public ScriptWrappable, public SecurityContext, public ExecutionContext, public ExecutionContextClient, public WorkerSupplementable, public EventTargetWithInlineData { |
- REFCOUNTED_EVENT_TARGET(WorkerGlobalScope); |
+ class WorkerGlobalScope : public RefCountedWillBeRefCountedGarbageCollected<WorkerGlobalScope>, public ScriptWrappable, public SecurityContext, public ExecutionContext, public ExecutionContextClient, public WillBeHeapSupplementable<WorkerGlobalScope>, public EventTargetWithInlineData { |
+ DEFINE_EVENT_TARGET_REFCOUNTING(RefCountedWillBeRefCountedGarbageCollected<WorkerGlobalScope>); |
public: |
virtual ~WorkerGlobalScope(); |
@@ -80,6 +79,8 @@ namespace WebCore { |
void clearScript() { m_script.clear(); } |
void clearInspector(); |
+ void detach(); |
haraken
2014/03/03 12:55:50
(I'm sorry I suggested "detach" but) we normally c
sof
2014/03/04 08:18:00
dispose() it is.
|
+ |
WorkerThread* thread() const { return m_thread; } |
virtual void postTask(PassOwnPtr<ExecutionContextTask>) OVERRIDE FINAL; // Executes the task on context's thread asynchronously. |
@@ -123,6 +124,8 @@ namespace WebCore { |
using SecurityContext::securityOrigin; |
using SecurityContext::contentSecurityPolicy; |
+ virtual void trace(Visitor*); |
+ |
protected: |
WorkerGlobalScope(const KURL&, const String& userAgent, WorkerThread*, double timeOrigin, PassOwnPtr<WorkerClients>); |
void applyContentSecurityPolicyFromString(const String& contentSecurityPolicy, ContentSecurityPolicy::HeaderType); |
@@ -146,9 +149,9 @@ namespace WebCore { |
KURL m_url; |
String m_userAgent; |
- mutable RefPtr<WorkerConsole> m_console; |
- mutable RefPtr<WorkerLocation> m_location; |
- mutable RefPtr<WorkerNavigator> m_navigator; |
+ mutable RefPtrWillBeMember<WorkerConsole> m_console; |
+ mutable RefPtrWillBeMember<WorkerLocation> m_location; |
+ mutable RefPtrWillBeMember<WorkerNavigator> m_navigator; |
OwnPtr<WorkerScriptController> m_script; |
WorkerThread* m_thread; |