diff options
Diffstat (limited to 'chrome/common/resource_dispatcher.h')
-rw-r--r-- | chrome/common/resource_dispatcher.h | 40 |
1 files changed, 26 insertions, 14 deletions
diff --git a/chrome/common/resource_dispatcher.h b/chrome/common/resource_dispatcher.h index 2424e2d..a8a9a65 100644 --- a/chrome/common/resource_dispatcher.h +++ b/chrome/common/resource_dispatcher.h @@ -46,7 +46,7 @@ class ResourceDispatcher { ResourceType::Type resource_type, uint32 request_context /* used for plugin->browser requests */, int app_cache_context_id, - int route_id); + int routing_id); // Adds a request from the pending_requests_ list, returning the new // requests' ID @@ -57,6 +57,9 @@ class ResourceDispatcher { // request was found and removed. bool RemovePendingRequest(int request_id); + // Cancels a request in the pending_requests_ list. + void CancelPendingRequest(int routing_id, int request_id); + IPC::Message::Sender* message_sender() const { return message_sender_; } @@ -75,7 +78,8 @@ class ResourceDispatcher { : peer(peer), resource_type(resource_type), filter_policy(FilterPolicy::DONT_FILTER), - is_deferred(false) { + is_deferred(false), + is_cancelled(false) { } ~PendingRequestInfo() { } webkit_glue::ResourceLoaderBridge::Peer* peer; @@ -83,23 +87,31 @@ class ResourceDispatcher { FilterPolicy::Type filter_policy; MessageQueue deferred_message_queue; bool is_deferred; + bool is_cancelled; }; typedef base::hash_map<int, PendingRequestInfo> PendingRequestList; // Message response handlers, called by the message handler for this process. - void OnUploadProgress(const IPC::Message& message, - int request_id, - int64 position, - int64 size); + void OnUploadProgress( + const IPC::Message& message, + int request_id, + int64 position, + int64 size); void OnReceivedResponse(int request_id, const ResourceResponseHead&); - void OnReceivedRedirect(int request_id, const GURL& new_url); - void OnReceivedData(const IPC::Message& message, - int request_id, - base::SharedMemoryHandle data, - int data_len); - void OnRequestComplete(int request_id, - const URLRequestStatus& status, - const std::string& security_info); + void OnReceivedRedirect( + const IPC::Message& message, + int request_id, + const GURL& new_url, + const webkit_glue::ResourceLoaderBridge::ResponseInfo& info); + void OnReceivedData( + const IPC::Message& message, + int request_id, + base::SharedMemoryHandle data, + int data_len); + void OnRequestComplete( + int request_id, + const URLRequestStatus& status, + const std::string& security_info); // Dispatch the message to one of the message response handlers. void DispatchMessage(const IPC::Message& message); |