Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(121)

Unified Diff: webkit/glue/websocketstreamhandle_impl.cc

Issue 10458057: Websocket should fire 'error' event if no server available (Closed) Base URL: http://git.chromium.org/git/chromium.git@trunk
Patch Set: Created 8 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: webkit/glue/websocketstreamhandle_impl.cc
diff --git a/webkit/glue/websocketstreamhandle_impl.cc b/webkit/glue/websocketstreamhandle_impl.cc
index e9b13a504ce2afb38e084181785da85d587410d7..287a132cb355590a16cc179956a05d6fae648f16 100644
--- a/webkit/glue/websocketstreamhandle_impl.cc
+++ b/webkit/glue/websocketstreamhandle_impl.cc
@@ -15,6 +15,7 @@
#include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebData.h"
#include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebURL.h"
#include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebSocketStreamHandleClient.h"
+#include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebSocketStreamError.h"
#include "webkit/glue/webkitplatformsupport_impl.h"
#include "webkit/glue/websocketstreamhandle_bridge.h"
#include "webkit/glue/websocketstreamhandle_delegate.h"
@@ -22,6 +23,7 @@
using WebKit::WebData;
using WebKit::WebSocketStreamHandle;
using WebKit::WebSocketStreamHandleClient;
+using WebKit::WebSocketStreamError;
using WebKit::WebURL;
namespace webkit_glue {
@@ -52,6 +54,7 @@ class WebSocketStreamHandleImpl::Context
virtual void DidSendData(WebSocketStreamHandle*, int);
virtual void DidReceiveData(WebSocketStreamHandle*, const char*, int);
virtual void DidClose(WebSocketStreamHandle*);
+ virtual void DidFail(WebSocketStreamHandle*, int);
private:
friend class base::RefCounted<Context>;
@@ -143,6 +146,14 @@ void WebSocketStreamHandleImpl::Context::DidClose(
Release();
}
+void WebSocketStreamHandleImpl::Context::DidFail(
+ WebSocketStreamHandle* web_handle, int error_code) {
Yuta Kitamura 2012/06/11 08:24:16 Wrap line between arguments.
+ VLOG(1) << "DidFail";
+ if (client_) {
+ // FIXME: transfer error_code.
+ client_->didFail(handle_, WebSocketStreamError());
+ }
+}
// WebSocketStreamHandleImpl ------------------------------------------------
WebSocketStreamHandleImpl::WebSocketStreamHandleImpl(

Powered by Google App Engine
This is Rietveld 408576698