diff options
| -rw-r--r-- | net/socket_stream/socket_stream.cc | 5 | ||||
| -rw-r--r-- | net/websockets/websocket_job.cc | 55 | ||||
| -rw-r--r-- | net/websockets/websocket_job.h | 1 | ||||
| -rw-r--r-- | net/websockets/websocket_throttle_unittest.cc | 19 | ||||
| -rw-r--r-- | webkit/tools/layout_tests/test_expectations.txt | 7 |
5 files changed, 47 insertions, 40 deletions
diff --git a/net/socket_stream/socket_stream.cc b/net/socket_stream/socket_stream.cc index 1d10ad5..b6d3a65 100644 --- a/net/socket_stream/socket_stream.cc +++ b/net/socket_stream/socket_stream.cc @@ -167,8 +167,9 @@ void SocketStream::Close() { "The current MessageLoop must exist"; DCHECK_EQ(MessageLoop::TYPE_IO, MessageLoop::current()->type()) << "The current MessageLoop must be TYPE_IO"; - if (socket_.get() && socket_->IsConnected()) - socket_->Disconnect(); + if (!socket_.get() || !socket_->IsConnected() || next_state_ == STATE_NONE) + return; + socket_->Disconnect(); next_state_ = STATE_CLOSE; // Close asynchronously, so that delegate won't be called // back before returning Close(). diff --git a/net/websockets/websocket_job.cc b/net/websockets/websocket_job.cc index 30c39a9..62a62b7 100644 --- a/net/websockets/websocket_job.cc +++ b/net/websockets/websocket_job.cc @@ -12,6 +12,30 @@ #include "net/url_request/url_request_context.h" #include "net/websockets/websocket_throttle.h" +namespace { + +class CompletionCallbackRunner + : public base::RefCountedThreadSafe<CompletionCallbackRunner> { + public: + explicit CompletionCallbackRunner(net::CompletionCallback* callback) + : callback_(callback) { + DCHECK(callback_); + } + void Run() { + callback_->Run(net::OK); + } + private: + friend class base::RefCountedThreadSafe<CompletionCallbackRunner>; + + virtual ~CompletionCallbackRunner() {} + + net::CompletionCallback* callback_; + + DISALLOW_COPY_AND_ASSIGN(CompletionCallbackRunner); +}; + +} + namespace net { // lower-case header names. @@ -138,11 +162,6 @@ void WebSocketJob::DetachDelegate() { if (socket_) socket_->DetachDelegate(); socket_ = NULL; - if (callback_) { - waiting_ = false; - callback_ = NULL; - Release(); // Balanced with OnStartOpenConnection(). - } } int WebSocketJob::OnStartOpenConnection( @@ -154,7 +173,6 @@ int WebSocketJob::OnStartOpenConnection( if (!waiting_) return OK; callback_ = callback; - AddRef(); // Balanced when callback_ becomes NULL. return ERR_IO_PENDING; } @@ -191,11 +209,6 @@ void WebSocketJob::OnClose(SocketStream* socket) { SocketStream::Delegate* delegate = delegate_; delegate_ = NULL; socket_ = NULL; - if (callback_) { - waiting_ = false; - callback_ = NULL; - Release(); // Balanced with OnStartOpenConnection(). - } if (delegate) delegate->OnClose(socket); } @@ -424,24 +437,16 @@ bool WebSocketJob::IsWaiting() const { } void WebSocketJob::Wakeup() { - if (!waiting_) - return; waiting_ = false; DCHECK(callback_); + // We wrap |callback_| to keep this alive while this is released. + scoped_refptr<CompletionCallbackRunner> runner = + new CompletionCallbackRunner(callback_); + callback_ = NULL; MessageLoopForIO::current()->PostTask( FROM_HERE, - NewRunnableMethod(this, - &WebSocketJob::DoCallback)); -} - -void WebSocketJob::DoCallback() { - // |callback_| may be NULL if OnClose() or DetachDelegate() was called. - net::CompletionCallback* callback = callback_; - callback_ = NULL; - if (callback) { - callback->Run(net::OK); - Release(); // Balanced with OnStartOpenConnection(). - } + NewRunnableMethod(runner.get(), + &CompletionCallbackRunner::Run)); } } // namespace net diff --git a/net/websockets/websocket_job.h b/net/websockets/websocket_job.h index b3ccd34..23140c5 100644 --- a/net/websockets/websocket_job.h +++ b/net/websockets/websocket_job.h @@ -82,7 +82,6 @@ class WebSocketJob : public SocketStreamJob, public SocketStream::Delegate { void SetWaiting(); bool IsWaiting() const; void Wakeup(); - void DoCallback(); SocketStream::Delegate* delegate_; State state_; diff --git a/net/websockets/websocket_throttle_unittest.cc b/net/websockets/websocket_throttle_unittest.cc index 61e5e4b..d568292 100644 --- a/net/websockets/websocket_throttle_unittest.cc +++ b/net/websockets/websocket_throttle_unittest.cc @@ -61,13 +61,8 @@ class WebSocketThrottleTest : public PlatformTest { } } - static void MockSocketStreamConnect( - SocketStream* socket, struct addrinfo* head) { + static void SetAddressList(SocketStream* socket, struct addrinfo* head) { socket->CopyAddrInfo(head); - // Add reference to socket as done in SocketStream::Connect(). - // Balanced with Release() in SocketStream::Finish() which will be - // called by SocketStream::DetachDelegate(). - socket->AddRef(); } }; @@ -82,7 +77,7 @@ TEST_F(WebSocketThrottleTest, Throttle) { scoped_refptr<SocketStream> s1 = new SocketStream(GURL("ws://host1/"), w1.get()); w1->InitSocketStream(s1.get()); - WebSocketThrottleTest::MockSocketStreamConnect(s1, addr); + WebSocketThrottleTest::SetAddressList(s1, addr); DeleteAddrInfo(addr); DLOG(INFO) << "socket1"; @@ -102,7 +97,7 @@ TEST_F(WebSocketThrottleTest, Throttle) { scoped_refptr<SocketStream> s2 = new SocketStream(GURL("ws://host2/"), w2.get()); w2->InitSocketStream(s2.get()); - WebSocketThrottleTest::MockSocketStreamConnect(s2, addr); + WebSocketThrottleTest::SetAddressList(s2, addr); DeleteAddrInfo(addr); DLOG(INFO) << "socket2"; @@ -121,7 +116,7 @@ TEST_F(WebSocketThrottleTest, Throttle) { scoped_refptr<SocketStream> s3 = new SocketStream(GURL("ws://host3/"), w3.get()); w3->InitSocketStream(s3.get()); - WebSocketThrottleTest::MockSocketStreamConnect(s3, addr); + WebSocketThrottleTest::SetAddressList(s3, addr); DeleteAddrInfo(addr); DLOG(INFO) << "socket3"; @@ -140,7 +135,7 @@ TEST_F(WebSocketThrottleTest, Throttle) { scoped_refptr<SocketStream> s4 = new SocketStream(GURL("ws://host4/"), w4.get()); w4->InitSocketStream(s4.get()); - WebSocketThrottleTest::MockSocketStreamConnect(s4, addr); + WebSocketThrottleTest::SetAddressList(s4, addr); DeleteAddrInfo(addr); DLOG(INFO) << "socket4"; @@ -158,7 +153,7 @@ TEST_F(WebSocketThrottleTest, Throttle) { scoped_refptr<SocketStream> s5 = new SocketStream(GURL("ws://host5/"), w5.get()); w5->InitSocketStream(s5.get()); - WebSocketThrottleTest::MockSocketStreamConnect(s5, addr); + WebSocketThrottleTest::SetAddressList(s5, addr); DeleteAddrInfo(addr); DLOG(INFO) << "socket5"; @@ -176,7 +171,7 @@ TEST_F(WebSocketThrottleTest, Throttle) { scoped_refptr<SocketStream> s6 = new SocketStream(GURL("ws://host6/"), w6.get()); w6->InitSocketStream(s6.get()); - WebSocketThrottleTest::MockSocketStreamConnect(s6, addr); + WebSocketThrottleTest::SetAddressList(s6, addr); DeleteAddrInfo(addr); DLOG(INFO) << "socket6"; diff --git a/webkit/tools/layout_tests/test_expectations.txt b/webkit/tools/layout_tests/test_expectations.txt index d5f9c337..4699ad1 100644 --- a/webkit/tools/layout_tests/test_expectations.txt +++ b/webkit/tools/layout_tests/test_expectations.txt @@ -2820,6 +2820,13 @@ BUG38353 MAC LINUX : http/tests/plugins/plugin-document-has-focus.html = TIMEOUT BUG38392 : plugins/resize-from-plugin.html = TEXT +// Chromium r41818 makes these flaky. +BUG38397 : websocket/tests/url-with-credential.html = TEXT PASS +BUG38397 : websocket/tests/url-with-empty-query.html = TEXT PASS +BUG38397 : websocket/tests/url-with-query-for-no-query.html = TEXT PASS +BUG38397 : websocket/tests/url-with-query.html = TEXT PASS +BUG38397 : websocket/tests/websocket-pending-activity.html = TIMEOUT PASS + // One pixel changes from gray 0x83 to gray 0x81. Valgrind is clean. BUG38534 LINUX : tables/mozilla/bugs/bug20804.html = IMAGE PASS |