Add a cap of six in-flight requests per host to the ResourceScheduler

content/browser/loader/resource_scheduler.h

Index: content/browser/loader/resource_scheduler.h
diff --git a/content/browser/loader/resource_scheduler.h b/content/browser/loader/resource_scheduler.h
index d9711134421c71273abead5be7807bddee68940c..6bbdf784852d82a0ec082a0ac9cf3235d983cde0 100644
--- a/content/browser/loader/resource_scheduler.h
+++ b/content/browser/loader/resource_scheduler.h
@@ -18,6 +18,7 @@
 
 namespace net {
 class URLRequest;
+class HostPortPair;

[James Simonsen, 2013/11/13 01:26:23]

Alphabetize.

[oystein (OOO til 10th of July), 2013/11/14 00:19:07]

Done.

 }
 
 namespace content {
@@ -107,12 +108,21 @@ class CONTENT_EXPORT ResourceScheduler : public base::NonThreadSafe {
 
   // Returns the number of requests with priority < LOW that are currently in
   // flight.
-  size_t GetNumDelayableRequestsInFlight(Client* client) const;
+  void GetNumDelayableRequestsInFlight(Client* client,
+                                       net::HostPortPair* active_request_host,
+                                       size_t* total_delayable,
+                                       size_t* total_for_active_host) const;
+
+  enum ShouldStartReqResult {
+    kDoNotStartRequest_StopSearching = -2,

[James Simonsen, 2013/11/13 01:26:23]

Is this proper style now? net/ uses all caps for enums.

You don't seem to be taking advantage of the specific values. I'd leave them
undefined.

[oystein (OOO til 10th of July), 2013/11/14 00:19:07]

Changed; but this seems super inconsistent right now.
chrome/browser/net/referrer.cc uses the kSomeEnum case for example.

The values are to preserve the boolean semantics of ShouldStartRequest(), for
code safety.

[James Simonsen, 2013/11/14 19:22:43]

I don't have a preference. We should just follow whatever the style guide says.
I don't think it has double underscores though. Maybe throw in an _AND_?

[oystein (OOO til 10th of July), 2013/11/14 19:51:49]

Done.

+    kDoNotStartRequest_KeepSearching = -1,
+    kStartRequest = 1,
+  };
 
   // Returns true if the request should start. This is the core scheduling
   // algorithm.
-  bool ShouldStartRequest(ScheduledResourceRequest* request,
-                          Client* client) const;
+  ShouldStartReqResult ShouldStartRequest(ScheduledResourceRequest* request,
+                                          Client* client) const;
 
   // Returns the client ID for the given |child_id| and |route_id| combo.
   ClientId MakeClientId(int child_id, int route_id);