summaryrefslogtreecommitdiffstats
path: root/webkit/appcache/appcache_group.cc
diff options
context:
space:
mode:
authormichaeln@chromium.org <michaeln@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-01-04 19:11:14 +0000
committermichaeln@chromium.org <michaeln@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-01-04 19:11:14 +0000
commit8d37b18c3c8c5258fd7a94460eb613df37a3155e (patch)
treed48745f0fbbd830d7b305277517aae3747bf6810 /webkit/appcache/appcache_group.cc
parent3b467d84c402cb2bee271bda2f4babd5d60e648e (diff)
downloadchromium_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_group.cc')
-rw-r--r--webkit/appcache/appcache_group.cc6
1 files changed, 4 insertions, 2 deletions
diff --git a/webkit/appcache/appcache_group.cc b/webkit/appcache/appcache_group.cc
index a9ad808..e5511a6 100644
--- a/webkit/appcache/appcache_group.cc
+++ b/webkit/appcache/appcache_group.cc
@@ -171,7 +171,9 @@ void AppCacheGroup::RunQueuedUpdates() {
queued_observers_.RemoveObserver(host);
observers_.AddObserver(host);
}
- StartUpdateWithNewMasterEntry(host, it->second);
+
+ if (!is_obsolete())
+ StartUpdateWithNewMasterEntry(host, it->second);
}
}
@@ -189,7 +191,7 @@ bool AppCacheGroup::FindObserver(UpdateObserver* find_me,
void AppCacheGroup::ScheduleUpdateRestart(int delay_ms) {
DCHECK(!restart_update_task_);
restart_update_task_ =
- NewRunnableMethod(this, &AppCacheGroup::RunQueuedUpdates);
+ NewRunnableMethod(this, &AppCacheGroup::RunQueuedUpdates);
MessageLoop::current()->PostDelayedTask(FROM_HERE, restart_update_task_,
delay_ms);
}