AppCache: Fix a bug with failing to deliver the ERROR event in some cases....

webkit/appcache/appcache_update_job.cc

 // Copyright (c) 2009 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "webkit/appcache/appcache_update_job.h"
 
 #include "base/compiler_specific.h"
 #include "base/message_loop.h"
 #include "base/string_util.h"
 #include "net/base/io_buffer.h"
 #include "net/base/load_flags.h"
 #include "webkit/appcache/appcache_group.h"
 #include "webkit/appcache/appcache_response.h"
 
 namespace appcache {
 
-static const int kBufferSize = 4096;
+static const int kBufferSize = 32768;
 static const size_t kMaxConcurrentUrlFetches = 2;
 static const int kMax503Retries = 3;
 
 // Extra info associated with requests for use during response processing.
 // This info is deleted when the URLRequest is deleted.
 class UpdateJobInfo :  public URLRequest::UserData {
  public:
   enum RequestType {
     MANIFEST_FETCH,
     URL_FETCH,
@@ skipping 699 matching lines @@
     newest_cache = group_->newest_complete_cache();
   newest_cache->set_update_time(base::TimeTicks::Now());
   service_->storage()->StoreGroupAndNewestCache(group_, newest_cache,
                                                 this);  // async
 }
 
 void AppCacheUpdateJob::OnGroupAndNewestCacheStored(AppCacheGroup* group,
                                                     AppCache* newest_cache,
                                                     bool success) {
   DCHECK(stored_state_ == STORING);
-  if (success)
+  if (success) {
     stored_state_ = STORED;
-  else
+  } else {
     internal_state_ = CACHE_FAILURE;
+
+    // Restore inprogress_cache_ to get the proper events delivered
+    // and the proper cleanup to occur.
+    if (newest_cache != group->newest_complete_cache())
+      inprogress_cache_ = newest_cache;
+  }
   MaybeCompleteUpdate();  // will definitely complete
 }
 
 void AppCacheUpdateJob::NotifySingleHost(AppCacheHost* host,
                                          EventID event_id) {
   std::vector<int> ids(1, host->host_id());
   host->frontend()->OnEventRaised(ids, event_id);
 }
 
 void AppCacheUpdateJob::NotifyAllPendingMasterHosts(EventID event_id) {
@@ skipping 509 matching lines @@
 
   // Break the connection with the group so the group cannot call delete
   // on this object after we've posted a task to delete ourselves.
   group_->SetUpdateStatus(AppCacheGroup::IDLE);
   group_ = NULL;
 
   MessageLoop::current()->DeleteSoon(FROM_HERE, this);
 }
 
 }  // namespace appcache