Create a message filter for message port messages. This allows a nice cleanu...

chrome/browser/worker_host/worker_message_filter.h

Index: chrome/browser/worker_host/worker_message_filter.h
===================================================================
--- chrome/browser/worker_host/worker_message_filter.h	(revision 0)
+++ chrome/browser/worker_host/worker_message_filter.h	(revision 0)
@@ -0,0 +1,63 @@
+// Copyright (c) 2010 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.
+
+#ifndef CHROME_BROWSER_WORKER_HOST_WORKER_MESSAGE_FILTER_H_
+#define CHROME_BROWSER_WORKER_HOST_WORKER_MESSAGE_FILTER_H_
+
+#include "base/callback.h"
+#include "chrome/browser/browser_message_filter.h"
+
+class ResourceDispatcherHost;
+class URLRequestContextGetter;
+struct ViewHostMsg_CreateWorker_Params;
+
+class WorkerMessageFilter : public BrowserMessageFilter {
+ public:
+  // |next_routing_id| is owned by this object.  It can be used up until
+  // OnChannelClosing.
+  WorkerMessageFilter(
+      int render_process_id,
+      URLRequestContextGetter* request_context,
+      ResourceDispatcherHost* resource_dispatcher_host,
+      CallbackWithReturnValue<int>::Type* next_routing_id);
+
+  // BrowserMessageFilter implementation.
+  virtual void OnChannelClosing();
+  virtual bool OnMessageReceived(const IPC::Message& message,
+                                 bool* message_was_ok);
+
+  int GetNextRoutingID();
+  int render_process_id() const { return render_process_id_; }
+  ResourceDispatcherHost* resource_dispatcher_host() const {
+    return resource_dispatcher_host_;
+  }
+
+ private:
+  ~WorkerMessageFilter();
+
+  // Message handlers.
+  void OnCreateWorker(const ViewHostMsg_CreateWorker_Params& params,
+                      int* route_id);
+  void OnLookupSharedWorker(const ViewHostMsg_CreateWorker_Params& params,
+                           bool* exists,
+                           int* route_id,
+                           bool* url_error);
+  void OnCancelCreateDedicatedWorker(int route_id);
+  void OnForwardToWorker(const IPC::Message& message);
+  void OnDocumentDetached(unsigned long long document_id);
+  void OnCreateMessagePort(int* route_id, int* message_port_id);
+
+

[Andrew T Wilson (Slow), 2010/12/21 03:12:21]

nit: remove extra blank line?

[jam, 2010/12/21 07:41:51]

Done.

+  int render_process_id_;

[Andrew T Wilson (Slow), 2010/12/21 03:12:21]

I'm not clear why we are keeping around the render_process_id here - see my
other comment in worker_process_host.cc about a worker outliving its parent.

[jam, 2010/12/21 07:41:51]

I had to add this to match the old behavior where when a worker is created we
want the WorkerInstance to have the render_process_id, and also to initialize
the corresponding workerdocumentset with it.  There were a lot of comments and
TODOs in the code about how this isn't completely right for shared workers with
multiple parent processes, but I left that cleanup for another time.

+  scoped_refptr<URLRequestContextGetter> request_context_;
+  ResourceDispatcherHost* resource_dispatcher_host_;
+
+  // This is guaranteed to be valid until OnChannelClosing is closed, and it's
+  // not used after.
+  scoped_ptr<CallbackWithReturnValue<int>::Type> next_routing_id_;
+
+  DISALLOW_IMPLICIT_CONSTRUCTORS(WorkerMessageFilter);
+};
+
+#endif  // CHROME_BROWSER_WORKER_HOST_WORKER_MESSAGE_FILTER_H_
Property changes on: chrome\browser\worker_host\worker_message_filter.h
___________________________________________________________________
Added: svn:eol-style
   + LF