Fix for WKBug 47000: a failure mode given bad content (in an unlikely form). The error occurs when an html page is put in an appcache as a fallback resource (so it's listed in a fallback section), but it contains a manifest attribute that refers to a different manifest file. The system should mark the resource as foreign and exclude it from main resource loads, but it was failing to do so. The fix is to do that.

BUG=WK47000
TEST=http/tests/appcache/foreign-fallback.html


Review URL: http://codereview.chromium.org/3529009

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@64868 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 8 insertions, 0 deletions

diff --git a/webkit/appcache/appcache_host.h b/webkit/appcache/appcache_host.h
index a23be18..d3743b4 100644
--- a/webkit/appcache/appcache_host.h
+++ b/webkit/appcache/appcache_host.h
@@ -90,6 +90,10 @@ class AppCacheHost : public AppCacheStorage::Delegate,
   // Used to ensure that a loaded appcache survives a frame navigation.
   void LoadMainResourceCache(int64 cache_id);
 
+  // Used to notify the host that a fallback resource is being delivered as
+  // the main resource of the page and to provide its url.
+  void NotifyMainResourceFallback(const GURL& fallback_url);
+
   // Used to notify the host that the main resource was blocked by a policy. To
   // work properly, this method needs to by invoked prior to cache selection.
   void NotifyMainResourceBlocked(const GURL& manifest_url);
@@ -198,6 +202,10 @@ class AppCacheHost : public AppCacheStorage::Delegate,
   SwapCacheCallback* pending_swap_cache_callback_;
   void* pending_callback_param_;
 
+  // True if a fallback resource was delivered as the main resource.
+  bool main_resource_was_fallback_;
+  GURL fallback_url_;
+
   // True if requests for this host were blocked by a policy.
   bool main_resource_blocked_;
   GURL blocked_manifest_url_;