diff options
| author | jennb@chromium.org <jennb@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-10-06 22:55:17 +0000 |
|---|---|---|
| committer | jennb@chromium.org <jennb@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-10-06 22:55:17 +0000 |
| commit | b257dcb9d1850f39554dfc722e7f40474adb6a84 (patch) | |
| tree | 5bbea6e11a00752586050bafa3f313aba1e5291e /webkit/appcache/appcache.h | |
| parent | 2540d9ad9481d50512ff6b5075d163ffb1516db0 (diff) | |
| download | chromium_src-b257dcb9d1850f39554dfc722e7f40474adb6a84.zip chromium_src-b257dcb9d1850f39554dfc722e7f40474adb6a84.tar.gz chromium_src-b257dcb9d1850f39554dfc722e7f40474adb6a84.tar.bz2 | |
Re-enabling disabled appcache update unittests. Change comparison of cache update time. Change manifest-fb-404 entry ordering so all 3 requests always happen regardless of which order the url requests complete in.
TEST=none
BUG=none
Review URL: http://codereview.chromium.org/257065
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@28174 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/appcache/appcache.h')
| -rw-r--r-- | webkit/appcache/appcache.h | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/webkit/appcache/appcache.h b/webkit/appcache/appcache.h index 08fdd1b..c80cafd 100644 --- a/webkit/appcache/appcache.h +++ b/webkit/appcache/appcache.h @@ -60,7 +60,14 @@ class AppCache : public base::RefCounted<AppCache> { } bool IsNewerThan(AppCache* cache) const { - return update_time_ > cache->update_time_; + if (update_time_ > cache->update_time_) + return true; + + // Tie breaker. Newer caches have a larger cache ID. + if (update_time_ == cache->update_time_) + return cache_id_ > cache->cache_id_; + + return false; } void set_update_time(base::TimeTicks ticks) { |