Select a more appropiate appcache based on the opener or the parent of the new document.

webkit/appcache/appcache_host.h

Index: webkit/appcache/appcache_host.h
===================================================================
--- webkit/appcache/appcache_host.h	(revision 81647)
+++ webkit/appcache/appcache_host.h	(working copy)
@@ -71,6 +71,18 @@
   void SwapCacheWithCallback(SwapCacheCallback* callback,
                              void* callback_param);
 
+  // Called prior to the main resource load. When the system contains multiple
+  // candidates for a main resource load, the appcache preferred by the host
+  // that created this host is used to break ties.
+  void SetSpawningHostId(int spawning_process_id, int spawning_host_id);
+  const AppCacheHost* GetSpawningHost() const;

[adamk, 2011/04/15 17:20:51]

Please add a comment to this method explaining under what conditions it might
return NULL.

[michaeln, 2011/04/15 19:33:34]

Done.

  // Called prior to the main resource load. When the system contains multiple
  // candidates for a main resource load, the appcache preferred by the host
  // that created this host is used to break ties.
  void SetSpawningHostId(int spawning_process_id, int spawning_host_id);

  // May return NULL if the spawning host context has been closed, or if a
  // spawning host context was never identified.
  const AppCacheHost* GetSpawningHost() const;

+  const GURL& preferred_manifest_url() const {
+    return preferred_manifest_url_;
+  }
+  void set_preferred_manifest_url(const GURL& url) {
+    preferred_manifest_url_ = url;
+  }
+
   // Support for loading resources out of the appcache.
   // May return NULL if the request isn't subject to retrieval from an appache.
   AppCacheRequestHandler* CreateRequestHandler(
@@ -149,6 +161,13 @@
   // Identifies the corresponding appcache host in the child process.
   int host_id_;
 
+  // Information about the host that created this one; the manifest
+  // preferred by our creator influences which cache our main resource
+  // should be loaded from.
+  int spawning_host_id_;
+  int spawning_process_id_;
+  GURL preferred_manifest_url_;
+
   // Hosts for dedicated workers are special cased to shunt
   // request handling off to the dedicated worker's parent.
   // The scriptable api is not accessible in dedicated workers