Revert 60378 (trying to track down http://crbug.com/56752 )- Flesh out URLLoa...

chrome/common/resource_dispatcher.cc

 // Copyright (c) 2010 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 125 matching lines @@
 #endif
 }
 
 IPCResourceLoaderBridge::~IPCResourceLoaderBridge() {
   // we remove our hook for the resource dispatcher only when going away, since
   // it doesn't keep track of whether we've force terminated the request
   if (request_id_ >= 0) {
     // this operation may fail, as the dispatcher will have preemptively
     // removed us when the renderer sends the ReceivedAllData message.
     dispatcher_->RemovePendingRequest(request_id_);
-
-    // Tell the browser process we're deleted so it can reclaim resources its
-    // holding on our behalf, like a downloaded temp file.
-    dispatcher_->message_sender()->Send(
-        new ViewHostMsg_ResourceLoaderDeleted(request_id_));
   }
 }
 
 void IPCResourceLoaderBridge::AppendDataToUpload(const char* data,
                                                  int data_len) {
   DCHECK(request_id_ == -1) << "request already started";
 
   // don't bother appending empty data segments
   if (data_len == 0)
     return;
@@ skipping 97 matching lines @@
   response->url = result.final_url;
   response->headers = result.headers;
   response->mime_type = result.mime_type;
   response->charset = result.charset;
   response->request_time = result.request_time;
   response->response_time = result.response_time;
   response->connection_id = result.connection_id;
   response->connection_reused = result.connection_reused;
   response->load_timing = result.load_timing;
   response->data.swap(result.data);
-  response->download_file_path = result.download_file_path;
 }
 
 }  // namespace webkit_glue
 
 // ResourceDispatcher ---------------------------------------------------------
 
 ResourceDispatcher::ResourceDispatcher(IPC::Message::Sender* sender)
     : message_sender_(sender),
       ALLOW_THIS_IN_INITIALIZER_LIST(method_factory_(this)) {
 }
 
 ResourceDispatcher::~ResourceDispatcher() {
 }
 
 // ResourceDispatcher implementation ------------------------------------------
 
 bool ResourceDispatcher::OnMessageReceived(const IPC::Message& message) {
   if (!IsResourceDispatcherMessage(message)) {
     return false;
   }
 
   int request_id;
 
   void* iter = NULL;
   if (!message.ReadInt(&iter, &request_id)) {
     NOTREACHED() << "malformed resource message";
     return true;
   }
 
-  PendingRequestInfo* request_info = GetPendingRequestInfo(request_id);
-  if (!request_info) {
+  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 it
+    // shouldn't be a warning...
+    DLOG(WARNING) << "Got response for a nonexistent or finished request";
     // Release resources in the message if it is a data message.
     ReleaseResourcesInDataMessage(message);
     return true;
   }
 
-  if (request_info->is_deferred) {
-    request_info->deferred_message_queue.push_back(new IPC::Message(message));
+  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));
+    if (request_info.is_deferred) {
+      request_info.deferred_message_queue.push_back(new IPC::Message(message));
       return true;
     }
   }
 
   DispatchMessage(message);
   return true;
 }
 
-ResourceDispatcher::PendingRequestInfo*
-ResourceDispatcher::GetPendingRequestInfo(int request_id) {
-  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 it
-    // shouldn't be a warning...
-    DLOG(WARNING) << "Received message for a nonexistent or finished request";
-    return NULL;
-  }
-  return &(it->second);
-}
-
 void ResourceDispatcher::OnUploadProgress(
     const IPC::Message& message, int request_id, int64 position, int64 size) {
-  PendingRequestInfo* request_info = GetPendingRequestInfo(request_id);
-  if (!request_info)
+  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
+    // it shouldn't be a warning...
+    DLOG(WARNING) << "Got upload progress for a nonexistent or "
+        "finished request";
     return;
+  }
+
+  PendingRequestInfo& request_info = it->second;
 
   RESOURCE_LOG("Dispatching upload progress for " <<
-      request_info->peer->GetURLForDebugging().possibly_invalid_spec());
-  request_info->peer->OnUploadProgress(position, size);
+      request_info.peer->GetURLForDebugging().possibly_invalid_spec());
+  request_info.peer->OnUploadProgress(position, size);
 
   // Acknowledge receipt
   message_sender()->Send(
       new ViewHostMsg_UploadProgress_ACK(message.routing_id(), request_id));
 }
 
 void ResourceDispatcher::OnReceivedResponse(
     int request_id, const ResourceResponseHead& response_head) {
-  PendingRequestInfo* request_info = GetPendingRequestInfo(request_id);
-  if (!request_info)
+  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 it
+    // shouldn't be a warning...
+    DLOG(WARNING) << "Got response for a nonexistent or finished request";
     return;
+  }
 
