Flush out initial [un]registerServiceWorker roundtrip

content/child/service_worker/service_worker_message_filter.cc

Index: content/child/service_worker/service_worker_message_filter.cc
diff --git a/content/child/service_worker/service_worker_message_filter.cc b/content/child/service_worker/service_worker_message_filter.cc
new file mode 100644
index 0000000000000000000000000000000000000000..b38ae5cabb55a3d951ed250486926e4248d30156
--- /dev/null
+++ b/content/child/service_worker/service_worker_message_filter.cc
@@ -0,0 +1,72 @@
+// Copyright 2013 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/child/service_worker/service_worker_message_filter.h"
+
+#include "ipc/ipc_message_macros.h"
+#include "base/bind.h"
+#include "base/message_loop/message_loop_proxy.h"
+#include "base/pickle.h"
+#include "content/child/service_worker/service_worker_dispatcher.h"
+#include "content/child/thread_safe_sender.h"
+#include "webkit/child/worker_task_runner.h"
+
+using webkit_glue::WorkerTaskRunner;
+
+namespace content {
+
+ServiceWorkerMessageFilter::ServiceWorkerMessageFilter(ThreadSafeSender* sender)
+    : main_thread_loop_proxy_(base::MessageLoopProxy::current()),
+      thread_safe_sender_(sender) {}
+
+ServiceWorkerMessageFilter::~ServiceWorkerMessageFilter() {}
+
+bool ServiceWorkerMessageFilter::OnMessageReceived(const IPC::Message& msg) {
+  if (IPC_MESSAGE_CLASS(msg) != ServiceWorkerMsgStart)
+    return false;
+  int request_id = -1;
+  bool result = PickleIterator(msg).ReadInt(&request_id);
+  DCHECK(result);
+  base::Closure closure =
+      base::Bind(&ServiceWorkerMessageFilter::DispatchMessage, this, msg);
+  int thread_id = 0;
+  {
+    base::AutoLock lock(request_id_map_lock_);
+    RequestIdToThreadId::const_iterator found =
+        request_id_map_.find(request_id);
+    if (found != request_id_map_.end()) {
+      thread_id = found->second;
+      request_id_map_.erase(found);
+    }
+  }
+  if (!thread_id) {
+    main_thread_loop_proxy_->PostTask(FROM_HERE, closure);
+    return true;
+  }
+  WorkerTaskRunner::Instance()->PostTask(thread_id, closure);
+  return true;
+}
+
+void ServiceWorkerMessageFilter::RegisterRequestID(int request_id,
+                                                   int thread_id) {
+  base::AutoLock lock(request_id_map_lock_);
+  request_id_map_[request_id] = thread_id;
+}
+
+void ServiceWorkerMessageFilter::ClearThreadRequests(int thread_id) {
+  base::AutoLock lock(request_id_map_lock_);
+  for (RequestIdToThreadId::const_iterator it = request_id_map_.begin();
+       it != request_id_map_.end();
+       ++it) {
+    if (it->second == thread_id)
+      request_id_map_.erase(it);

[kinuko, 2013/10/04 14:55:48]

This needs to be

if (...)
  erase(it++);
else
  ++it;

(if we keep this code)

+  }
+}
+
+void ServiceWorkerMessageFilter::DispatchMessage(const IPC::Message& msg) {
+  ServiceWorkerDispatcher::ThreadSpecificInstance(thread_safe_sender_.get(),
+                                                  this)->OnMessageReceived(msg);
+}
+
+}  // namespace content