Make PrerenderTracker's resource_throttle_io_thread_map_ use RenderFrame IDs instead of RenderView …

chrome/browser/prerender/prerender_tracker.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 "chrome/browser/prerender/prerender_tracker.h"
 
 #include "base/bind.h"
 #include "base/logging.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/prerender/prerender_manager.h"
@@ skipping 54 matching lines @@
   ChildRouteIdPair child_route_id_pair(child_id, route_id);
 
   DCHECK_LT(prerender_contents->final_status(), FINAL_STATUS_MAX);
   BrowserThread::PostTask(
       BrowserThread::IO, FROM_HERE,
       base::Bind(&PrerenderTracker::RemovePrerenderOnIOThread,
                  base::Unretained(this), child_route_id_pair,
                  prerender_contents->final_status()));
 }
 
-bool PrerenderTracker::IsPrerenderingOnIOThread(int child_id,
-                                                int route_id) const {
-  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
-
-  ChildRouteIdPair child_route_id_pair(child_id, route_id);
-  return resource_throttle_io_thread_map_.count(child_route_id_pair) > 0;
-}
-
 bool PrerenderTracker::IsPendingSwapRequestOnIOThread(
     int render_process_id, int render_frame_id, const GURL& url) const {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
 
   ChildRouteIdPair render_frame_route_id_pair(
       render_process_id, render_frame_id);
   PendingSwapThrottleMap::const_iterator it =
       pending_swap_throttle_map_.find(render_frame_route_id_pair);
   return (it != pending_swap_throttle_map_.end() && it->second.url == url);
 }
@@ skipping 22 matching lines @@
       render_process_id, render_frame_id);
   PendingSwapThrottleMap::iterator it =
       pending_swap_throttle_map_.find(render_frame_route_id_pair);
   DCHECK(it != pending_swap_throttle_map_.end());
   if (it == pending_swap_throttle_map_.end())
     return;
   CHECK(!it->second.throttle);
   it->second.throttle = throttle;
 }
 
 void PrerenderTracker::AddPrerenderOnIOThread(

[tburkard, 2014/01/17 11:26:11]

Assuming you want to convert resource_throttle_io_thread_map_ to
RenderFrameID's, this would need to change, too. It would have to be called for
all RenderFrameID's, rather than just the RenderViewID.

It would also have to be re-called when a new RenderFrame gets created in a
prerendered RenderView.

     const ChildRouteIdPair& child_route_id_pair) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
-  DCHECK(!IsPrerenderingOnIOThread(child_route_id_pair.first,
-                                   child_route_id_pair.second));
 
-  resource_throttle_io_thread_map_.insert(
-      std::make_pair(child_route_id_pair, ResourceThrottleList()));
+  std::pair<ResourceThrottleMap::iterator, bool> insert_result =
+      resource_throttle_io_thread_map_.insert(
+          std::make_pair(child_route_id_pair, ResourceThrottleList()));
+  DCHECK(insert_result.second);
 }
 
 void PrerenderTracker::RemovePrerenderOnIOThread(
     const ChildRouteIdPair& child_route_id_pair,
     FinalStatus final_status) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
-  DCHECK(IsPrerenderingOnIOThread(child_route_id_pair.first,
-                                  child_route_id_pair.second));
 
   // Cancel or resume all throttled resources.
   ResourceThrottleMap::iterator resource_throttle_map_it =
       resource_throttle_io_thread_map_.find(child_route_id_pair);
   DCHECK(resource_throttle_map_it != resource_throttle_io_thread_map_.end());
   ResourceThrottleList& throttles = resource_throttle_map_it->second;
   for (size_t i = 0; i < throttles.size(); i++) {
     if (throttles[i]) {
       if (final_status == FINAL_STATUS_USED) {
         throttles[i]->Resume();
@@ skipping 58 matching lines @@
 
 PrerenderTracker::PendingSwapThrottleData::~PendingSwapThrottleData() {
 }
 
 // static
 PrerenderTracker* PrerenderTracker::GetDefault() {
   return g_browser_process->prerender_tracker();
 }
 
 }  // namespace prerender