[WONT COMMIT] WebSocket: Remove WorkerThread::terminated() call

third_party/WebKit/Source/modules/websockets/WorkerWebSocketChannel.cpp

 /*
  * Copyright (C) 2011, 2012 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 54 matching lines @@
         return new WebSocketChannelSyncHelper(std::move(event));
     }
 
     ~WebSocketChannelSyncHelper()
     {
     }
 
     // All setters are called on the main thread.
     void setConnectRequestResult(bool connectRequestResult)
     {
+        DCHECK(isMainThread());
         m_connectRequestResult = connectRequestResult;
     }
 
+    void setWorkerThreadTerminated(bool workerThreadTerminated)
+    {
+        DCHECK(isMainThread());
+        m_workerThreadTerminated = workerThreadTerminated;
+    }
+
     // All getter are called on the worker thread.
     bool connectRequestResult() const
     {
+        DCHECK(!isMainThread());
         return m_connectRequestResult;
     }
 
+    bool workerThreadTerminated() const
+    {
+        DCHECK(!isMainThread());
+        return m_workerThreadTerminated;
+    }
+
     // This should be called after all setters are called and before any
     // getters are called.
     void signalWorkerThread()
     {
         m_event->signal();
     }
     void wait()
     {
         m_event->wait();
     }
 
     DEFINE_INLINE_TRACE() { }
 
 private:
     explicit WebSocketChannelSyncHelper(std::unique_ptr<WaitableEvent> event)
         : m_event(std::move(event))
-        , m_connectRequestResult(false)
     {
     }
 
     std::unique_ptr<WaitableEvent> m_event;
-    bool m_connectRequestResult;
+    bool m_connectRequestResult = false;
+    bool m_workerThreadTerminated = false;
 };
 
 WorkerWebSocketChannel::WorkerWebSocketChannel(WorkerGlobalScope& workerGlobalScope, WebSocketChannelClient* client, std::unique_ptr<SourceLocation> location)
     : m_bridge(new Bridge(client, workerGlobalScope))
     , m_locationAtConnection(std::move(location))
 {
     m_bridge->initialize(m_locationAtConnection->clone());
 }
 
 WorkerWebSocketChannel::~WorkerWebSocketChannel()
@@ skipping 242 matching lines @@
 
 void Peer::didError()
 {
     ASSERT(isMainThread());
     m_loaderProxy->postTaskToWorkerGlobalScope(BLINK_FROM_HERE, createCrossThreadTask(&workerGlobalScopeDidError, m_bridge));
 }
 
 void Peer::contextDestroyed()
 {
     DCHECK(isMainThread());
+    m_syncHelper->setWorkerThreadTerminated(true);

[yhirano, 2016/08/23 02:27:15]

I think this can be called after m_syncHelper->signalWorkerThread() is called,
which violates a WebSocketChannelSyncHelper assumption.

     if (m_mainWebSocketChannel) {
         m_mainWebSocketChannel->disconnect();
         m_mainWebSocketChannel = nullptr;
     }
     m_bridge = nullptr;
 }
 
 DEFINE_TRACE(Peer)
 {
     visitor->trace(m_mainWebSocketChannel);
@@ skipping 110 matching lines @@
     ASSERT(m_workerGlobalScope);
     ASSERT(m_syncHelper);
 
     m_loaderProxy->postTaskToLoader(location, std::move(task));
 
     // We wait for the syncHelper event even if a shutdown event is fired.
     // See https://codereview.chromium.org/267323004/#msg43 for why we need to wait this.
     SafePointScope scope(BlinkGC::HeapPointersOnStack);
     m_syncHelper->wait();
     // This is checking whether a shutdown event is fired or not.
-    return !m_workerGlobalScope->thread()->terminated();
+    return !m_syncHelper->workerThreadTerminated();
 }
 
 DEFINE_TRACE(Bridge)
 {
     visitor->trace(m_client);
     visitor->trace(m_workerGlobalScope);
     visitor->trace(m_syncHelper);
 }
 
 } // namespace blink