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

Unified Diff: third_party/mojo/src/mojo/public/cpp/bindings/tests/message_queue.h

Issue 1296453004: Update mojo sdk to rev c02a28868825edfa57ab77947b8cb15e741c5598 (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: cherry-pick GL_APIENTRY addition back in Created 5 years, 4 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: third_party/mojo/src/mojo/public/cpp/bindings/tests/message_queue.h
diff --git a/third_party/mojo/src/mojo/public/cpp/bindings/lib/message_queue.h b/third_party/mojo/src/mojo/public/cpp/bindings/tests/message_queue.h
similarity index 61%
rename from third_party/mojo/src/mojo/public/cpp/bindings/lib/message_queue.h
rename to third_party/mojo/src/mojo/public/cpp/bindings/tests/message_queue.h
index 4e46b54a250097ddcbc3b538cd6c042c4425b9cf..c47ca99c4ca23dae960177965c026badcc8c5384 100644
--- a/third_party/mojo/src/mojo/public/cpp/bindings/lib/message_queue.h
+++ b/third_party/mojo/src/mojo/public/cpp/bindings/tests/message_queue.h
@@ -12,7 +12,7 @@
namespace mojo {
class Message;
-namespace internal {
+namespace test {
// A queue for Message objects.
class MessageQueue {
@@ -21,27 +21,23 @@ class MessageQueue {
~MessageQueue();
bool IsEmpty() const;
- Message* Peek();
- // This method transfers ownership of |message->data| and |message->handles|
- // to the message queue, resetting |message| in the process.
+ // This method copies the message data and steals ownership of its handles.
void Push(Message* message);
- // Removes the next message from the queue, transferring ownership of its
- // data and handles to the given |message|.
+ // Removes the next message from the queue, copying its data and transferring
+ // ownership of its handles to the given |message|.
void Pop(Message* message);
- // Removes the next message from the queue, discarding its data and handles.
- // This is meant to be used in conjunction with |Peek|.
+ private:
void Pop();
- private:
std::queue<Message*> queue_;
MOJO_DISALLOW_COPY_AND_ASSIGN(MessageQueue);
};
-} // namespace internal
+} // namespace test
} // namespace mojo
#endif // MOJO_PUBLIC_CPP_BINDINGS_LIB_MESSAGE_QUEUE_H_

Powered by Google App Engine
This is Rietveld 408576698