Chromium Code Reviews| Index: Source/core/workers/WorkerMessagingProxy.h |
| diff --git a/Source/core/workers/WorkerMessagingProxy.h b/Source/core/workers/WorkerMessagingProxy.h |
| index c0fab0dd5b659a191015951a4128bacb8585307f..82c5fb4948e444d13f613504714d3e0bc31db87f 100644 |
| --- a/Source/core/workers/WorkerMessagingProxy.h |
| +++ b/Source/core/workers/WorkerMessagingProxy.h |
| @@ -52,6 +52,8 @@ class CORE_EXPORT WorkerMessagingProxy |
| , private WorkerLoaderProxyProvider { |
| WTF_MAKE_NONCOPYABLE(WorkerMessagingProxy); |
| public: |
| + DECLARE_VIRTUAL_TRACE(); |
| + |
| // Implementations of WorkerGlobalScopeProxy. |
| // (Only use these methods in the worker object thread.) |
| void startWorkerGlobalScope(const KURL& scriptURL, const String& userAgent, const String& sourceCode, WorkerThreadStartMode) override; |
| @@ -75,6 +77,8 @@ public: |
| void workerThreadCreated(PassRefPtr<WorkerThread>); |
| + void clearWeakMembers(Visitor*); |
| + |
| protected: |
| WorkerMessagingProxy(InProcessWorkerBase*, PassOwnPtrWillBeRawPtr<WorkerClients>); |
| ~WorkerMessagingProxy() override; |
| @@ -94,9 +98,9 @@ private: |
| void postTaskToLoader(PassOwnPtr<ExecutionContextTask>) override; |
| bool postTaskToWorkerGlobalScope(PassOwnPtr<ExecutionContextTask>) override; |
| - RefPtrWillBePersistent<ExecutionContext> m_executionContext; |
| + RefPtrWillBeMember<ExecutionContext> m_executionContext; |
| OwnPtr<WorkerObjectProxy> m_workerObjectProxy; |
| - InProcessWorkerBase* m_workerObject; |
| + RawPtrWillBeWeakMember<InProcessWorkerBase> m_workerObject; |
| bool m_mayBeDestroyed; |
| RefPtr<WorkerThread> m_workerThread; |
| @@ -108,9 +112,14 @@ private: |
| Vector<OwnPtr<ExecutionContextTask>> m_queuedEarlyTasks; // Tasks are queued here until there's a thread object created. |
| OwnPtr<WorkerInspectorProxy> m_workerInspectorProxy; |
| - OwnPtrWillBePersistent<WorkerClients> m_workerClients; |
| + OwnPtrWillBeMember<WorkerClients> m_workerClients; |
| RefPtr<WorkerLoaderProxy> m_loaderProxy; |
| + |
| +#if ENABLE(OILPAN) |
| + GC_PLUGIN_IGNORE("366546") |
| + OwnPtr<Persistent<WorkerMessagingProxy>> m_keepAlive; |
|
haraken
2015/07/30 11:46:31
Once https://codereview.chromium.org/1233173002/ i
|
| +#endif |
| }; |
| } // namespace blink |