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

Unified Diff: webkit/glue/websocketstreamhandle_impl.cc

Issue 10668018: Websocket should fire 'error' event if no server available (Closed) Base URL: http://git.chromium.org/git/chromium.git@trunk
Patch Set: For reland (tyoshino) Created 7 years, 8 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 c0216225b7ddc2ed29c7fa53dd40c34bb3620e3d..897ccb751b53c468d5e51a7da598bdb4082ef527 100644
--- a/webkit/glue/websocketstreamhandle_impl.cc
+++ b/webkit/glue/websocketstreamhandle_impl.cc
@@ -12,7 +12,9 @@
#include "base/logging.h"
#include "base/memory/ref_counted.h"
#include "base/memory/scoped_ptr.h"
+#include "base/string16.h"
#include "third_party/WebKit/Source/Platform/chromium/public/WebData.h"
+#include "third_party/WebKit/Source/Platform/chromium/public/WebSocketStreamError.h"
#include "third_party/WebKit/Source/Platform/chromium/public/WebSocketStreamHandleClient.h"
#include "third_party/WebKit/Source/Platform/chromium/public/WebURL.h"
#include "webkit/glue/webkitplatformsupport_impl.h"
@@ -20,6 +22,7 @@
#include "webkit/glue/websocketstreamhandle_delegate.h"
using WebKit::WebData;
+using WebKit::WebSocketStreamError;
using WebKit::WebSocketStreamHandle;
using WebKit::WebSocketStreamHandleClient;
using WebKit::WebURL;
@@ -54,6 +57,7 @@ class WebSocketStreamHandleImpl::Context
const char*,
int) OVERRIDE;
virtual void DidClose(WebSocketStreamHandle*) OVERRIDE;
+ virtual void DidFail(WebSocketStreamHandle*, int, const string16&);
private:
friend class base::RefCounted<Context>;
@@ -145,6 +149,18 @@ void WebSocketStreamHandleImpl::Context::DidClose(
Release();
}
+void WebSocketStreamHandleImpl::Context::DidFail(
+ WebSocketStreamHandle* web_handle,
+ int error_code,
+ const string16& error_msg) {
+ VLOG(1) << "DidFail";
+ if (client_) {
+ client_->didFail(
+ handle_,
+ WebSocketStreamError(error_code, error_msg));
+ }
+}
+
// WebSocketStreamHandleImpl ------------------------------------------------
WebSocketStreamHandleImpl::WebSocketStreamHandleImpl(
« no previous file with comments | « webkit/glue/websocketstreamhandle_delegate.h ('k') | webkit/tools/test_shell/simple_socket_stream_bridge.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698