Deliver IPC messages together with SwapCompositorFrame

content/renderer/gpu/frame_swap_message_queue.cc

Index: content/renderer/gpu/frame_swap_message_queue.cc
diff --git a/content/renderer/gpu/frame_swap_message_queue.cc b/content/renderer/gpu/frame_swap_message_queue.cc
new file mode 100644
index 0000000000000000000000000000000000000000..1fb8a5fa94ad7b3948d694422a20004568aa7c57
--- /dev/null
+++ b/content/renderer/gpu/frame_swap_message_queue.cc
@@ -0,0 +1,70 @@
+// 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 <limits>
+
+#include "base/logging.h"
+#include "ipc/ipc_message.h"
+
+using std::vector;
+
+namespace content {
+
+FrameSwapMessageQueue::FrameSwapMessageQueue()
+    : highest_swapped_source_frame_number_(std::numeric_limits<int>::min()) {
+}
+
+FrameSwapMessageQueue::~FrameSwapMessageQueue() {

[piman, 2014/05/20 19:54:05]

There may be still messages in the map here. Delete them?
Alternatively, use a linked_ptr in the map.

[mkosiba (inactive), 2014/05/22 17:40:24]

Done.

+}
+
+void FrameSwapMessageQueue::QueueMessage(IPC::Message* msg) {
+  base::AutoLock lock(lock_);
+
+  queued_messages_[highest_swapped_source_frame_number_].push_back(msg);
+}
+
+bool FrameSwapMessageQueue::TryQueueMessage(int source_frame_number,
+                                            IPC::Message* msg) {
+  base::AutoLock lock(lock_);
+
+  if (highest_swapped_source_frame_number_ >= source_frame_number)
+    return false;
+
+  queued_messages_[source_frame_number].push_back(msg);
+  return true;
+}
+
+scoped_ptr<base::AutoLock> FrameSwapMessageQueue::DrainMessages(
+    int source_frame_number,
+    vector<IPC::Message>* messages) {
+  scoped_ptr<base::AutoLock> lock(new base::AutoLock(lock_));
+
+  DCHECK(highest_swapped_source_frame_number_ <= source_frame_number);
+  highest_swapped_source_frame_number_ = source_frame_number;
+
+  for (FrameQueueMap::iterator i = queued_messages_.begin();
+       i != queued_messages_.upper_bound(source_frame_number);

[piman, 2014/05/20 19:54:05]

You likely want to extract the upper_bound out of the loop since it's O(log n).

[mkosiba (inactive), 2014/05/22 17:40:24]

Done.

[mkosiba (inactive), 2014/05/22 17:40:24]

Done.

+       i++) {
+    DCHECK(i->first <= source_frame_number);
+    TransferMessages(i->second, messages);
+  }
+
+  return lock.Pass();
+}
+
+// static
+void FrameSwapMessageQueue::TransferMessages(std::vector<IPC::Message*>& source,
+                                             std::vector<IPC::Message>* dest) {
+  for (vector<IPC::Message*>::iterator i = source.begin(); i != source.end();
+       ++i) {
+    IPC::Message* m(*i);
+    dest->push_back(*m);
+    delete m;
+  }
+  source.clear();
+}
+
+}  // namespace content