Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1154)

Unified Diff: content/child/resource_dispatcher.h

Issue 1561563002: Cleanup ResourceDispatcher::PendingRequestInfo (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: review fix Created 4 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | content/child/resource_dispatcher.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/child/resource_dispatcher.h
diff --git a/content/child/resource_dispatcher.h b/content/child/resource_dispatcher.h
index 5b1d867dc5fc537e4c4c699dc38a2688ab06e1df..8f1946e9217717f7d9665e473e36aeb85293da00 100644
--- a/content/child/resource_dispatcher.h
+++ b/content/child/resource_dispatcher.h
@@ -10,6 +10,7 @@
#include <stdint.h>
#include <deque>
+#include <map>
#include <string>
#include "base/containers/hash_tables.h"
@@ -141,8 +142,6 @@ class CONTENT_EXPORT ResourceDispatcher : public IPC::Listener {
typedef std::deque<IPC::Message*> MessageQueue;
struct PendingRequestInfo {
- PendingRequestInfo();
-
PendingRequestInfo(RequestPeer* peer,
ResourceType resource_type,
int origin_pid,
@@ -153,14 +152,14 @@ class CONTENT_EXPORT ResourceDispatcher : public IPC::Listener {
~PendingRequestInfo();
RequestPeer* peer;
- ThreadedDataProvider* threaded_data_provider;
+ ThreadedDataProvider* threaded_data_provider = nullptr;
ResourceType resource_type;
// The PID of the original process which issued this request. This gets
// non-zero only for a request proxied by another renderer, particularly
// requests from plugins.
int origin_pid;
MessageQueue deferred_message_queue;
- bool is_deferred;
+ bool is_deferred = false;
// Original requested url.
GURL url;
// The security origin of the frame that initiates this request.
@@ -168,26 +167,26 @@ class CONTENT_EXPORT ResourceDispatcher : public IPC::Listener {
// The url of the latest response even in case of redirection.
GURL response_url;
bool download_to_file;
- linked_ptr<IPC::Message> pending_redirect_message;
+ scoped_ptr<IPC::Message> pending_redirect_message;
base::TimeTicks request_start;
base::TimeTicks response_start;
base::TimeTicks completion_time;
linked_ptr<base::SharedMemory> buffer;
scoped_refptr<SharedMemoryReceivedDataFactory> received_data_factory;
- linked_ptr<SiteIsolationResponseMetaData> site_isolation_metadata;
+ scoped_ptr<SiteIsolationResponseMetaData> site_isolation_metadata;
int buffer_size;
// Debugging for https://code.google.com/p/chromium/issues/detail?id=527588.
- int data_offset;
+ int data_offset = -1;
};
- typedef base::hash_map<int, PendingRequestInfo> PendingRequestList;
+ using PendingRequestMap = std::map<int, scoped_ptr<PendingRequestInfo>>;
// Helper to lookup the info based on the request_id.
// May return NULL if the request as been canceled from the client side.
PendingRequestInfo* GetPendingRequestInfo(int request_id);
// Follows redirect, if any, for the given request.
- void FollowPendingRedirect(int request_id, PendingRequestInfo& request_info);
+ void FollowPendingRedirect(int request_id, PendingRequestInfo* request_info);
// Message response handlers, called by the message handler for this process.
void OnUploadProgress(int request_id, int64_t position, int64_t size);
@@ -252,7 +251,7 @@ class CONTENT_EXPORT ResourceDispatcher : public IPC::Listener {
IPC::Sender* message_sender_;
// All pending requests issued to the host
- PendingRequestList pending_requests_;
+ PendingRequestMap pending_requests_;
ResourceDispatcherDelegate* delegate_;
« no previous file with comments | « no previous file | content/child/resource_dispatcher.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698