Eliminate SwapOut message parameters, keeping state in RVHM instead.

content/browser/loader/resource_dispatcher_host_impl.h

 // Copyright (c) 2012 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.
 
 // This is the browser side of the resource dispatcher, it receives requests
 // from the child process (i.e. [Renderer, Plugin, Worker]ProcessHost), and
 // dispatches them to URLRequests. It then forwards the messages from the
 // URLRequests back to the correct process for handling.
 //
 // See http://dev.chromium.org/developers/design-documents/multi-process-resource-loading
@@ skipping 26 matching lines @@
 #include "content/public/browser/global_request_id.h"
 #include "content/public/browser/notification_types.h"
 #include "content/public/browser/resource_dispatcher_host.h"
 #include "ipc/ipc_message.h"
 #include "net/cookies/canonical_cookie.h"
 #include "net/url_request/url_request.h"
 #include "webkit/glue/resource_type.h"
 
 class ResourceHandler;
 struct ResourceHostMsg_Request;
-struct ViewMsg_SwapOut_Params;
 
 namespace net {
 class URLRequestJobFactory;
 }
 
 namespace webkit_blob {
 class ShareableFileReference;
 }
 
 namespace content {
@@ skipping 68 matching lines @@
   // Cancels the given request if it still exists. We ignore cancels from the
   // renderer in the event of a download.
   void CancelRequest(int child_id,
                      int request_id,
                      bool from_renderer);
 
   // Marks the request as "parked". This happens if a request is
   // redirected cross-site and needs to be resumed by a new render view.
   void MarkAsTransferredNavigation(const GlobalRequestID& id);
 
+  // Resumes the request without transferring it to a new render view.
+  void ResumeDeferredNavigation(const GlobalRequestID& id);
+
   // Returns the number of pending requests. This is designed for the unittests
   int pending_requests() const {
     return static_cast<int>(pending_loaders_.size());
   }
 
   // Intended for unit-tests only. Overrides the outstanding requests bound.
   void set_max_outstanding_requests_cost_per_process(int limit) {
     max_outstanding_requests_cost_per_process_ = limit;
   }
   void set_max_num_in_flight_requests_per_process(int limit) {
     max_num_in_flight_requests_per_process_ = limit;
   }
   void set_max_num_in_flight_requests(int limit) {
     max_num_in_flight_requests_ = limit;
   }
 
   // The average private bytes increase of the browser for each new pending
   // request. Experimentally obtained.
   static const int kAvgBytesPerOutstandingRequest = 4400;
 
   SaveFileManager* save_file_manager() const {
     return save_file_manager_.get();
   }
 
-  // Called when the unload handler for a cross-site request has finished.
-  void OnSwapOutACK(const ViewMsg_SwapOut_Params& params);
-
-  // Called when we want to simulate the renderer process sending
-  // ViewHostMsg_SwapOut_ACK in cases where the renderer has died or is
-  // unresponsive.
-  void OnSimulateSwapOutACK(const ViewMsg_SwapOut_Params& params);
-
   // Called when the renderer loads a resource from its internal cache.
   void OnDidLoadResourceFromMemoryCache(const GURL& url,
                                         const std::string& security_info,
                                         const std::string& http_method,
                                         const std::string& mime_type,
                                         ResourceType::Type resource_type);
 
   // Called when a RenderViewHost is created.
   void OnRenderViewHostCreated(int child_id, int route_id);
 
@@ skipping 107 matching lines @@
   static bool RenderViewForRequest(const net::URLRequest* request,
                                    int* render_process_host_id,
                                    int* render_view_host_id);
 
   // An init helper that runs on the IO thread.
   void OnInit();
 
   // A shutdown helper that runs on the IO thread.
   void OnShutdown();
 
-  // The real implementation of the OnSwapOutACK logic. OnSwapOutACK and
-  // OnSimulateSwapOutACK just call this method, supplying the |timed_out|
-  // parameter, which indicates whether the call is due to a timeout while
-  // waiting for SwapOut acknowledgement from the renderer process.
-  void HandleSwapOutACK(const ViewMsg_SwapOut_Params& params, bool timed_out);
-
   // Helper function for regular and download requests.
   void BeginRequestInternal(scoped_ptr<net::URLRequest> request,
                             scoped_ptr<ResourceHandler> handler);
 
   void StartLoading(ResourceRequestInfoImpl* info,
                     const linked_ptr<ResourceLoader>& loader);
 
   // We keep track of how much memory each request needs and how many requests
   // are issued by each renderer. These are known as OustandingRequestStats.
   // Memory limits apply to all requests sent to us by the renderers. There is a
@@ skipping 199 matching lines @@
   typedef std::map<GlobalRoutingID, OfflinePolicy*> OfflineMap;
 
   OfflineMap offline_policy_map_;
 
   DISALLOW_COPY_AND_ASSIGN(ResourceDispatcherHostImpl);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_BROWSER_LOADER_RESOURCE_DISPATCHER_HOST_IMPL_H_