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

webkit/appcache/web_application_cache_host_impl.cc

 // 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.
 
 #include "webkit/appcache/web_application_cache_host_impl.h"
 
 #include "base/compiler_specific.h"
 #include "base/id_map.h"
 #include "base/lazy_instance.h"
 #include "base/string_util.h"
@@ skipping 35 matching lines @@
   return url.ReplaceComponents(replacements);
 }
 
 }  // anon namespace
 
 WebApplicationCacheHostImpl* WebApplicationCacheHostImpl::FromId(int id) {
   return g_hosts_map.Get().Lookup(id);
 }
 
 WebApplicationCacheHostImpl* WebApplicationCacheHostImpl::FromFrame(
-    WebFrame* frame) {
+    const WebFrame* frame) {
   if (!frame)
     return NULL;
   WebDataSource* data_source = frame->dataSource();
   if (!data_source)
     return NULL;
   return static_cast<WebApplicationCacheHostImpl*>
       (data_source->applicationCacheHost());
 }
 
 WebApplicationCacheHostImpl::WebApplicationCacheHostImpl(
@@ skipping 92 matching lines @@
     WebURLRequest& request, const WebFrame* frame) {
   request.setAppCacheHostID(host_id_);
 
   original_main_resource_url_ = ClearUrlRef(request.url());
 
   std::string method = request.httpMethod().utf8();
   is_get_method_ = (method == kHttpGETMethod);
   DCHECK(method == StringToUpperASCII(method));
 
   if (frame) {
-    if (WebApplicationCacheHostImpl* parent = FromFrame(frame->parent()))
-      backend_->SetSpawningHostId(host_id_, parent->host_id());
-    else if (WebApplicationCacheHostImpl* opener = FromFrame(frame->opener()))
-      backend_->SetSpawningHostId(host_id_, opener->host_id());
+    const WebFrame* spawning_frame = frame->parent();
+    if (!spawning_frame)
+      spawning_frame = frame->opener();
+    if (!spawning_frame)
+      spawning_frame = frame;
+
+    WebApplicationCacheHostImpl* spawning_host = FromFrame(spawning_frame);
+    if (spawning_host && (spawning_host != this))
+      backend_->SetSpawningHostId(host_id_, spawning_host->host_id());
   }
 }
 
 void WebApplicationCacheHostImpl::willStartSubResourceRequest(
     WebURLRequest& request) {
   request.setAppCacheHostID(host_id_);
 }
 
 void WebApplicationCacheHostImpl::selectCacheWithoutManifest() {
   if (was_select_cache_called_)
@@ skipping 126 matching lines @@
     web_resources[i].isExplicit = resource_infos[i].is_explicit;
     web_resources[i].isManifest = resource_infos[i].is_manifest;
     web_resources[i].isForeign = resource_infos[i].is_foreign;
     web_resources[i].isFallback = resource_infos[i].is_fallback;
     web_resources[i].url = resource_infos[i].url;
   }
   resources->swap(web_resources);
 }
 
 }  // appcache namespace