diff options
| author | ojan@chromium.org <ojan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-04-26 22:24:00 +0000 |
|---|---|---|
| committer | ojan@chromium.org <ojan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-04-26 22:24:00 +0000 |
| commit | fb9c064d4155b4eed02d4ce1a858ae272eedfacd (patch) | |
| tree | 0fe0d1504b2a0164717a73d1bb4fb3fd771a4992 /webkit/glue | |
| parent | 9ac8d08cfd2244f31b386111b2fc1c6a2fd7f438 (diff) | |
| download | chromium_src-fb9c064d4155b4eed02d4ce1a858ae272eedfacd.zip chromium_src-fb9c064d4155b4eed02d4ce1a858ae272eedfacd.tar.gz chromium_src-fb9c064d4155b4eed02d4ce1a858ae272eedfacd.tar.bz2 | |
Revert 196728 "Websocket should fire 'error' event if no server ..."
Looks like it made a layout test flaky.
http://test-results.appspot.com/dashboards/flakiness_dashboard.html#showLargeExpectations=true&showExpectations=true&tests=http%252Ftests%252Fwebsocket%252Ftests%252Fhybi%252Fclose.html
> Websocket should fire 'error' event if no server available
> Implement OnError virtual function, when network is down, OnError can be invoked.
> Send error code to render process from browser process through IPC.
>
> This patch depends on Blink side patch which can be found from https://codereview.chromium.org/14071008/
>
>
> BUG=128057
> TEST=
>
> Review URL: https://chromiumcodereview.appspot.com/10668018
TBR=li.yin@intel.com
Review URL: https://codereview.chromium.org/14335011
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@196855 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/glue')
| -rw-r--r-- | webkit/glue/websocketstreamhandle_delegate.h | 5 | ||||
| -rw-r--r-- | webkit/glue/websocketstreamhandle_impl.cc | 16 |
2 files changed, 0 insertions, 21 deletions
diff --git a/webkit/glue/websocketstreamhandle_delegate.h b/webkit/glue/websocketstreamhandle_delegate.h index 73c32e2..272538d 100644 --- a/webkit/glue/websocketstreamhandle_delegate.h +++ b/webkit/glue/websocketstreamhandle_delegate.h @@ -5,8 +5,6 @@ #ifndef WEBKIT_GLUE_WEBSOCKETSTREAMHANDLE_DELEGATE_H_ #define WEBKIT_GLUE_WEBSOCKETSTREAMHANDLE_DELEGATE_H_ -#include "base/string16.h" - class GURL; namespace WebKit { @@ -31,9 +29,6 @@ class WebSocketStreamHandleDelegate { virtual void DidReceiveData(WebKit::WebSocketStreamHandle* handle, const char* data, int len) {} virtual void DidClose(WebKit::WebSocketStreamHandle*) {} - virtual void DidFail(WebKit::WebSocketStreamHandle* handle, - int error_code, - const string16& error_msg) {} protected: virtual ~WebSocketStreamHandleDelegate() {} diff --git a/webkit/glue/websocketstreamhandle_impl.cc b/webkit/glue/websocketstreamhandle_impl.cc index 2663d2f..b7a95e8 100644 --- a/webkit/glue/websocketstreamhandle_impl.cc +++ b/webkit/glue/websocketstreamhandle_impl.cc @@ -12,9 +12,7 @@ #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" @@ -22,7 +20,6 @@ #include "webkit/glue/websocketstreamhandle_delegate.h" using WebKit::WebData; -using WebKit::WebSocketStreamError; using WebKit::WebSocketStreamHandle; using WebKit::WebSocketStreamHandleClient; using WebKit::WebURL; @@ -57,7 +54,6 @@ 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>; @@ -149,18 +145,6 @@ 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( |