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/tools | |
| 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/tools')
| -rw-r--r-- | webkit/tools/test_shell/simple_socket_stream_bridge.cc | 20 |
1 files changed, 0 insertions, 20 deletions
diff --git a/webkit/tools/test_shell/simple_socket_stream_bridge.cc b/webkit/tools/test_shell/simple_socket_stream_bridge.cc index f43c87b..b28e1e1 100644 --- a/webkit/tools/test_shell/simple_socket_stream_bridge.cc +++ b/webkit/tools/test_shell/simple_socket_stream_bridge.cc @@ -10,7 +10,6 @@ #include "base/bind.h" #include "base/memory/ref_counted.h" #include "base/message_loop.h" -#include "base/utf_string_conversions.h" #include "googleurl/src/gurl.h" #include "net/socket_stream/socket_stream_job.h" #include "net/websockets/websocket_job.h" @@ -49,7 +48,6 @@ class WebSocketStreamHandleBridgeImpl virtual void OnReceivedData(net::SocketStream* req, const char* data, int len) OVERRIDE; virtual void OnClose(net::SocketStream* req) OVERRIDE; - virtual void OnError(const net::SocketStream* req, int error_code) OVERRIDE; private: virtual ~WebSocketStreamHandleBridgeImpl(); @@ -64,7 +62,6 @@ class WebSocketStreamHandleBridgeImpl void DoOnSentData(int amount_sent); void DoOnReceivedData(std::vector<char>* data); void DoOnClose(); - void DoOnError(int error_code, const char* error_msg); int socket_id_; MessageLoop* message_loop_; @@ -157,15 +154,6 @@ void WebSocketStreamHandleBridgeImpl::OnClose(net::SocketStream* socket) { base::Bind(&WebSocketStreamHandleBridgeImpl::DoOnClose, this)); } -void WebSocketStreamHandleBridgeImpl::OnError( - const net::SocketStream* socket, int error_code) { - base::subtle::NoBarrier_AtomicIncrement(&num_pending_tasks_, 1); - message_loop_->PostTask( - FROM_HERE, - base::Bind(&WebSocketStreamHandleBridgeImpl::DoOnError, this, - error_code, net::ErrorToString(error_code))); -} - void WebSocketStreamHandleBridgeImpl::DoConnect(const GURL& url) { DCHECK(MessageLoop::current() == g_io_thread); socket_ = net::SocketStreamJob::CreateSocketStreamJob( @@ -229,14 +217,6 @@ void WebSocketStreamHandleBridgeImpl::DoOnClose() { Release(); } -void WebSocketStreamHandleBridgeImpl::DoOnError( - int error_code, const char* error_msg) { - DCHECK(MessageLoop::current() == message_loop_); - base::subtle::NoBarrier_AtomicIncrement(&num_pending_tasks_, -1); - if (delegate_) - delegate_->DidFail(handle_, error_code, ASCIIToUTF16(error_msg)); -} - } // namespace /* static */ |