[WebSocket] Create Peer on the worker thread.

Source/modules/websockets/WorkerThreadableWebSocketChannel.h

 /*
  * Copyright (C) 2011 Google Inc.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 76 matching lines @@
     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.
     class Peer FINAL : public NoBaseWillBeGarbageCollectedFinalized<Peer>, public WebSocketChannelClient {
         WILL_BE_USING_GARBAGE_COLLECTED_MIXIN(Peer);
         WTF_MAKE_NONCOPYABLE(Peer);
         WTF_MAKE_FAST_ALLOCATED_WILL_BE_REMOVED;
     public:
+        static PassOwnPtrWillBeRawPtr<Peer> create(PassRefPtrWillBeRawPtr<ThreadableWebSocketChannelClientWrapper>, WorkerLoaderProxy&, PassRefPtrWillBeRawPtr<ThreadableWebSocketChannelSyncHelper>);
         virtual ~Peer();
 
         // sourceURLAtConnection and lineNumberAtConnection parameters may
         // be shown when the connection fails.
-#if ENABLE(OILPAN)
-        static void initialize(ExecutionContext*, WeakMember<Peer>*, WorkerLoaderProxy*, RawPtr<ThreadableWebSocketChannelClientWrapper>, const String& sourceURLAtConnection, unsigned lineNumberAtConnection, RawPtr<ThreadableWebSocketChannelSyncHelper>);
-#else
-        static void initialize(ExecutionContext*, PassRefPtr<WeakReference<Peer> >, WorkerLoaderProxy*, PassRefPtr<ThreadableWebSocketChannelClientWrapper>, const String& sourceURLAtConnection, unsigned lineNumberAtConnection, PassRefPtr<ThreadableWebSocketChannelSyncHelper>);
-#endif
+        static void initialize(ExecutionContext* executionContext, Peer* peer, const String& sourceURLAtConnection, unsigned lineNumberAtConnection)
+        {
+            peer->initializeInternal(executionContext, sourceURLAtConnection, lineNumberAtConnection);
+        }
 
-        void destroy();
         void connect(const KURL&, const String& protocol);
         void send(const String& message);
         void sendArrayBuffer(PassOwnPtr<Vector<char> >);
         void sendBlob(PassRefPtr<BlobDataHandle>);
         void bufferedAmount();
         void close(int code, const String& reason);
         void fail(const String& reason, MessageLevel, const String& sourceURL, unsigned lineNumber);
         void disconnect();
 
         virtual void trace(Visitor*) OVERRIDE;
 
         // WebSocketChannelClient functions.
         virtual void didConnect(const String& subprotocol, const String& extensions) OVERRIDE;
         virtual void didReceiveMessage(const String& message) OVERRIDE;
         virtual void didReceiveBinaryData(PassOwnPtr<Vector<char> >) OVERRIDE;
         virtual void didConsumeBufferedAmount(unsigned long) OVERRIDE;
         virtual void didStartClosingHandshake() OVERRIDE;
         virtual void didClose(ClosingHandshakeCompletionStatus, unsigned short code, const String& reason) OVERRIDE;
         virtual void didReceiveMessageError() OVERRIDE;
 
     private:
-#if ENABLE(OILPAN)
-        Peer(RawPtr<ThreadableWebSocketChannelClientWrapper>, WorkerLoaderProxy&, ExecutionContext*, const String& sourceURL, unsigned lineNumber, RawPtr<ThreadableWebSocketChannelSyncHelper>);
-#else
-        Peer(PassRefPtr<WeakReference<Peer> >, PassRefPtr<ThreadableWebSocketChannelClientWrapper>, WorkerLoaderProxy&, ExecutionContext*, const String& sourceURL, unsigned lineNumber, PassRefPtr<ThreadableWebSocketChannelSyncHelper>);
-#endif
+        Peer(PassRefPtrWillBeRawPtr<ThreadableWebSocketChannelClientWrapper>, WorkerLoaderProxy&, PassRefPtrWillBeRawPtr<ThreadableWebSocketChannelSyncHelper>);
+
+        void initializeInternal(ExecutionContext*, const String& sourceURLAtConnection, unsigned lineNumberAtConnection);
 
         const RefPtrWillBeMember<ThreadableWebSocketChannelClientWrapper> m_workerClientWrapper;
         WorkerLoaderProxy& m_loaderProxy;
         RefPtrWillBeMember<WebSocketChannel> m_mainWebSocketChannel;
         RefPtrWillBeMember<ThreadableWebSocketChannelSyncHelper> m_syncHelper;
-#if ENABLE(OILPAN)
-        // The lifetime of the Peer object is explicitly managed by the Bridge object.
-        // When the Bridge object calls Peer::initialize, the persistent handle is created.
-        // When the Bridge object calls Peer::destroy, the persistent handle is destroyed.
-        // This is because we cannot dispatch a disconnect chain from Peer's destructor since
-        // the disconnect chain touches on-heap objets.
-        GC_PLUGIN_IGNORE("")
-        Persistent<Peer> m_keepAlive;
-#else
-        WeakPtrFactory<Peer> m_weakFactory;
-#endif
     };
 
     // Bridge for Peer. Running on the worker thread.
     class Bridge FINAL : public RefCountedWillBeGarbageCollectedFinalized<Bridge> {
     public:
         static PassRefPtrWillBeRawPtr<Bridge> create(PassRefPtrWillBeRawPtr<ThreadableWebSocketChannelClientWrapper> workerClientWrapper, WorkerGlobalScope& workerGlobalScope)
         {
             return adoptRefWillBeNoop(new Bridge(workerClientWrapper, workerGlobalScope));
         }
         ~Bridge();
@@ skipping 15 matching lines @@
         Bridge(PassRefPtrWillBeRawPtr<ThreadableWebSocketChannelClientWrapper>, WorkerGlobalScope&);
 
         static void setWebSocketChannel(ExecutionContext*, Bridge* thisPtr, Peer*, PassRefPtrWillBeRawPtr<ThreadableWebSocketChannelClientWrapper>);
 
         // Executed on the worker context's thread.
         void clearClientWrapper();
 
         // Returns false if shutdown event is received before method completion.
         bool waitForMethodCompletion(PassOwnPtr<ExecutionContextTask>);
 
-        void terminatePeer();
+        bool hasPeer() const { return m_peer; }

[tyoshino (SeeGerritForStatus), 2014/07/24 08:02:00]

I factored out hasTerminatedPeer() as it was not easy to understand that
!m_syncHelper means that the peer has been terminated. Now, it's ok to just use
m_peer in the if-clauses, I think.

[yhirano, 2014/07/24 08:16:22]

Done.

 
-        bool hasTerminatedPeer() { return !m_syncHelper; }
-
-        const RefPtrWillBeMember<ThreadableWebSocketChannelClientWrapper> m_workerClientWrapper;
+        RefPtrWillBeMember<ThreadableWebSocketChannelClientWrapper> m_workerClientWrapper;
         RefPtrWillBeMember<WorkerGlobalScope> m_workerGlobalScope;
         WorkerLoaderProxy& m_loaderProxy;
         RawPtrWillBeMember<ThreadableWebSocketChannelSyncHelper> m_syncHelper;
-        // The value of this pointer is set when a Peer object is created in Peer::initilize()
-        // in the main thread.
-        WeakPtrWillBeWeakMember<Peer> m_peer;
+        OwnPtrWillBeMember<Peer> m_peer;
     };
 
 private:
     WorkerThreadableWebSocketChannel(WorkerGlobalScope&, WebSocketChannelClient*, const String& sourceURL, unsigned lineNumber);
 
     const RefPtrWillBeMember<ThreadableWebSocketChannelClientWrapper> m_workerClientWrapper;
     RefPtrWillBeMember<Bridge> m_bridge;
     String m_sourceURLAtConnection;
     unsigned m_lineNumberAtConnection;
 };
 
 } // namespace blink
 
 #endif // WorkerThreadableWebSocketChannel_h