+  PendingRequestInfo& request_info = it->second;
   if (response_head.replace_extension_localization_templates) {
     webkit_glue::ResourceLoaderBridge::Peer* new_peer =
         ExtensionLocalizationPeer::CreateExtensionLocalizationPeer(
-            request_info->peer, message_sender(), response_head.mime_type,
-            request_info->url);
+            request_info.peer, message_sender(), response_head.mime_type,
+            request_info.url);
     if (new_peer)
-      request_info->peer = new_peer;
+      request_info.peer = new_peer;
   }
 
   RESOURCE_LOG("Dispatching response for " <<
-      request_info->peer->GetURLForDebugging().possibly_invalid_spec());
-  request_info->peer->OnReceivedResponse(response_head, false);
+      request_info.peer->GetURLForDebugging().possibly_invalid_spec());
+  request_info.peer->OnReceivedResponse(response_head, false);
 }
 
 void ResourceDispatcher::OnReceivedCachedMetadata(
       int request_id, const std::vector<char>& data) {
-  PendingRequestInfo* request_info = GetPendingRequestInfo(request_id);
-  if (!request_info)
+  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
+    // it shouldn't be a warning...
+    DLOG(WARNING) << "Got metadata for a nonexistent or finished request";
     return;
+  }
 
   if (data.size()) {
+    PendingRequestInfo& request_info = it->second;
     RESOURCE_LOG("Dispatching " << data.size() << " metadata bytes for " <<
-        request_info->peer->GetURLForDebugging().possibly_invalid_spec());
-    request_info->peer->OnReceivedCachedMetadata(&data.front(), data.size());
+        request_info.peer->GetURLForDebugging().possibly_invalid_spec());
+    request_info.peer->OnReceivedCachedMetadata(&data.front(), data.size());
   }
 }
 
 void ResourceDispatcher::OnReceivedData(const IPC::Message& message,
                                         int request_id,
                                         base::SharedMemoryHandle shm_handle,
                                         int data_len) {
   // Acknowledge the reception of this data.
   message_sender()->Send(
       new ViewHostMsg_DataReceived_ACK(message.routing_id(), request_id));
 
   const bool shm_valid = base::SharedMemory::IsHandleValid(shm_handle);
   DCHECK((shm_valid && data_len > 0) || (!shm_valid && !data_len));
   base::SharedMemory shared_mem(shm_handle, true);  // read only
 
-  PendingRequestInfo* request_info = GetPendingRequestInfo(request_id);
-  if (!request_info)
+  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
+    // it shouldn't be a warning...
+    DLOG(WARNING) << "Got data for a nonexistent or finished request";
     return;
+  }
+
+  PendingRequestInfo& request_info = it->second;
 
   if (data_len > 0 && shared_mem.Map(data_len)) {
     RESOURCE_LOG("Dispatching " << data_len << " bytes for " <<
-        request_info->peer->GetURLForDebugging().possibly_invalid_spec());
+        request_info.peer->GetURLForDebugging().possibly_invalid_spec());
     const char* data = static_cast<char*>(shared_mem.memory());
-    request_info->peer->OnReceivedData(data, data_len);
+    request_info.peer->OnReceivedData(data, data_len);
   }
 }
 
-void ResourceDispatcher::OnDownloadedData(const IPC::Message& message,
-                                          int request_id,
-                                          int data_len) {
-  // Acknowledge the reception of this message.
-  message_sender()->Send(
-      new ViewHostMsg_DataDownloaded_ACK(message.routing_id(), request_id));
-
-  PendingRequestInfo* request_info = GetPendingRequestInfo(request_id);
-  if (!request_info)
-    return;
-
-  RESOURCE_LOG("Dispatching " << data_len << " downloaded for " <<
-      request_info->peer->GetURLForDebugging().possibly_invalid_spec());
-  request_info->peer->OnDownloadedData(data_len);
-}
-
 void ResourceDispatcher::OnReceivedRedirect(
     const IPC::Message& message,
     int request_id,
     const GURL& new_url,
     const webkit_glue::ResourceLoaderBridge::ResponseInfo& info) {
-  PendingRequestInfo* request_info = GetPendingRequestInfo(request_id);
-  if (!request_info)
+  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
+    // it shouldn't be a warning...
+    DLOG(WARNING) << "Got data for a nonexistent or finished request";
     return;
+  }
 
-  RESOURCE_LOG(
-      "Dispatching redirect for " <<
-      request_info->peer->GetURLForDebugging().possibly_invalid_spec());
+  PendingRequestInfo& request_info = it->second;
+
+  RESOURCE_LOG("Dispatching redirect for " <<
+               request_info.peer->GetURLForDebugging().possibly_invalid_spec());
 
   bool has_new_first_party_for_cookies = false;
   GURL new_first_party_for_cookies;
