Create a path to deliver SocketStream errors to the renderer.

webkit/glue/websocketstreamhandle_impl.cc

 // Copyright (c) 2010 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.
 
 // An implementation of WebSocketStreamHandle.
 
 #include "webkit/glue/websocketstreamhandle_impl.h"
 
 #include <vector>
 
 #include "base/compiler_specific.h"
 #include "base/logging.h"
 #include "base/ref_counted.h"
 #include "base/scoped_ptr.h"
+#include "net/base/net_errors.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebData.h"
+#include "third_party/WebKit/Source/WebKit/chromium/public/WebSocketStreamError.h"
+#include "third_party/WebKit/Source/WebKit/chromium/public/WebSocketStreamHandleClient.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebURL.h"
-#include "third_party/WebKit/Source/WebKit/chromium/public/WebSocketStreamHandleClient.h"
 #include "webkit/glue/websocketstreamhandle_bridge.h"
 #include "webkit/glue/websocketstreamhandle_delegate.h"
 
 namespace webkit_glue {
 
 // WebSocketStreamHandleImpl::Context -----------------------------------------
 
 class WebSocketStreamHandleImpl::Context
     : public base::RefCounted<Context>,
       public WebSocketStreamHandleDelegate {
@@ skipping 12 matching lines @@
   // Must be called before |handle_| or |client_| is deleted.
   // Once detached, it never calls |client_| back.
   void Detach();
 
   // WebSocketStreamHandleDelegate methods:
   virtual void DidOpenStream(WebKit::WebSocketStreamHandle*, int);
   virtual void DidSendData(WebKit::WebSocketStreamHandle*, int);
   virtual void DidReceiveData(
       WebKit::WebSocketStreamHandle*, const char*, int);
   virtual void DidClose(WebKit::WebSocketStreamHandle*);
+  virtual void DidFail(WebKit::WebSocketStreamHandle*, int);
 
  private:
   friend class base::RefCounted<Context>;
   ~Context() {
     DCHECK(!handle_);
     DCHECK(!client_);
     DCHECK(!bridge_);
   }
 
   WebSocketStreamHandleImpl* handle_;
   WebKit::WebSocketStreamHandleClient* client_;
+  WebKit::WebURL url_;
   // |bridge_| is alive from Connect to DidClose, so Context must be alive
   // in the time period.
   scoped_refptr<WebSocketStreamHandleBridge> bridge_;
 
   DISALLOW_COPY_AND_ASSIGN(Context);
 };
 
 WebSocketStreamHandleImpl::Context::Context(WebSocketStreamHandleImpl* handle)
     : handle_(handle),
       client_(NULL),
       bridge_(NULL) {
 }
 
 void WebSocketStreamHandleImpl::Context::Connect(const WebKit::WebURL& url) {
   VLOG(1) << "Connect url=" << url;
   DCHECK(!bridge_);
   bridge_ = WebSocketStreamHandleBridge::Create(handle_, this);
   AddRef();  // Will be released by DidClose().
+  url_ = url;
   bridge_->Connect(url);
 }
 
 bool WebSocketStreamHandleImpl::Context::Send(const WebKit::WebData& data) {
   VLOG(1) << "Send data.size=" << data.size();
   DCHECK(bridge_);
   return bridge_->Send(
       std::vector<char>(data.data(), data.data() + data.size()));
 }
 
@@ skipping 40 matching lines @@
   WebSocketStreamHandleImpl* handle = handle_;
   handle_ = NULL;
   if (client_) {
     WebKit::WebSocketStreamHandleClient* client = client_;
     client_ = NULL;
     client->didClose(handle);
   }
   Release();
 }
 
+void WebSocketStreamHandleImpl::Context::DidFail(
+    WebKit::WebSocketStreamHandle* web_handle,
+    int error_code) {
+  if (client_) {
+    const char* error_description = net::ErrorToString(error_code);
+    WebKit::WebSocketStreamError error(
+        error_code,

[ukai, 2011/05/10 08:10:39]

when error_code is translated in WebKit's code?
we'll use the same error code in net/base/net_errors.h on all other platform in
WebKit?

[Yuta Kitamura, 2011/05/10 09:01:22]

In WebKit, SocketStreamError's errorCode is considered platform-dependent. The
only purpose is to show it to users via Web Inspector.

For example, SocketStreamHandleCFNet uses error code returned from
CFErrorGetCode.
http://trac.webkit.org/browser/trunk/Source/WebCore/platform/network/cf/Socke...

[ukai, 2011/05/10 10:00:29]

Hmm. then I think we should refrain from using errorCode in message to web
developer (as ResourceError)

+        WebKit::WebString::fromUTF8(error_description),
+        url_);
+    client_->didFail(handle_, error);
+  }
+}
+
 // WebSocketStreamHandleImpl ------------------------------------------------
 
 WebSocketStreamHandleImpl::WebSocketStreamHandleImpl()
     : ALLOW_THIS_IN_INITIALIZER_LIST(context_(new Context(this))) {
 }
 
 WebSocketStreamHandleImpl::~WebSocketStreamHandleImpl() {
   // We won't receive any events from |context_|.
   // |context_| is ref counted, and will be released when it received
   // DidClose.
@@ skipping 11 matching lines @@
 
 bool WebSocketStreamHandleImpl::send(const WebKit::WebData& data) {
   return context_->Send(data);
 }
 
 void WebSocketStreamHandleImpl::close() {
   context_->Close();
 }
 
 }  // namespace webkit_glue