Rename NewWebSocketChannelImpl to DocumentWebSocketChannel.

Rename NewWebSocketChannelImpl to DocumentWebSocketChannel.

As the new WebSocket implementation is used as default and the old one was
deleted, NewWebSocketChannelImpl is not an appropriate name.

BUG=423201
R=ricea@chromium.org

Committed: https://src.chromium.org/viewvc/blink?view=rev&revision=184817

[yhirano, 2014-10-30 06:36:23]

Oh, sorry, I found an error. please stop reviewing.

[yhirano, 2014-10-30 06:40:03]

On 2014/10/30 06:36:23, yhirano wrote:
> Oh, sorry, I found an error. please stop reviewing.

Fixed. It's ready now.

[Adam Rice, 2014-10-30 08:36:56]

LGTM

You might want to change the CL description as dog lovers might be sad to hear
that "the old wan was deleted".

[yhirano1, 2014-10-30 08:38:31]

On 2014/10/30 08:36:56, Adam Rice wrote:
> LGTM
> 
> You might want to change the CL description as dog lovers might be sad to hear
> that "the old wan was deleted".

Oh, thanks, fixed.

[yhirano1, 2014-10-30 08:39:09]

yhirano@google.com changed reviewers:
+ tkent@chromium.org, yhirano@google.com

[yhirano1, 2014-10-30 08:39:09]

+tkent for Source/web

[yhirano, 2014-10-30 08:39:34]

yhirano@chromium.org changed reviewers:
- yhirano@google.com

[tkent, 2014-10-31 01:32:52]

lgtm

[yhirano, 2014-11-04 01:47:54]

The CQ bit was checked by yhirano@chromium.org

[commit-bot: I haz the power, 2014-11-04 01:48:59]

CQ is trying da patch. Follow status at
 https://chromium-cq-status.appspot.com/patch-status/690883002/40001

[commit-bot: I haz the power, 2014-11-04 01:49:27]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2014-11-04 01:49:28]

Failed to apply patch for
Source/modules/websockets/DocumentWebSocketChannel.cpp:
While running patch -p1 --forward --force --no-backup-if-mismatch;
  A         Source/modules/websockets/DocumentWebSocketChannel.cpp
  Copied Source/modules/websockets/NewWebSocketChannelImpl.cpp ->
Source/modules/websockets/DocumentWebSocketChannel.cpp
  patching file Source/modules/websockets/DocumentWebSocketChannel.cpp
  Hunk #16 FAILED at 404.
  Hunk #17 FAILED at 418.
  Hunk #18 FAILED at 430.
  Hunk #19 FAILED at 441.
  Hunk #20 FAILED at 451.
  Hunk #21 FAILED at 502.
  Hunk #22 FAILED at 519.
  Hunk #23 succeeded at 572 (offset 27 lines).
  Hunk #24 succeeded at 584 (offset 27 lines).
  7 out of 24 hunks FAILED -- saving rejects to file
Source/modules/websockets/DocumentWebSocketChannel.cpp.rej

Patch:   NR 
Source/modules/websockets/NewWebSocketChannelImpl.cpp->Source/modules/websockets/DocumentWebSocketChannel.cpp
Index: Source/modules/websockets/DocumentWebSocketChannel.cpp
diff --git a/Source/modules/websockets/NewWebSocketChannelImpl.cpp
b/Source/modules/websockets/DocumentWebSocketChannel.cpp
similarity index 78%
rename from Source/modules/websockets/NewWebSocketChannelImpl.cpp
rename to Source/modules/websockets/DocumentWebSocketChannel.cpp
index
e3d06a42264464d05ee120862859b1252ceeb104..c259be1bc61ce9e8e45c1b12dd9e2003a33f02ed
100644
--- a/Source/modules/websockets/NewWebSocketChannelImpl.cpp
+++ b/Source/modules/websockets/DocumentWebSocketChannel.cpp
@@ -29,7 +29,7 @@
  */
 
 #include "config.h"
-#include "modules/websockets/NewWebSocketChannelImpl.h"
+#include "modules/websockets/DocumentWebSocketChannel.h"
 
 #include "core/dom/Document.h"
 #include "core/dom/ExecutionContext.h"
