Stop using renderer specific host ids in ResourceDispatcher. This allows it ...

chrome/browser/tab_contents/site_instance.h

 // Copyright (c) 2006-2008 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_TAB_CONTENTS_SITE_INSTANCE_H_
 #define CHROME_BROWSER_TAB_CONTENTS_SITE_INSTANCE_H_
 
 #include "chrome/browser/browsing_instance.h"
 #include "chrome/browser/renderer_host/render_process_host.h"
+#include "chrome/common/notification_observer.h"
 #include "googleurl/src/gurl.h"
 
 ///////////////////////////////////////////////////////////////////////////////
 //
 // SiteInstance class
 //
 // A SiteInstance is a data structure that is associated with all pages in a
 // given instance of a web site.  Here, a web site is identified by its
 // registered domain name and scheme.  An instance includes all pages
 // that are connected (i.e., either a user or a script navigated from one
@@ skipping 16 matching lines @@
 // dedicated to each site.
 //
 // Each NavigationEntry for a WebContents points to the SiteInstance that
 // rendered it.  Each RenderViewHost also points to the SiteInstance that it is
 // associated with.  A SiteInstance keeps track of the number of these
 // references and deletes itself when the count goes to zero.  This means that
 // a SiteInstance is only live as long as it is accessible, either from new
 // tabs with no NavigationEntries or in NavigationEntries in the history.
 //
 ///////////////////////////////////////////////////////////////////////////////
-class SiteInstance : public base::RefCounted<SiteInstance> {
+class SiteInstance : public base::RefCounted<SiteInstance>,
+                     public NotificationObserver {
  public:
   // Virtual to allow tests to extend it.
   virtual ~SiteInstance();
 
   // Get the BrowsingInstance to which this SiteInstance belongs.
   BrowsingInstance* browsing_instance() { return browsing_instance_; }
 
   // Sets the factory used to create new RenderProcessHosts. This will also be
   // passed on to SiteInstances spawned by this one.
   //
   // The factory must outlive the SiteInstance; ownership is not transferred. It
   // may be NULL, in which case the default BrowserRenderProcessHost will be
   // created (this is the behavior if you don't call this function).
   void set_render_process_host_factory(RenderProcessHostFactory* rph_factory) {
     render_process_host_factory_ = rph_factory;
   }
 
-  // Set / Get the host ID for this SiteInstance's current RenderProcessHost.
-  void set_process_host_id(int process_host_id) {
-    process_host_id_ = process_host_id;
-  }
-  int process_host_id() const { return process_host_id_; }
-
   // Update / Get the max page ID for this SiteInstance.
   void UpdateMaxPageID(int32 page_id) {
     if (page_id > max_page_id_)
       max_page_id_ = page_id;
   }
   int32 max_page_id() const { return max_page_id_; }
 
   // Returns the current process being used to render pages in this
   // SiteInstance.  If the process has crashed or otherwise gone away, then
   // this method will create a new process and update our host ID accordingly.
@@ skipping 46 matching lines @@
   // (e.g., docs.google.com and mail.google.com have DOM access to each other
   // if they both set their document.domain properties to google.com.)
   static bool IsSameWebSite(const GURL& url1, const GURL& url2);
 
  protected:
   friend class BrowsingInstance;
 
   // Create a new SiteInstance.  Protected to give access to BrowsingInstance
   // and tests; most callers should use CreateSiteInstance or
   // GetRelatedSiteInstance instead.
-  SiteInstance(BrowsingInstance* browsing_instance)
-      : browsing_instance_(browsing_instance),
-        render_process_host_factory_(NULL),
-        process_host_id_(-1),
-        max_page_id_(-1),
-        has_site_(false) {
-    DCHECK(browsing_instance);
-  }
+  SiteInstance(BrowsingInstance* browsing_instance);
 
  private:
+  // NotificationObserver implementation.
+  void Observe(NotificationType type,
+               const NotificationSource& source,
+               const NotificationDetails& details);
+
   // BrowsingInstance to which this SiteInstance belongs.
   scoped_refptr<BrowsingInstance> browsing_instance_;
 
   // Factory for new RenderProcessHosts, not owned by this class. NULL indiactes
   // that the default BrowserRenderProcessHost should be created.
   const RenderProcessHostFactory* render_process_host_factory_;
 
-  // Current host ID for the RenderProcessHost that is rendering pages for this
-  // SiteInstance.  If the rendering process dies, this host ID can be
-  // replaced when a new process is created, without losing the association
-  // between all pages in this SiteInstance.
-  int process_host_id_;
+  // Current RenderProcessHost that is rendering pages for this SiteInstance.
+  RenderProcessHost* process_;
 
   // The current max_page_id in the SiteInstance's RenderProcessHost.  If the
   // rendering process dies, its replacement should start issuing page IDs that
   // are larger than this value.
   int32 max_page_id_;
 
   // The web site that this SiteInstance is rendering pages for.
   GURL site_;
 
   // Whether SetSite has been called.
   bool has_site_;
 
   DISALLOW_EVIL_CONSTRUCTORS(SiteInstance);
 };
 
 #endif  // CHROME_BROWSER_TAB_CONTENTS_SITE_INSTANCE_H_