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

Unified Diff: content/renderer/gpu/frame_swap_message_queue_unittest.cc

Issue 240163005: Deliver IPC messages together with SwapCompositorFrame (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: feedback + add more testing Created 6 years, 6 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: content/renderer/gpu/frame_swap_message_queue_unittest.cc
diff --git a/content/renderer/gpu/frame_swap_message_queue_unittest.cc b/content/renderer/gpu/frame_swap_message_queue_unittest.cc
new file mode 100644
index 0000000000000000000000000000000000000000..385c64533847e01135963aff67f43ba6c8ad931c
--- /dev/null
+++ b/content/renderer/gpu/frame_swap_message_queue_unittest.cc
@@ -0,0 +1,191 @@
+// Copyright 2014 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include "content/renderer/gpu/frame_swap_message_queue.h"
+#include "ipc/ipc_message.h"
+#include "testing/gtest/include/gtest/gtest.h"
+
+namespace content {
+
+class FrameSwapMessageQueueTest : public testing::Test {
+ public:
+ FrameSwapMessageQueueTest()
+ : first_message_(41, 0, IPC::Message::PRIORITY_NORMAL),
+ second_message_(42, 0, IPC::Message::PRIORITY_NORMAL),
+ third_message_(43, 0, IPC::Message::PRIORITY_NORMAL),
+ queue_(new FrameSwapMessageQueue()) {}
+
+ protected:
+ void QueueMessage(scoped_ptr<IPC::Message> msg) {
+ queue_->QueueMessage(msg.Pass());
+ }
+ void QueueMessageForFrame(int source_frame_number,
+ scoped_ptr<IPC::Message> msg) {
+ queue_->QueueMessageForFrame(source_frame_number, msg.Pass(), NULL);
+ }
+ void QueueMessageForFrame(int source_frame_number,
+ scoped_ptr<IPC::Message> msg,
+ bool* first) {
+ queue_->QueueMessageForFrame(source_frame_number, msg.Pass(), first);
+ }
+ void DrainMessages(int source_frame_number,
+ ScopedVector<IPC::Message>* messages) {
+ queue_->AdvanceToFrame(source_frame_number);
+ scoped_ptr<FrameSwapMessageQueue::SendMessageScope> send_message_scope =
+ queue_->AcquireSendMessageScope();
+ queue_->DrainMessages(messages);
+ }
+ void DrainMessages(ScopedVector<IPC::Message>* messages) {
+ scoped_ptr<FrameSwapMessageQueue::SendMessageScope> send_message_scope =
+ queue_->AcquireSendMessageScope();
+ queue_->DrainMessages(messages);
+ }
+ bool HasMessageForId(const ScopedVector<IPC::Message>& messages,
+ int routing_id) {
+ for (ScopedVector<IPC::Message>::const_iterator i = messages.begin();
+ i != messages.end();
+ ++i) {
+ if ((*i)->routing_id() == routing_id)
+ return true;
+ }
+ return false;
+ }
+ scoped_ptr<IPC::Message> CloneMessage(const IPC::Message& other) {
+ return make_scoped_ptr(new IPC::Message(other)).Pass();
+ }
+
+ IPC::Message first_message_;
+ IPC::Message second_message_;
+ IPC::Message third_message_;
+ scoped_refptr<FrameSwapMessageQueue> queue_;
+};
+
+TEST_F(FrameSwapMessageQueueTest, TestEmptyQueueDrain) {
+ ScopedVector<IPC::Message> messages;
+
+ DrainMessages(&messages);
+ ASSERT_TRUE(messages.empty());
+}
+
+TEST_F(FrameSwapMessageQueueTest, TestEmpty) {
+ ScopedVector<IPC::Message> messages;
+ ASSERT_TRUE(queue_->Empty());
+ QueueMessage(CloneMessage(first_message_));
+ ASSERT_FALSE(queue_->Empty());
+ DrainMessages(&messages);
+ ASSERT_TRUE(queue_->Empty());
+ QueueMessageForFrame(1, CloneMessage(first_message_));
+ ASSERT_FALSE(queue_->Empty());
+ queue_->AdvanceToFrame(1);
+ ASSERT_FALSE(queue_->Empty());
+}
+
+TEST_F(FrameSwapMessageQueueTest, TestQueueMessageFirst) {
+ ScopedVector<IPC::Message> messages;
+ bool first = false;
+
+ QueueMessageForFrame(1, CloneMessage(first_message_), &first);
+ ASSERT_TRUE(first);
+ QueueMessageForFrame(1, CloneMessage(second_message_), &first);
+ ASSERT_FALSE(first);
+ QueueMessageForFrame(2, CloneMessage(first_message_), &first);
+ ASSERT_TRUE(first);
+
+ DrainMessages(4, &messages);
+ QueueMessageForFrame(4, CloneMessage(first_message_), &first);
+ ASSERT_TRUE(first);
+}
+
+TEST_F(FrameSwapMessageQueueTest, TestQueuedMessageSentWithNextFrame) {
+ ScopedVector<IPC::Message> messages;
+
+ DrainMessages(1, &messages);
+ QueueMessage(CloneMessage(first_message_));
+ DrainMessages(2, &messages);
+ ASSERT_EQ(1u, messages.size());
+ ASSERT_EQ(first_message_.routing_id(), messages.front()->routing_id());
+ messages.clear();
+
+ DrainMessages(2, &messages);
+ ASSERT_TRUE(messages.empty());
+}
+
+TEST_F(FrameSwapMessageQueueTest, TestQueueMessageSentWithCurrentFrame) {
+ ScopedVector<IPC::Message> messages;
+
+ DrainMessages(1, &messages);
+ QueueMessage(CloneMessage(first_message_));
+ DrainMessages(1, &messages);
+ ASSERT_EQ(1u, messages.size());
+ ASSERT_EQ(first_message_.routing_id(), messages.front()->routing_id());
+ messages.clear();
+
+ DrainMessages(1, &messages);
+ ASSERT_TRUE(messages.empty());
+}
+
+TEST_F(FrameSwapMessageQueueTest, TestDrainsMessagesForCorrespondingFrames) {
+ ScopedVector<IPC::Message> messages;
+
+ QueueMessageForFrame(1, CloneMessage(first_message_));
+ QueueMessageForFrame(2, CloneMessage(second_message_));
+ QueueMessageForFrame(3, CloneMessage(third_message_));
+ DrainMessages(0, &messages);
+ ASSERT_TRUE(messages.empty());
+
+ DrainMessages(2, &messages);
+ ASSERT_EQ(2u, messages.size());
+ ASSERT_TRUE(HasMessageForId(messages, first_message_.routing_id()));
+ ASSERT_TRUE(HasMessageForId(messages, second_message_.routing_id()));
+ messages.clear();
+
+ DrainMessages(2, &messages);
+ ASSERT_TRUE(messages.empty());
+
+ DrainMessages(5, &messages);
+ ASSERT_EQ(1u, messages.size());
+ ASSERT_EQ(third_message_.routing_id(), messages.front()->routing_id());
+}
+
+TEST_F(FrameSwapMessageQueueTest, TestQueueMessagePreservesFifoOrdering) {
+ ScopedVector<IPC::Message> messages;
+
+ QueueMessage(CloneMessage(first_message_));
+ QueueMessage(CloneMessage(second_message_));
+ DrainMessages(1, &messages);
+ ASSERT_EQ(2u, messages.size());
+ ASSERT_EQ(first_message_.routing_id(), messages[0]->routing_id());
+ ASSERT_EQ(second_message_.routing_id(), messages[1]->routing_id());
+}
+
+class NotifiesDeletionMessage : public IPC::Message {
+ public:
+ NotifiesDeletionMessage(bool* deleted, const IPC::Message& other)
+ : IPC::Message(other), deleted_(deleted) {}
+ virtual ~NotifiesDeletionMessage() { *deleted_ = true; }
+
+ private:
+ bool* deleted_;
+};
+
+TEST_F(FrameSwapMessageQueueTest, TestDeletesMessage) {
+ bool message_deleted = false;
+ QueueMessage(make_scoped_ptr(new NotifiesDeletionMessage(&message_deleted,
+ first_message_))
+ .PassAs<IPC::Message>());
+ queue_ = NULL;
+ ASSERT_TRUE(message_deleted);
+}
+
+TEST_F(FrameSwapMessageQueueTest, TestDeletesMessageQueuedForFrame) {
+ bool message_deleted = false;
+ QueueMessageForFrame(1,
+ make_scoped_ptr(new NotifiesDeletionMessage(
+ &message_deleted, first_message_))
+ .PassAs<IPC::Message>());
+ queue_ = NULL;
+ ASSERT_TRUE(message_deleted);
+}
+
+} // namespace content

Powered by Google App Engine
This is Rietveld 408576698