Refactor RenderProcessHost to use IPC::Listener instead of RenderWidgetHost

content/public/browser/render_process_host.h

 // Copyright (c) 2012 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 CONTENT_PUBLIC_BROWSER_RENDER_PROCESS_HOST_H_
 #define CONTENT_PUBLIC_BROWSER_RENDER_PROCESS_HOST_H_
 
 #include "base/basictypes.h"
 #include "base/id_map.h"
 #include "base/process.h"
@@ skipping 19 matching lines @@
 
 namespace content {
 
 // Interface that represents the browser side of the browser <-> renderer
 // communication channel. There will generally be one RenderProcessHost per
 // renderer process.
 class CONTENT_EXPORT RenderProcessHost : public IPC::Sender,
                                          public IPC::Listener {
  public:
   typedef IDMap<RenderProcessHost>::iterator iterator;
-  typedef IDMap<RenderWidgetHost>::const_iterator RenderWidgetHostsIterator;
 
   // Details for RENDERER_PROCESS_CLOSED notifications.
   struct RendererClosedDetails {
     RendererClosedDetails(base::ProcessHandle handle,
                           base::TerminationStatus status,
                           int exit_code) {
       this->handle = handle;
       this->status = status;
       this->exit_code = exit_code;
     }
     base::ProcessHandle handle;
     base::TerminationStatus status;
     int exit_code;
   };
 
   virtual ~RenderProcessHost() {}
 
   // Initialize the new renderer process, returning true on success. This must
   // be called once before the object can be used, but can be called after
   // that with no effect. Therefore, if the caller isn't sure about whether
   // the process has been created, it should just call Init().
   virtual bool Init() = 0;
 
   // Gets the next available routing id.
   virtual int GetNextRoutingID() = 0;
 
+  // These methods add or remove listener for a specific message routing ID.
+  // Used for refcounting, each holder of this object must AddRoute and
+  // RemoveRoute. This object should be allocated on the heap; when no
+  // listeners own it any more, it will delete itself.
+  virtual void AddRoute(int32 routing_id, IPC::Listener* listener) = 0;
+  virtual void RemoveRoute(int32 routing_id) = 0;
+
   // Called to wait for the next UpdateRect message for the specified render
   // widget.  Returns true if successful, and the msg out-param will contain a
   // copy of the received UpdateRect message.
   virtual bool WaitForBackingStoreMsg(int render_widget_id,
                                       const base::TimeDelta& max_delay,
                                       IPC::Message* msg) = 0;
 
   // Called when a received message cannot be decoded.
   virtual void ReceivedBadMessage() = 0;
 
@@ skipping 56 matching lines @@
   virtual bool InSameStoragePartition(StoragePartition* partition) const = 0;
 
   // Returns the unique ID for this child process. This can be used later in
   // a call to FromID() to get back to this object (this is used to avoid
   // sending non-threadsafe pointers to other threads).
   //
   // This ID will be unique for all child processes, including workers, plugins,
   // etc.
   virtual int GetID() const = 0;
 
-  // Returns the render widget host for the routing id passed in.
-  virtual RenderWidgetHost* GetRenderWidgetHostByID(int routing_id) = 0;
-
   // Returns true iff channel_ has been set to non-NULL. Use this for checking
   // if there is connection or not. Virtual for mocking out for tests.
   virtual bool HasConnection() const = 0;
 
   // Call this to allow queueing of IPC messages that are sent before the
   // process is launched.
   virtual void EnableSendQueue() = 0;
 
   // Returns the renderer channel.
   virtual IPC::ChannelProxy* GetChannel() = 0;
 
-  // Returns the list of attached render widget hosts.
-  virtual RenderWidgetHostsIterator GetRenderWidgetHostsIterator() = 0;
-
   // Try to shutdown the associated render process as fast as possible
   virtual bool FastShutdownForPageCount(size_t count) = 0;
 
   // TODO(ananta)
   // Revisit whether the virtual functions declared from here on need to be
   // part of the interface.
   virtual void SetIgnoreInputEvents(bool ignore_input_events) = 0;
   virtual bool IgnoreInputEvents() const = 0;
 
-  // Used for refcounting, each holder of this object must Attach and Release
-  // just like it would for a COM object. This object should be allocated on
-  // the heap; when no listeners own it any more, it will delete itself.
-  virtual void Attach(content::RenderWidgetHost* host, int routing_id) = 0;
-
-  // See Attach()
-  virtual void Release(int routing_id) = 0;
-
   // Schedules the host for deletion and removes it from the all_hosts list.
   virtual void Cleanup() = 0;
 
   // Track the count of pending views that are being swapped back in.  Called
   // by listeners to register and unregister pending views to prevent the
   // process from exiting.
   virtual void AddPendingView() = 0;
   virtual void RemovePendingView() = 0;
 
   // Sets a flag indicating that the process can be abnormally terminated.
@@ skipping 67 matching lines @@
   static void SetMaxRendererProcessCount(size_t count);
 
   // Returns the current max number of renderer processes used by the content
   // module.
   static size_t GetMaxRendererProcessCount();
 };
 
 }  // namespace content.
 
 #endif  // CONTENT_PUBLIC_BROWSER_RENDER_PROCESS_HOST_H_