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

Unified Diff: mojo/services/network/public/cpp/web_socket_write_queue.h

Issue 1148913002: Fix WebSocket{Read,Write}Queue. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 7 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: mojo/services/network/public/cpp/web_socket_write_queue.h
diff --git a/mojo/services/network/public/cpp/web_socket_write_queue.h b/mojo/services/network/public/cpp/web_socket_write_queue.h
index b2c48fc9076d8fd8b7390aa77271a7df0dab5a60..91e7924159a2ded1515114a1d6c8ddfdeb090b7a 100644
--- a/mojo/services/network/public/cpp/web_socket_write_queue.h
+++ b/mojo/services/network/public/cpp/web_socket_write_queue.h
@@ -7,6 +7,7 @@
#include "base/callback.h"
#include "base/memory/scoped_vector.h"
+#include "base/memory/weak_ptr.h"
#include "mojo/common/handle_watcher.h"
#include "third_party/mojo/src/mojo/public/cpp/system/data_pipe.h"
@@ -19,7 +20,7 @@ namespace mojo {
// See also: WebSocketReadQueue
class WebSocketWriteQueue {
public:
- WebSocketWriteQueue(DataPipeProducerHandle handle);
+ explicit WebSocketWriteQueue(DataPipeProducerHandle handle);
~WebSocketWriteQueue();
void Write(const char* data,
@@ -29,14 +30,15 @@ class WebSocketWriteQueue {
private:
struct Operation;
- MojoResult TryToWrite();
+ void TryToWrite();
void Wait();
void OnHandleReady(MojoResult result);
DataPipeProducerHandle handle_;
common::HandleWatcher handle_watcher_;
ScopedVector<Operation> queue_;
- bool is_waiting_;
+ bool is_busy_;
+ base::WeakPtrFactory<WebSocketWriteQueue> weak_factory_;
};
} // namespace mojo
« no previous file with comments | « mojo/services/network/public/cpp/web_socket_read_queue.cc ('k') | mojo/services/network/public/cpp/web_socket_write_queue.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698