[WebSocket] Remove "Threadable" from class names.

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 12 matching lines @@
  * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
  * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 #include "config.h"
 
-#include "modules/websockets/WorkerThreadableWebSocketChannel.h"
+#include "modules/websockets/WorkerWebSocketChannel.h"
 
 #include "bindings/core/v8/ScriptCallStackFactory.h"
 #include "core/dom/CrossThreadTask.h"
 #include "core/dom/Document.h"
 #include "core/dom/ExecutionContext.h"
 #include "core/dom/ExecutionContextTask.h"
 #include "core/fileapi/Blob.h"
 #include "core/inspector/ScriptCallFrame.h"
 #include "core/inspector/ScriptCallStack.h"
 #include "core/workers/WorkerGlobalScope.h"
 #include "core/workers/WorkerLoaderProxy.h"
 #include "core/workers/WorkerThread.h"
 #include "modules/websockets/DocumentWebSocketChannel.h"
 #include "public/platform/Platform.h"
 #include "public/platform/WebWaitableEvent.h"
 #include "wtf/ArrayBuffer.h"
 #include "wtf/Assertions.h"
 #include "wtf/Functional.h"
 #include "wtf/MainThread.h"
 #include "wtf/text/WTFString.h"
 
 namespace blink {
 
-typedef WorkerThreadableWebSocketChannel::Bridge Bridge;
-typedef WorkerThreadableWebSocketChannel::Peer Peer;
+typedef WorkerWebSocketChannel::Bridge Bridge;
+typedef WorkerWebSocketChannel::Peer Peer;
 
 // Created and destroyed on the worker thread. All setters of this class are
 // called on the main thread, while all getters are called on the worker
 // thread. signalWorkerThread() must be called before any getters are called.
-class ThreadableWebSocketChannelSyncHelper : public GarbageCollectedFinalized<ThreadableWebSocketChannelSyncHelper> {
+class WebSocketChannelSyncHelper : public GarbageCollectedFinalized<WebSocketChannelSyncHelper> {
 public:
-    static ThreadableWebSocketChannelSyncHelper* create(PassOwnPtr<WebWaitableEvent> event)
+    static WebSocketChannelSyncHelper* create(PassOwnPtr<WebWaitableEvent> event)
     {
-        return new ThreadableWebSocketChannelSyncHelper(event);
+        return new WebSocketChannelSyncHelper(event);
     }
 
-    ~ThreadableWebSocketChannelSyncHelper()
+    ~WebSocketChannelSyncHelper()
     {
     }
 
     // All setters are called on the main thread.
     void setConnectRequestResult(bool connectRequestResult)
     {
         m_connectRequestResult = connectRequestResult;
     }
 
     // All getter are called on the worker thread.
     bool connectRequestResult() const
     {
         return m_connectRequestResult;
     }
 
     // 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();
     }
 
     void trace(Visitor* visitor) { }
 
 private:
-    explicit ThreadableWebSocketChannelSyncHelper(PassOwnPtr<WebWaitableEvent> event)
+    explicit WebSocketChannelSyncHelper(PassOwnPtr<WebWaitableEvent> event)
         : m_event(event)
         , m_connectRequestResult(false)
     {
     }
 
     OwnPtr<WebWaitableEvent> m_event;
     bool m_connectRequestResult;
 };
 
-WorkerThreadableWebSocketChannel::WorkerThreadableWebSocketChannel(WorkerGlobalScope& workerGlobalScope, WebSocketChannelClient* client, const String& sourceURL, unsigned lineNumber)
+WorkerWebSocketChannel::WorkerWebSocketChannel(WorkerGlobalScope& workerGlobalScope, WebSocketChannelClient* client, const String& sourceURL, unsigned lineNumber)
     : m_bridge(new Bridge(client, workerGlobalScope))
     , m_sourceURLAtConnection(sourceURL)
     , m_lineNumberAtConnection(lineNumber)
 {
     m_bridge->initialize(sourceURL, lineNumber);
 }
 
-WorkerThreadableWebSocketChannel::~WorkerThreadableWebSocketChannel()
+WorkerWebSocketChannel::~WorkerWebSocketChannel()
 {
     ASSERT(!m_bridge);
 }
 
-bool WorkerThreadableWebSocketChannel::connect(const KURL& url, const String& protocol)
+bool WorkerWebSocketChannel::connect(const KURL& url, const String& protocol)
 {
     ASSERT(m_bridge);
     return m_bridge->connect(url, protocol);
 }
 
-void WorkerThreadableWebSocketChannel::send(const String& message)
+void WorkerWebSocketChannel::send(const String& message)
 {
     ASSERT(m_bridge);
     m_bridge->send(message);
 }
 
-void WorkerThreadableWebSocketChannel::send(const ArrayBuffer& binaryData, unsigned byteOffset, unsigned byteLength)
+void WorkerWebSocketChannel::send(const ArrayBuffer& binaryData, unsigned byteOffset, unsigned byteLength)
 {
     ASSERT(m_bridge);
     m_bridge->send(binaryData, byteOffset, byteLength);
 }
 
-void WorkerThreadableWebSocketChannel::send(PassRefPtr<BlobDataHandle> blobData)
+void WorkerWebSocketChannel::send(PassRefPtr<BlobDataHandle> blobData)
 {
     ASSERT(m_bridge);
     m_bridge->send(blobData);
 }
 
-void WorkerThreadableWebSocketChannel::close(int code, const String& reason)
+void WorkerWebSocketChannel::close(int code, const String& reason)
 {
     ASSERT(m_bridge);
     m_bridge->close(code, reason);
 }
 
-void WorkerThreadableWebSocketChannel::fail(const String& reason, MessageLevel level, const String& sourceURL, unsigned lineNumber)
+void WorkerWebSocketChannel::fail(const String& reason, MessageLevel level, const String& sourceURL, unsigned lineNumber)
 {
     if (!m_bridge)
         return;
 
     RefPtrWillBeRawPtr<ScriptCallStack> callStack = createScriptCallStack(1, true);
     if (callStack && callStack->size())  {
         // In order to emulate the ConsoleMessage behavior,
         // we should ignore the specified url and line number if
         // we can get the JavaScript context.
         m_bridge->fail(reason, level, callStack->at(0).sourceURL(), callStack->at(0).lineNumber());
     } else if (sourceURL.isEmpty() && !lineNumber) {
         // No information is specified by the caller - use the url
         // and the line number at the connection.
         m_bridge->fail(reason, level, m_sourceURLAtConnection, m_lineNumberAtConnection);
     } else {
         // Use the specified information.
         m_bridge->fail(reason, level, sourceURL, lineNumber);
     }
 }
 
-void WorkerThreadableWebSocketChannel::disconnect()
+void WorkerWebSocketChannel::disconnect()
 {
     m_bridge->disconnect();
     m_bridge.clear();
 }
 
-void WorkerThreadableWebSocketChannel::trace(Visitor* visitor)
+void WorkerWebSocketChannel::trace(Visitor* visitor)
 {
     visitor->trace(m_bridge);
     WebSocketChannel::trace(visitor);
 }
 
-Peer::Peer(Bridge* bridge, WorkerLoaderProxy& loaderProxy, ThreadableWebSocketChannelSyncHelper* syncHelper)
+Peer::Peer(Bridge* bridge, WorkerLoaderProxy& loaderProxy, WebSocketChannelSyncHelper* syncHelper)
     : m_bridge(bridge)
     , m_loaderProxy(loaderProxy)
     , m_mainWebSocketChannel(nullptr)
     , m_syncHelper(syncHelper)
 {
     ASSERT(!isMainThread());
 }
 
 Peer::~Peer()
 {
@@ skipping 171 matching lines @@
     visitor->trace(m_bridge);
     visitor->trace(m_mainWebSocketChannel);
     visitor->trace(m_syncHelper);
     WebSocketChannelClient::trace(visitor);
 }
 
 Bridge::Bridge(WebSocketChannelClient* client, WorkerGlobalScope& workerGlobalScope)
     : m_client(client)
     , m_workerGlobalScope(workerGlobalScope)
     , m_loaderProxy(m_workerGlobalScope->thread()->workerLoaderProxy())
-    , m_syncHelper(ThreadableWebSocketChannelSyncHelper::create(adoptPtr(Platform::current()->createWaitableEvent())))
+    , m_syncHelper(WebSocketChannelSyncHelper::create(adoptPtr(Platform::current()->createWaitableEvent())))
     , m_peer(new Peer(this, m_loaderProxy, m_syncHelper))
 {
 }
 
 Bridge::~Bridge()
 {
     ASSERT(!m_peer);
 }
 
 void Bridge::initialize(const String& sourceURL, unsigned lineNumber)
@@ skipping 84 matching lines @@
 
 void Bridge::trace(Visitor* visitor)
 {
     visitor->trace(m_client);
     visitor->trace(m_workerGlobalScope);
     visitor->trace(m_syncHelper);
     visitor->trace(m_peer);
 }
 
 } // namespace blink