@@ -60,9 +60,9 @@ using blink::WebSocketHandle;
 
 namespace blink {
 
-class NewWebSocketChannelImpl::BlobLoader final : public
GarbageCollectedFinalized<NewWebSocketChannelImpl::BlobLoader>, public
FileReaderLoaderClient {
+class DocumentWebSocketChannel::BlobLoader final : public
GarbageCollectedFinalized<DocumentWebSocketChannel::BlobLoader>, public
FileReaderLoaderClient {
 public:
-    BlobLoader(PassRefPtr<BlobDataHandle>, NewWebSocketChannelImpl*);
+    BlobLoader(PassRefPtr<BlobDataHandle>, DocumentWebSocketChannel*);
     virtual ~BlobLoader() { }
 
     void cancel();
@@ -79,37 +79,37 @@ public:
     }
 
 private:
-    Member<NewWebSocketChannelImpl> m_channel;
+    Member<DocumentWebSocketChannel> m_channel;
     FileReaderLoader m_loader;
 };
 
-NewWebSocketChannelImpl::BlobLoader::BlobLoader(PassRefPtr<BlobDataHandle>
blobDataHandle, NewWebSocketChannelImpl* channel)
+DocumentWebSocketChannel::BlobLoader::BlobLoader(PassRefPtr<BlobDataHandle>
blobDataHandle, DocumentWebSocketChannel* channel)
     : m_channel(channel)
     , m_loader(FileReaderLoader::ReadAsArrayBuffer, this)
 {
     m_loader.start(channel->executionContext(), blobDataHandle);
 }
 
-void NewWebSocketChannelImpl::BlobLoader::cancel()
+void DocumentWebSocketChannel::BlobLoader::cancel()
 {
     m_loader.cancel();
     // didFail will be called immediately.
     // |this| is deleted here.
 }
 
-void NewWebSocketChannelImpl::BlobLoader::didFinishLoading()
+void DocumentWebSocketChannel::BlobLoader::didFinishLoading()
 {
     m_channel->didFinishLoadingBlob(m_loader.arrayBufferResult());
     // |this| is deleted here.
 }
 
-void NewWebSocketChannelImpl::BlobLoader::didFail(FileError::ErrorCode
errorCode)
+void DocumentWebSocketChannel::BlobLoader::didFail(FileError::ErrorCode
errorCode)
 {
     m_channel->didFailLoadingBlob(errorCode);
     // |this| is deleted here.
 }
 
-NewWebSocketChannelImpl::NewWebSocketChannelImpl(ExecutionContext* context,
WebSocketChannelClient* client, const String& sourceURL, unsigned lineNumber,
WebSocketHandle *handle)
+DocumentWebSocketChannel::DocumentWebSocketChannel(ExecutionContext* context,
WebSocketChannelClient* client, const String& sourceURL, unsigned lineNumber,
WebSocketHandle *handle)
     : ContextLifecycleObserver(context)
     , m_handle(adoptPtr(handle ? handle :
Platform::current()->createWebSocketHandle()))
     , m_client(client)
@@ -124,14 +124,14 @@
NewWebSocketChannelImpl::NewWebSocketChannelImpl(ExecutionContext* context, WebS
         m_identifier = createUniqueIdentifier();
 }
 
-NewWebSocketChannelImpl::~NewWebSocketChannelImpl()
+DocumentWebSocketChannel::~DocumentWebSocketChannel()
 {
     ASSERT(!m_blobLoader);
 }
 
-bool NewWebSocketChannelImpl::connect(const KURL& url, const String& protocol)
+bool DocumentWebSocketChannel::connect(const KURL& url, const String& protocol)
 {
-    WTF_LOG(Network, "NewWebSocketChannelImpl %p connect()", this);
+    WTF_LOG(Network, "DocumentWebSocketChannel %p connect()", this);
     if (!m_handle)
         return false;
 
@@ -172,9 +172,9 @@ bool NewWebSocketChannelImpl::connect(const KURL& url, const
String& protocol)
     return true;
 }
 
-void NewWebSocketChannelImpl::send(const String& message)
+void DocumentWebSocketChannel::send(const String& message)
 {
-    WTF_LOG(Network, "NewWebSocketChannelImpl %p sendText(%s)", this,
message.utf8().data());
+    WTF_LOG(Network, "DocumentWebSocketChannel %p sendText(%s)", this,
message.utf8().data());
     if (m_identifier) {
         // FIXME: Change the inspector API to show the entire message instead
         // of individual frames.
@@ -185,9 +185,9 @@ void NewWebSocketChannelImpl::send(const String& message)
     sendInternal();
 }
 
-void NewWebSocketChannelImpl::send(PassRefPtr<BlobDataHandle> blobDataHandle)
+void DocumentWebSocketChannel::send(PassRefPtr<BlobDataHandle> blobDataHandle)
 {
-    WTF_LOG(Network, "NewWebSocketChannelImpl %p sendBlob(%s, %s, %llu)", this,
blobDataHandle->uuid().utf8().data(), blobDataHandle->type().utf8().data(),
blobDataHandle->size());
+    WTF_LOG(Network, "DocumentWebSocketChannel %p sendBlob(%s, %s, %llu)",
this, blobDataHandle->uuid().utf8().data(),
blobDataHandle->type().utf8().data(), blobDataHandle->size());
     if (m_identifier) {
         // FIXME: Change the inspector API to show the entire message instead
         // of individual frames.
@@ -200,9 +200,9 @@ void
NewWebSocketChannelImpl::send(PassRefPtr<BlobDataHandle> blobDataHandle)
     sendInternal();
 }
 
-void NewWebSocketChannelImpl::send(const ArrayBuffer& buffer, unsigned
byteOffset, unsigned byteLength)
+void DocumentWebSocketChannel::send(const ArrayBuffer& buffer, unsigned
byteOffset, unsigned byteLength)
 {
-    WTF_LOG(Network, "NewWebSocketChannelImpl %p sendArrayBuffer(%p, %u, %u)",
this, buffer.data(), byteOffset, byteLength);
+    WTF_LOG(Network, "DocumentWebSocketChannel %p sendArrayBuffer(%p, %u, %u)",
this, buffer.data(), byteOffset, byteLength);
     if (m_identifier) {
         // FIXME: Change the inspector API to show the entire message instead
         // of individual frames.
@@ -215,9 +215,9 @@ void NewWebSocketChannelImpl::send(const ArrayBuffer&
buffer, unsigned byteOffse
     sendInternal();
 }
 
-void NewWebSocketChannelImpl::send(PassOwnPtr<Vector<char> > data)
+void DocumentWebSocketChannel::send(PassOwnPtr<Vector<char> > data)
 {
-    WTF_LOG(Network, "NewWebSocketChannelImpl %p sendVector(%p, %llu)", this,
data.get(), static_cast<unsigned long long>(data->size()));
+    WTF_LOG(Network, "DocumentWebSocketChannel %p sendVector(%p, %llu)", this,
data.get(), static_cast<unsigned long long>(data->size()));
     if (m_identifier) {
         // FIXME: Change the inspector API to show the entire message instead
         // of individual frames.
@@ -227,18 +227,18 @@ void NewWebSocketChannelImpl::send(PassOwnPtr<Vector<char>
> data)
     sendInternal();
 }
 
-void NewWebSocketChannelImpl::close(int code, const String& reason)
+void DocumentWebSocketChannel::close(int code, const String& reason)
 {
-    WTF_LOG(Network, "NewWebSocketChannelImpl %p close(%d, %s)", this, code,
reason.utf8().data());
+    WTF_LOG(Network, "DocumentWebSocketChannel %p close(%d, %s)", this, code,
reason.utf8().data());
     ASSERT(m_handle);
     unsigned short codeToSend = static_cast<unsigned short>(code ==
CloseEventCodeNotSpecified ? CloseEventCodeNoStatusRcvd : code);
     m_messages.append(adoptPtr(new Message(codeToSend, reason)));
     sendInternal();
 }
 
-void NewWebSocketChannelImpl::fail(const String& reason, MessageLevel level,
const String& sourceURL, unsigned lineNumber)
+void DocumentWebSocketChannel::fail(const String& reason, MessageLevel level,
const String& sourceURL, unsigned lineNumber)
 {
-    WTF_LOG(Network, "NewWebSocketChannelImpl %p fail(%s)", this,
reason.utf8().data());
+    WTF_LOG(Network, "DocumentWebSocketChannel %p fail(%s)", this,
reason.utf8().data());
     // m_handle and m_client can be null here.
 
     if (m_identifier)
@@ -254,9 +254,9 @@ void NewWebSocketChannelImpl::fail(const String& reason,
MessageLevel level, con
     // handleDidClose may delete this object.
 }
 
-void NewWebSocketChannelImpl::disconnect()
+void DocumentWebSocketChannel::disconnect()
 {
-    WTF_LOG(Network, "NewWebSocketChannelImpl %p disconnect()", this);
+    WTF_LOG(Network, "DocumentWebSocketChannel %p disconnect()", this);
     if (m_identifier) {
         TRACE_EVENT_INSTANT1(TRACE_DISABLED_BY_DEFAULT("devtools.timeline"),
"WebSocketDestroy", "data", InspectorWebSocketEvent::data(document(),
m_identifier));
        
TRACE_EVENT_INSTANT1(TRACE_DISABLED_BY_DEFAULT("devtools.timeline.stack"),
"CallStack", "stack", InspectorCallStackEvent::currentCallStack());
@@ -269,38 +269,38 @@ void NewWebSocketChannelImpl::disconnect()
     m_identifier = 0;
 }
 
-void NewWebSocketChannelImpl::suspend()
+void DocumentWebSocketChannel::suspend()
 {
-    WTF_LOG(Network, "NewWebSocketChannelImpl %p suspend()", this);
+    WTF_LOG(Network, "DocumentWebSocketChannel %p suspend()", this);
 }
 
-void NewWebSocketChannelImpl::resume()
+void DocumentWebSocketChannel::resume()
 {
-    WTF_LOG(Network, "NewWebSocketChannelImpl %p resume()", this);
+    WTF_LOG(Network, "DocumentWebSocketCh…
(message too large)

[yhirano, 2014-11-04 03:28:42]

The CQ bit was checked by yhirano@chromium.org

[commit-bot: I haz the power, 2014-11-04 03:29:28]

CQ is trying da patch. Follow status at
 https://chromium-cq-status.appspot.com/patch-status/690883002/60001

[commit-bot: I haz the power, 2014-11-04 04:33:05]

Committed patchset #4 (id:60001) as 184817