Notify WebSocket connection failure, Blink side

Source/modules/websockets/NewWebSocketChannelImpl.cpp

 /*
  * Copyright (C) 2013 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 27 matching lines @@
 #include "core/fileapi/Blob.h"
 #include "core/fileapi/FileError.h"
 #include "core/fileapi/FileReaderLoader.h"
 #include "core/fileapi/FileReaderLoaderClient.h"
 #include "core/inspector/InspectorInstrumentation.h"
 #include "core/inspector/ScriptCallStack.h"
 #include "core/loader/UniqueIdentifier.h"
 #include "modules/websockets/WebSocketChannel.h"
 #include "modules/websockets/WebSocketChannelClient.h"
 #include "platform/Logging.h"
+#include "platform/NotImplemented.h"
 #include "public/platform/Platform.h"
 #include "public/platform/WebSocketHandle.h"
 #include "public/platform/WebString.h"
 #include "public/platform/WebURL.h"
 #include "public/platform/WebVector.h"
 #include "weborigin/SecurityOrigin.h"
 #include "wtf/ArrayBuffer.h"
 #include "wtf/Vector.h"
 #include "wtf/text/WTFString.h"
 
@@ skipping 191 matching lines @@
     handleDidClose(CloseEventCodeAbnormalClosure, String());
     // handleDidClose may delete this object.
 }
 
 void NewWebSocketChannelImpl::disconnect()
 {
     LOG(Network, "NewWebSocketChannelImpl %p disconnect()", this);
     if (m_identifier)
         InspectorInstrumentation::didCloseWebSocket(document(), m_identifier);
     abortAsyncOperations();
-    if (m_handle)
-        m_handle->close(CloseEventCodeAbnormalClosure, "");
     m_handle.clear();
     m_client = 0;
     m_identifier = 0;
 }
 
 void NewWebSocketChannelImpl::suspend()
 {
     LOG(Network, "NewWebSocketChannelImpl %p suspend()", this);
 }
 
@@ skipping 110 matching lines @@
     }
     // FIXME: We should have Request / Response information to be output.
     // InspectorInstrumentation::willSendWebSocketHandshakeRequest(document(), m_identifier, "");
     // InspectorInstrumentation::didReceiveWebSocketHandshakeResponse(document(), m_identifier, "");
 
     m_subprotocol = selectedProtocol;
     m_extensions = extensions;
     m_client->didConnect();
 }
 
+void NewWebSocketChannelImpl::didFail(WebSocketHandle* handle, const WebKit::WebString& message)
+{
+    LOG(Network, "NewWebSocketChannelImpl %p didFail(%p, %s)", this, handle, message.utf8().data());
+    // FIXME: Hande the failure correctly.
+    const unsigned short abnormalClosure = 1006;

[abarth-chromium, 2013/10/31 17:54:49]

Where does this number come from?  If it's in the spec we should link to the
spec.

[yhirano, 2013/11/01 03:51:47]

Done.

+    didClose(handle, false, abnormalClosure, "");
+    // |this| may be deleted.
+}
+
 void NewWebSocketChannelImpl::didReceiveData(WebSocketHandle* handle, bool fin, WebSocketHandle::MessageType type, const char* data, size_t size)
 {
     LOG(Network, "NewWebSocketChannelImpl %p didReceiveData(%p, %d, %d, (%p, %zu))", this, handle, fin, type, data, size);
     ASSERT(m_handle);
     ASSERT(handle == m_handle);
     ASSERT(m_client);
     // Non-final frames cannot be empty.
     ASSERT(fin || size);
     switch (type) {
     case WebSocketHandle::MessageTypeText:
@@ skipping 31 matching lines @@
         } else {
             m_client->didReceiveMessage(message);
         }
     } else {
         OwnPtr<Vector<char> > binaryData = adoptPtr(new Vector<char>);
         binaryData->swap(m_receivingMessageData);
         m_client->didReceiveBinaryData(binaryData.release());
     }
 }
 
-void NewWebSocketChannelImpl::didClose(WebSocketHandle* handle, unsigned short code, const WebKit::WebString& reason)
+void NewWebSocketChannelImpl::didClose(WebSocketHandle* handle, bool wasClean, unsigned short code, const WebKit::WebString& reason)
 {
-    LOG(Network, "NewWebSocketChannelImpl %p didClose(%p, %u, %s)", this, handle, code, String(reason).utf8().data());
+    // FIXME: Use |wasClean| appropriately.
+    LOG(Network, "NewWebSocketChannelImpl %p didClose(%p, %d, %u, %s)", this, handle, wasClean, code, String(reason).utf8().data());
     ASSERT(m_handle);
     m_handle.clear();
     if (m_identifier) {
         InspectorInstrumentation::didCloseWebSocket(document(), m_identifier);
         m_identifier = 0;
     }
 
     // FIXME: Maybe we should notify an error to m_client for some didClose messages.
     handleDidClose(code, reason);
     // handleDidClose may delete this object.
@@ skipping 16 matching lines @@
     if (errorCode == FileError::ABORT_ERR) {
         // The error is caused by cancel().
         return;
     }
     // FIXME: Generate human-friendly reason message.
     failAsError("Failed to load Blob: error code = " + String::number(errorCode));
     // |this| can be deleted here.
 }
 
 } // namespace WebCore