One more deferred load fix. The ResourceDispatcher on receiving a message che...

chrome/common/resource_dispatcher.cc

 // Copyright (c) 2006-2008 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.
 
 // See http://dev.chromium.org/developers/design-documents/multi-process-resource-loading
 
 #include "chrome/common/resource_dispatcher.h"
 
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
@@ skipping 268 matching lines @@
     ReleaseResourcesInDataMessage(message);
     return true;
   }
 
   PendingRequestInfo& request_info = it->second;
   if (request_info.is_deferred) {
     request_info.deferred_message_queue.push_back(new IPC::Message(message));
     return true;
   }
   // Make sure any deferred messages are dispatched before we dispatch more.
-  if (!request_info.deferred_message_queue.empty())
+  if (!request_info.deferred_message_queue.empty()) {
     FlushDeferredMessages(request_id);
+    // The request could have been deferred now. If yes then the current
+    // message has to be queued up. The request_info instance should remain
+    // valid here as there are pending messages for it.
+    DCHECK(pending_requests_.find(request_id) != pending_requests_.end());
+    if (request_info.is_deferred) {
+      request_info.deferred_message_queue.push_back(new IPC::Message(message));
+      return true;
+    }
+  }
 
   DispatchMessage(message);
   return true;
 }
 
 void ResourceDispatcher::OnUploadProgress(
     const IPC::Message& message, int request_id, int64 position, int64 size) {
   PendingRequestList::iterator it = pending_requests_.find(request_id);
   if (it == pending_requests_.end()) {
     // this might happen for kill()ed requests on the webkit end, so perhaps
@@ skipping 297 matching lines @@
   // handle or there will be a memory leak.
   if (message.type() == ViewMsg_Resource_DataReceived::ID) {
     base::SharedMemoryHandle shm_handle;
     if (IPC::ParamTraits<base::SharedMemoryHandle>::Read(&message,
                                                          &iter,
                                                          &shm_handle)) {
       base::SharedMemory::CloseHandle(shm_handle);
     }
   }
 }