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

Unified Diff: net/socket/client_socket_pool_base.cc

Issue 10185007: [net] Change order of RequestPriority to natural: higher > lower (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebased. Responded to review Created 8 years, 8 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
Index: net/socket/client_socket_pool_base.cc
diff --git a/net/socket/client_socket_pool_base.cc b/net/socket/client_socket_pool_base.cc
index ab959cf06e2dde5c6c2d59f2f6526a53968a99a5..521436f35bb568bc94692f03379f593bbcdc9f2a 100644
--- a/net/socket/client_socket_pool_base.cc
+++ b/net/socket/client_socket_pool_base.cc
@@ -222,7 +222,7 @@ ClientSocketPoolBaseHelper::CallbackResultPair::~CallbackResultPair() {}
void ClientSocketPoolBaseHelper::InsertRequestIntoQueue(
const Request* r, RequestQueue* pending_requests) {
RequestQueue::iterator it = pending_requests->begin();
- while (it != pending_requests->end() && r->priority() >= (*it)->priority())
+ while (it != pending_requests->end() && r->priority() <= (*it)->priority())
++it;
pending_requests->insert(it, r);
}
@@ -332,7 +332,6 @@ void ClientSocketPoolBaseHelper::RequestSockets(
int ClientSocketPoolBaseHelper::RequestSocketInternal(
const std::string& group_name,
const Request* request) {
- DCHECK_GE(request->priority(), 0);
ClientSocketHandle* const handle = request->handle();
const bool preconnecting = !handle;
Group* group = GetOrCreateGroup(group_name);
@@ -834,7 +833,7 @@ bool ClientSocketPoolBaseHelper::FindTopStalledGroup(
return true;
has_stalled_group = true;
bool has_higher_priority = !top_group ||
- curr_group->TopPendingPriority() < top_group->TopPendingPriority();
+ curr_group->TopPendingPriority() > top_group->TopPendingPriority();
if (has_higher_priority) {
top_group = curr_group;
top_group_name = &i->first;

Powered by Google App Engine
This is Rietveld 408576698