-  if (request_info->peer->OnReceivedRedirect(new_url, info,
+  if (request_info.peer->OnReceivedRedirect(new_url, info,
                                             &has_new_first_party_for_cookies,
                                             &new_first_party_for_cookies)) {
     message_sender()->Send(
         new ViewHostMsg_FollowRedirect(message.routing_id(), request_id,
                                        has_new_first_party_for_cookies,
                                        new_first_party_for_cookies));
   } else {
     CancelPendingRequest(message.routing_id(), request_id);
   }
 }
 
 void ResourceDispatcher::OnRequestComplete(int request_id,
                                            const URLRequestStatus& status,
                                            const std::string& security_info,
                                            const base::Time& completion_time) {
-  PendingRequestInfo* request_info = GetPendingRequestInfo(request_id);
-  if (!request_info)
+  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
+    // it shouldn't be a warning...
+    DLOG(WARNING) << "Got 'complete' for a nonexistent or finished request";
     return;
+  }
 
-  webkit_glue::ResourceLoaderBridge::Peer* peer = request_info->peer;
+  PendingRequestInfo& request_info = it->second;
+  webkit_glue::ResourceLoaderBridge::Peer* peer = request_info.peer;
 
   RESOURCE_LOG("Dispatching complete for " <<
-               peer->GetURLForDebugging().possibly_invalid_spec());
+               request_info.peer->GetURLForDebugging().possibly_invalid_spec());
 
   if (status.status() == URLRequestStatus::CANCELED &&
       status.os_error() != net::ERR_ABORTED) {
     // Resource canceled with a specific error are filtered.
     SecurityFilterPeer* new_peer =
         SecurityFilterPeer::CreateSecurityFilterPeerForDeniedRequest(
-            request_info->resource_type,
-            request_info->peer,
+            request_info.resource_type,
+            request_info.peer,
             status.os_error());
     if (new_peer) {
-      request_info->peer = new_peer;
+      request_info.peer = new_peer;
       peer = new_peer;
     }
   }
 
   // The request ID will be removed from our pending list in the destructor.
   // Normally, dispatching this message causes the reference-counted request to
   // die immediately.
   peer->OnCompletedRequest(status, security_info, completion_time);
 
   webkit_glue::NotifyCacheStats();
@@ skipping 56 matching lines @@
 }
 
 void ResourceDispatcher::DispatchMessage(const IPC::Message& message) {
   IPC_BEGIN_MESSAGE_MAP(ResourceDispatcher, message)
     IPC_MESSAGE_HANDLER(ViewMsg_Resource_UploadProgress, OnUploadProgress)
     IPC_MESSAGE_HANDLER(ViewMsg_Resource_ReceivedResponse, OnReceivedResponse)
     IPC_MESSAGE_HANDLER(
         ViewMsg_Resource_ReceivedCachedMetadata, OnReceivedCachedMetadata)
     IPC_MESSAGE_HANDLER(ViewMsg_Resource_ReceivedRedirect, OnReceivedRedirect)
     IPC_MESSAGE_HANDLER(ViewMsg_Resource_DataReceived, OnReceivedData)
-    IPC_MESSAGE_HANDLER(ViewMsg_Resource_DataDownloaded, OnDownloadedData)
     IPC_MESSAGE_HANDLER(ViewMsg_Resource_RequestComplete, OnRequestComplete)
   IPC_END_MESSAGE_MAP()
 }
 
 void ResourceDispatcher::FlushDeferredMessages(int request_id) {
   PendingRequestList::iterator it = pending_requests_.find(request_id);
   if (it == pending_requests_.end())  // The request could have become invalid.
     return;
   PendingRequestInfo& request_info = it->second;
   if (request_info.is_deferred)
@@ skipping 32 matching lines @@
 }
 
 bool ResourceDispatcher::IsResourceDispatcherMessage(
     const IPC::Message& message) {
   switch (message.type()) {
     case ViewMsg_Resource_UploadProgress::ID:
     case ViewMsg_Resource_ReceivedResponse::ID:
     case ViewMsg_Resource_ReceivedCachedMetadata::ID:
     case ViewMsg_Resource_ReceivedRedirect::ID:
     case ViewMsg_Resource_DataReceived::ID:
-    case ViewMsg_Resource_DataDownloaded::ID:
     case ViewMsg_Resource_RequestComplete::ID:
       return true;
 
     default:
       break;
   }
 
   return false;
 }
 
@@ skipping 21 matching lines @@
 
 // static
 void ResourceDispatcher::ReleaseResourcesInMessageQueue(MessageQueue* queue) {
   while (!queue->empty()) {
     IPC::Message* message = queue->front();
     ReleaseResourcesInDataMessage(*message);
     queue->pop_front();
     delete message;
   }
 }