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

webkit/appcache/appcache_host.h

 // Copyright (c) 2011 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 WEBKIT_APPCACHE_APPCACHE_HOST_H_
 #define WEBKIT_APPCACHE_APPCACHE_HOST_H_
 
 #include "base/callback.h"
 #include "base/gtest_prod_util.h"
 #include "base/memory/ref_counted.h"
@@ skipping 53 matching lines @@
   void SelectCacheForSharedWorker(int64 appcache_id);
   void MarkAsForeignEntry(const GURL& document_url,
                           int64 cache_document_was_loaded_from);
   void GetStatusWithCallback(GetStatusCallback* callback,
                              void* callback_param);
   void StartUpdateWithCallback(StartUpdateCallback* callback,
                                void* callback_param);
   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(
       net::URLRequest* request, ResourceType::Type resource_type);
 
   // Support for devtools inspecting appcache resources.
   void GetResourceList(std::vector<AppCacheResourceInfo>* resource_infos);
 
   // Establishes an association between this host and a cache. 'cache' may be
   // NULL to break any existing association. Associations are established
@@ skipping 58 matching lines @@
     return parent_host_id_ != kNoHostId;
   }
 
   // Returns the parent context's host instance. This is only valid
   // to call when this instance is_for_dedicated_worker.
   AppCacheHost* GetParentAppCacheHost() const;
 
   // 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
   // so the other aspects of this class are not relevant for
   // these special case instances.
   int parent_host_id_;
   int parent_process_id_;
 
   // The cache associated with this host, if any.
   scoped_refptr<AppCache> associated_cache_;
@@ skipping 69 matching lines @@
   FRIEND_TEST_ALL_PREFIXES(AppCacheHostTest, SetSwappableCache);
   FRIEND_TEST_ALL_PREFIXES(AppCacheHostTest, ForDedicatedWorker);
   FRIEND_TEST_ALL_PREFIXES(AppCacheGroupTest, QueueUpdate);
 
   DISALLOW_COPY_AND_ASSIGN(AppCacheHost);
 };
 
 }  // namespace appcache
 
 #endif  // WEBKIT_APPCACHE_APPCACHE_HOST_H_