summaryrefslogtreecommitdiffstats
path: root/net/websockets/websocket_job.h
diff options
context:
space:
mode:
authorukai@chromium.org <ukai@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-03-19 05:19:45 +0000
committerukai@chromium.org <ukai@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-03-19 05:19:45 +0000
commit0f12f892066a9cb8396e67aa0a6e956d7a625cc5 (patch)
treeb6116108926ab884f75f102ebca279a642ff964e /net/websockets/websocket_job.h
parent12dc10faf13ff52d6e63baf7b5fcc05002c8f831 (diff)
downloadchromium_src-0f12f892066a9cb8396e67aa0a6e956d7a625cc5.zip
chromium_src-0f12f892066a9cb8396e67aa0a6e956d7a625cc5.tar.gz
chromium_src-0f12f892066a9cb8396e67aa0a6e956d7a625cc5.tar.bz2
Try to fix flaky websocket tests.
Some websoket layout tests became flaky from r41818. This is because it adds websocket throttling in WebSocketJob. Make sure Close() will call OnClose() even if it is waiting resolving or waiting in throttling queue, so that WebSocketJob is removed from throttling queue and wake up next WebSocketJob. BUG=38397 TEST=layout tests websocket/tests passes Review URL: http://codereview.chromium.org/1096001 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@42074 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/websockets/websocket_job.h')
-rw-r--r--net/websockets/websocket_job.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/net/websockets/websocket_job.h b/net/websockets/websocket_job.h
index 23140c5..b3ccd34 100644
--- a/net/websockets/websocket_job.h
+++ b/net/websockets/websocket_job.h
@@ -82,6 +82,7 @@ class WebSocketJob : public SocketStreamJob, public SocketStream::Delegate {
void SetWaiting();
bool IsWaiting() const;
void Wakeup();
+ void DoCallback();
SocketStream::Delegate* delegate_;
State state_;