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, 3 insertions, 12 deletions

diff --git a/webkit/appcache/appcache_service.h b/webkit/appcache/appcache_service.h
index ebd8fb7..4e68341 100644
--- a/webkit/appcache/appcache_service.h
+++ b/webkit/appcache/appcache_service.h
@@ -104,22 +104,13 @@ class AppCacheService {
   class GetInfoHelper;
 
   typedef std::set<AsyncHelper*> PendingAsyncHelpers;
+  typedef std::map<int, AppCacheBackendImpl*> BackendMap;
 
   AppCachePolicy* appcache_policy_;
-
-  // Deals with persistence.
   scoped_ptr<AppCacheStorage> storage_;
-
   PendingAsyncHelpers pending_helpers_;
-
-  // Track current processes.  One 'backend' per child process.
-  typedef std::map<int, AppCacheBackendImpl*> BackendMap;
-  BackendMap backends_;
-
-  // Context for use during cache updates.
-  URLRequestContext* request_context_;
-
-  // TODO(jennb): service state: e.g. reached quota?
+  BackendMap backends_;  // One 'backend' per child process.
+  URLRequestContext* request_context_;  // Context for use during cache updates.
 
   DISALLOW_COPY_AND_ASSIGN(AppCacheService);
 };