Notify WebSocket connection failure, chromium side

content/browser/renderer_host/websocket_host.cc

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/browser/renderer_host/websocket_host.h"
 
 #include "base/basictypes.h"
 #include "base/strings/string_util.h"
 #include "content/browser/renderer_host/websocket_dispatcher_host.h"
 #include "content/common/websocket_messages.h"
@@ skipping 51 matching lines @@
   // WebSocket extensions through to the renderer to make it visible to
   // Javascript.
   virtual void OnAddChannelResponse(
       bool fail,
       const std::string& selected_subprotocol) OVERRIDE;
   virtual void OnDataFrame(bool fin,
                            WebSocketMessageType type,
                            const std::vector<char>& data) OVERRIDE;
   virtual void OnClosingHandshake() OVERRIDE;
   virtual void OnFlowControl(int64 quota) OVERRIDE;
-  virtual void OnDropChannel(uint16 code,
+  virtual void OnDropChannel(bool fail,
+                             uint16 code,
                              const std::string& reason) OVERRIDE;
 
  private:
   WebSocketDispatcherHost* const dispatcher_;
   const int routing_id_;
 
   DISALLOW_COPY_AND_ASSIGN(WebSocketEventHandler);
 };
 
 WebSocketEventHandler::WebSocketEventHandler(
@@ skipping 23 matching lines @@
 void WebSocketEventHandler::OnClosingHandshake() {
   dispatcher_->SendClosing(routing_id_);
   // |this| may have been deleted here.
 }
 
 void WebSocketEventHandler::OnFlowControl(int64 quota) {
   dispatcher_->SendFlowControl(routing_id_, quota);
   // |this| may have been deleted here.
 }
 
-void WebSocketEventHandler::OnDropChannel(uint16 code,
+void WebSocketEventHandler::OnDropChannel(bool fail,
+                                          uint16 code,
                                           const std::string& reason) {
-  dispatcher_->DoDropChannel(routing_id_, code, reason);
+  dispatcher_->DoDropChannel(routing_id_, fail, code, reason);
   // |this| has been deleted here.
 }
 
 }  // namespace
 
 WebSocketHost::WebSocketHost(int routing_id,
                              WebSocketDispatcherHost* dispatcher,
                              net::URLRequestContext* url_request_context) {
   DVLOG(1) << "WebSocketHost: created routing_id= " << routing_id;
   scoped_ptr<net::WebSocketEventInterface> event_interface(
@@ skipping 39 matching lines @@
   channel_->SendFrame(fin, MessageTypeToOpCode(type), data);
 }
 
 void WebSocketHost::OnFlowControl(int64 quota) {
   DVLOG(3) << "WebSocketHost::OnFlowControl"
            << " routing_id= " << routing_id_ << " quota= " << quota;
 
   channel_->SendFlowControl(quota);
 }
 
-void WebSocketHost::OnDropChannel(uint16 code, const std::string& reason) {
+void WebSocketHost::OnDropChannel(bool fail,
+                                  uint16 code,
+                                  const std::string& reason) {
   DVLOG(3) << "WebSocketDispatcherHost::OnDropChannel"
-           << " routing_id= " << routing_id_ << " code= " << code
-           << " reason= " << reason;
+           << " routing_id= " << routing_id_ << " fail = " << fail
+           << " code= " << code << " reason= " << reason;
 
+  // TODO(yhirano): Use |fail| appropriately.

[Adam Rice, 2013/10/23 03:18:06]

We should just delete the WebSocketChannel if |fail| is true. But we also need
to de-register it from WebSocketDispatcherHost. No existing method on
WebSocketDispatcherHost does the right thing, so I think we will need a new one.
WebSocketHost does not keep a pointer back to WebSocketDispatcherHost; I am not
sure whether it is a good idea to add one, or if it is risky. Alternatively,
adding a new method to WebSocketChannel like ClientFail() or similar, and then
adding a new event type to WebSocketEventInterface (OnClientFail ?) would work.

[yhirano, 2013/10/23 05:42:23]

Will do in a future CL.

   channel_->StartClosingHandshake(code, reason);
 }
 
 
 }  // namespace content