Index: Source/core/workers/WorkerGlobalScope.h |
diff --git a/Source/core/workers/WorkerGlobalScope.h b/Source/core/workers/WorkerGlobalScope.h |
index 3648d24ca677ec7a9e6cfffefb88aee541d16ffb..120ca266abaea97331f79d680749786e3cff41fc 100644 |
--- a/Source/core/workers/WorkerGlobalScope.h |
+++ b/Source/core/workers/WorkerGlobalScope.h |
@@ -57,8 +57,9 @@ 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 WorkerSupplementable, public EventTargetWithInlineData { |
+ DECLARE_GC_INFO; |
+ DEFINE_EVENT_TARGET_REFCOUNTING(RefCountedWillBeRefCountedGarbageCollected<WorkerGlobalScope>); |
public: |
virtual ~WorkerGlobalScope(); |
@@ -123,6 +124,8 @@ namespace WebCore { |
using SecurityContext::securityOrigin; |
using SecurityContext::contentSecurityPolicy; |
+ void trace(Visitor*); |
Mads Ager (chromium)
2014/02/24 13:27:53
Please make the trace method virtual and implement
sof
2014/02/24 22:44:27
Done.
|
+ |
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; |
haraken
2014/02/24 13:28:36
You need to change this to a Member.
|