Index: Source/modules/websockets/WorkerThreadableWebSocketChannel.h |
diff --git a/Source/modules/websockets/WorkerThreadableWebSocketChannel.h b/Source/modules/websockets/WorkerThreadableWebSocketChannel.h |
index e22c3ace907d7e36f76ad676427cde700b023d92..46a009ef330e109c160169356269e731f215c237 100644 |
--- a/Source/modules/websockets/WorkerThreadableWebSocketChannel.h |
+++ b/Source/modules/websockets/WorkerThreadableWebSocketChannel.h |
@@ -96,7 +96,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); |
@@ -120,9 +120,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; |
haraken
2014/05/07 07:45:16
This doesn't need to be RefPtrWillBeCrossThreadPer
tyoshino (SeeGerritForStatus)
2014/05/07 08:32:52
Right. The object pointed by m_workerClientWrapper
|
WorkerLoaderProxy& m_loaderProxy; |
RefPtrWillBePersistent<WebSocketChannel> m_mainWebSocketChannel; |
OwnPtr<ThreadableWebSocketChannelSyncHelper> m_syncHelper; |
@@ -133,7 +133,7 @@ private: |
// Bridge for Peer. Running on the worker thread. |
class Bridge : public RefCounted<Bridge> { |
public: |
- static PassRefPtr<Bridge> create(PassRefPtr<ThreadableWebSocketChannelClientWrapper> workerClientWrapper, PassRefPtrWillBeRawPtr<WorkerGlobalScope> workerGlobalScope) |
+ static PassRefPtr<Bridge> create(PassRefPtrWillBeRawPtr<ThreadableWebSocketChannelClientWrapper> workerClientWrapper, PassRefPtrWillBeRawPtr<WorkerGlobalScope> workerGlobalScope) |
{ |
return adoptRef(new Bridge(workerClientWrapper, workerGlobalScope)); |
} |
@@ -153,9 +153,9 @@ private: |
void resume(); |
private: |
- Bridge(PassRefPtr<ThreadableWebSocketChannelClientWrapper>, PassRefPtrWillBeRawPtr<WorkerGlobalScope>); |
+ Bridge(PassRefPtrWillBeRawPtr<ThreadableWebSocketChannelClientWrapper>, PassRefPtrWillBeRawPtr<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(); |
@@ -165,7 +165,7 @@ private: |
void terminatePeer(); |
- const RefPtr<ThreadableWebSocketChannelClientWrapper> m_workerClientWrapper; |
+ const RefPtrWillBePersistent<ThreadableWebSocketChannelClientWrapper> m_workerClientWrapper; |
haraken
2014/05/07 07:45:16
This doesn't need to be RefPtrWillBeCrossThreadPer
tyoshino (SeeGerritForStatus)
2014/05/07 08:32:52
Right. This m_workerClientWrapper is created/used/
|
RefPtrWillBePersistent<WorkerGlobalScope> m_workerGlobalScope; |
WorkerLoaderProxy& m_loaderProxy; |
ThreadableWebSocketChannelSyncHelper* m_syncHelper; |
@@ -175,7 +175,7 @@ private: |
WorkerThreadableWebSocketChannel(WorkerGlobalScope&, WebSocketChannelClient*, const String& sourceURL, unsigned lineNumber); |
RefPtrWillBeMember<WorkerGlobalScope> m_workerGlobalScope; |
- const RefPtr<ThreadableWebSocketChannelClientWrapper> m_workerClientWrapper; |
+ const RefPtrWillBeMember<ThreadableWebSocketChannelClientWrapper> m_workerClientWrapper; |
RefPtr<Bridge> m_bridge; |
String m_sourceURLAtConnection; |
unsigned m_lineNumberAtConnection; |