diff options
author | michaeln@chromium.org <michaeln@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-01-04 19:11:14 +0000 |
---|---|---|
committer | michaeln@chromium.org <michaeln@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-01-04 19:11:14 +0000 |
commit | 8d37b18c3c8c5258fd7a94460eb613df37a3155e (patch) | |
tree | d48745f0fbbd830d7b305277517aae3747bf6810 /webkit/appcache/appcache_host.cc | |
parent | 3b467d84c402cb2bee271bda2f4babd5d60e648e (diff) | |
download | chromium_src-8d37b18c3c8c5258fd7a94460eb613df37a3155e.zip chromium_src-8d37b18c3c8c5258fd7a94460eb613df37a3155e.tar.gz chromium_src-8d37b18c3c8c5258fd7a94460eb613df37a3155e.tar.bz2 |
Fixes to address the failing appcache/remove-cache.html layout tests.
BUG=31300
TEST=yes, layout test
Review URL: http://codereview.chromium.org/524014
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@35465 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/appcache/appcache_host.cc')
-rw-r--r-- | webkit/appcache/appcache_host.cc | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/webkit/appcache/appcache_host.cc b/webkit/appcache/appcache_host.cc index 489d062..d35d61a 100644 --- a/webkit/appcache/appcache_host.cc +++ b/webkit/appcache/appcache_host.cc @@ -269,14 +269,17 @@ void AppCacheHost::FinishCacheSelection( DCHECK(cache->owning_group()); DCHECK(new_master_entry_url_.is_empty()); AssociateCache(cache); - cache->owning_group()->StartUpdateWithHost(this); - ObserveGroupBeingUpdated(cache->owning_group()); + if (!cache->owning_group()->is_obsolete()) { + cache->owning_group()->StartUpdateWithHost(this); + ObserveGroupBeingUpdated(cache->owning_group()); + } } else if (group) { // If document was loaded using HTTP GET or equivalent, and, there is a // manifest URL, and manifest URL has the same origin as document. // Invoke the application cache update process for manifest URL, with // the browsing context being navigated, and with document and the // resource from which document was loaded as the new master resourse. + DCHECK(!group->is_obsolete()); DCHECK(new_master_entry_url_.is_valid()); AssociateCache(NULL); // The UpdateJob may produce one for us later. group->StartUpdateWithNewMasterEntry(this, new_master_entry_url_); |