Index: Source/modules/websockets/WorkerThreadableWebSocketChannel.h |
diff --git a/Source/modules/websockets/WorkerThreadableWebSocketChannel.h b/Source/modules/websockets/WorkerThreadableWebSocketChannel.h |
index d904e296f6b5ca2b22de8f183ae52dd02d3a8b9b..790339a2aac082e8b38c1a22571a75eec140fe29 100644 |
--- a/Source/modules/websockets/WorkerThreadableWebSocketChannel.h |
+++ b/Source/modules/websockets/WorkerThreadableWebSocketChannel.h |
@@ -90,6 +90,8 @@ public: |
virtual void suspend() OVERRIDE; |
virtual void resume() OVERRIDE; |
+ virtual void trace(Visitor*) OVERRIDE; |
+ |
// Generated by the bridge. The Peer is destructed by an async call from |
// Bridge, and may outlive the bridge. All methods of this class must |
// be called on the main thread. |
@@ -100,7 +102,7 @@ public: |
// sourceURLAtConnection and lineNumberAtConnection parameters may |
// be shown when the connection fails. |
- static void initialize(ExecutionContext*, PassRefPtr<WeakReference<Peer> >, WorkerLoaderProxy*, PassRefPtr<ThreadableWebSocketChannelClientWrapper>, const String& sourceURLAtConnection, unsigned lineNumberAtConnection, PassOwnPtr<ThreadableWebSocketChannelSyncHelper>); |
+ static void initialize(ExecutionContext*, PassRefPtr<WeakReference<Peer> >, WorkerLoaderProxy*, PassRefPtrWillBeRawPtr<ThreadableWebSocketChannelClientWrapper>, const String& sourceURLAtConnection, unsigned lineNumberAtConnection, PassOwnPtr<ThreadableWebSocketChannelSyncHelper>); |
void destroy(); |
void connect(const KURL&, const String& protocol); |
@@ -124,9 +126,9 @@ public: |
virtual void didReceiveMessageError() OVERRIDE; |
private: |
- Peer(PassRefPtr<WeakReference<Peer> >, PassRefPtr<ThreadableWebSocketChannelClientWrapper>, WorkerLoaderProxy&, ExecutionContext*, const String& sourceURL, unsigned lineNumber, PassOwnPtr<ThreadableWebSocketChannelSyncHelper>); |
+ Peer(PassRefPtr<WeakReference<Peer> >, PassRefPtrWillBeRawPtr<ThreadableWebSocketChannelClientWrapper>, WorkerLoaderProxy&, ExecutionContext*, const String& sourceURL, unsigned lineNumber, PassOwnPtr<ThreadableWebSocketChannelSyncHelper>); |
- const RefPtr<ThreadableWebSocketChannelClientWrapper> m_workerClientWrapper; |
+ const RefPtrWillBePersistent<ThreadableWebSocketChannelClientWrapper> m_workerClientWrapper; |
WorkerLoaderProxy& m_loaderProxy; |
RefPtrWillBePersistent<WebSocketChannel> m_mainWebSocketChannel; |
OwnPtr<ThreadableWebSocketChannelSyncHelper> m_syncHelper; |
@@ -137,7 +139,7 @@ private: |
// Bridge for Peer. Running on the worker thread. |
class Bridge : public RefCounted<Bridge> { |
public: |
- static PassRefPtr<Bridge> create(PassRefPtr<ThreadableWebSocketChannelClientWrapper> workerClientWrapper, WorkerGlobalScope& workerGlobalScope) |
+ static PassRefPtr<Bridge> create(PassRefPtrWillBeRawPtr<ThreadableWebSocketChannelClientWrapper> workerClientWrapper, WorkerGlobalScope& workerGlobalScope) |
{ |
return adoptRef(new Bridge(workerClientWrapper, workerGlobalScope)); |
} |
@@ -157,9 +159,9 @@ private: |
void resume(); |
private: |
- Bridge(PassRefPtr<ThreadableWebSocketChannelClientWrapper>, WorkerGlobalScope&); |
+ Bridge(PassRefPtrWillBeRawPtr<ThreadableWebSocketChannelClientWrapper>, WorkerGlobalScope&); |
- static void setWebSocketChannel(ExecutionContext*, Bridge* thisPtr, Peer*, PassRefPtr<ThreadableWebSocketChannelClientWrapper>); |
+ static void setWebSocketChannel(ExecutionContext*, Bridge* thisPtr, Peer*, PassRefPtrWillBeRawPtr<ThreadableWebSocketChannelClientWrapper>); |
// Executed on the worker context's thread. |
void clearClientWrapper(); |
@@ -171,7 +173,7 @@ private: |
bool hasTerminatedPeer() { return !m_syncHelper; } |
- const RefPtr<ThreadableWebSocketChannelClientWrapper> m_workerClientWrapper; |
+ const RefPtrWillBePersistent<ThreadableWebSocketChannelClientWrapper> m_workerClientWrapper; |
RefPtrWillBePersistent<WorkerGlobalScope> m_workerGlobalScope; |
WorkerLoaderProxy& m_loaderProxy; |
ThreadableWebSocketChannelSyncHelper* m_syncHelper; |
@@ -180,7 +182,7 @@ private: |
WorkerThreadableWebSocketChannel(WorkerGlobalScope&, WebSocketChannelClient*, const String& sourceURL, unsigned lineNumber); |
- const RefPtr<ThreadableWebSocketChannelClientWrapper> m_workerClientWrapper; |
+ const RefPtrWillBeMember<ThreadableWebSocketChannelClientWrapper> m_workerClientWrapper; |
RefPtr<Bridge> m_bridge; |
String m_sourceURLAtConnection; |
unsigned m_lineNumberAtConnection; |