Make ResourceScheduler work in OOPIF

content/browser/loader/resource_scheduler.cc

 // 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.
 
 #include "content/browser/loader/resource_scheduler.h"
 
 #include <stdint.h>
 #include <set>
 #include <string>
 #include <utility>
@@ skipping 403 matching lines @@
   void OnLoadingStateChanged(bool is_loaded) {
     is_loaded_ = is_loaded;
   }
 
   void OnNavigate() {
     has_html_body_ = false;
     is_loaded_ = false;
   }
 
   void OnWillInsertBody() {
+    // Can be called multiple times per RVH in the case of OOPIFs.

[nasko, 2017/01/31 15:50:34]

nit: Let's not use the abbreviation OOPIF, as not everyone is familiar with it.

[Charlie Harrison, 2017/01/31 20:19:31]

Done.

+    if (has_html_body_)
+      return;
     has_html_body_ = true;
     LoadAnyStartablePendingRequests(RequestStartTrigger::BODY_REACHED);
   }
 
   void OnReceivedSpdyProxiedHttpResponse() {
     if (!using_spdy_proxy_) {
       using_spdy_proxy_ = true;
       LoadAnyStartablePendingRequests(RequestStartTrigger::SPDY_PROXY_DETECTED);
     }
   }
@@ skipping 526 matching lines @@
   client->ReprioritizeRequest(scheduled_resource_request, old_priority_params,
                               new_priority_params);
 }
 
 ResourceScheduler::ClientId ResourceScheduler::MakeClientId(
     int child_id, int route_id) {
   return (static_cast<ResourceScheduler::ClientId>(child_id) << 32) | route_id;
 }
 
 }  // namespace content