Handle interface to prerenders.

chrome/browser/prerender/prerender_link_manager.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_link_manager.h"
 
 #include <limits>
 #include <queue>
 #include <utility>
 
@@ skipping 32 matching lines @@
   DVLOG(3) << "... referrer url = " << referrer.url.spec()
            << ", size = (" << size.width() << ", " << size.height() << ")"
            << ", render_view_route_id = " << render_view_route_id;
 
   // TODO(gavinp): Add tests to ensure fragments work, then remove this fragment
   // clearing code.
   url_canon::Replacements<char> replacements;
   replacements.ClearRef();
   const GURL url = orig_url.ReplaceComponents(replacements);
 
-  if (!manager_->AddPrerenderFromLinkRelPrerender(
-          child_id, render_view_route_id, url, referrer, size)) {
+  PrerenderHandle prerender = manager_->AddPrerenderFromLinkRelPrerender(

[dominich, 2012/06/18 15:32:44]

the addition of this doesn't seem to have changed anything in the rest of this
file. is it mean to have cleaned something up?

[gavinp, 2012/06/18 16:40:48]

No. It's meant to prepare prerendermanager to have multiple prerenders. sa well,
the observer interface on prerender hadnles (in the next upload) will be how
events go to the elements in webkit, so we get ready for that too.

+      child_id, render_view_route_id, url, referrer, size);
+  if (!prerender)

[dominich, 2012/06/18 15:32:44]

i'm not comfortable with this implicit cast to boolean. if !prerender.is_valid()
is clearer.

[gavinp, 2012/06/18 16:40:48]

Already fixed.

     return false;
-  }
+  DVLOG(4) << "... prerender initial ref count = " << prerender->ref_count_;
+
   const ChildAndPrerenderIdPair child_and_prerender_id(child_id, prerender_id);
-  DCHECK_EQ(0U, ids_to_url_map_.count(child_and_prerender_id));
-  ids_to_url_map_.insert(std::make_pair(child_and_prerender_id, url));
+  DCHECK_EQ(0U, ids_to_prerender_map_.count(child_and_prerender_id));
+  ids_to_prerender_map_.insert(
+      std::make_pair(child_and_prerender_id, prerender));
+  DVLOG(4) << "... prerender onexit ref count = " << prerender->ref_count_;
   return true;
 }
 
 // TODO(gavinp): Once an observer interface is provided down to the WebKit
-// layer, we should add DCHECK_NE(0L, ids_to_url_map_.count(...)) to both
+// layer, we should add DCHECK_NE(0L, ids_to_prerender_map_.count(...)) to both
 // OnCancelPrerender and OnAbandonPrerender. We can't do this now, since
 // the WebKit layer isn't even aware if we didn't add the prerender to the map
 // in OnAddPrerender above.
 void PrerenderLinkManager::OnCancelPrerender(int child_id, int prerender_id) {
   DVLOG(2) << "OnCancelPrerender, child_id = " << child_id
            << ", prerender_id = " << prerender_id;
+  DVLOG(4) << "... initial map size = " << ids_to_prerender_map_.size();
   const ChildAndPrerenderIdPair child_and_prerender_id(child_id, prerender_id);
-  IdPairToUrlMap::iterator id_url_iter =
-      ids_to_url_map_.find(child_and_prerender_id);
-  if (id_url_iter == ids_to_url_map_.end()) {
-    DVLOG(5) << "... canceling a prerender that doesn't exist.";
-    return;
+
+  IdPairToPrerenderMap::iterator it = ids_to_prerender_map_.find(child_and_prerender_id);
+  if (it != ids_to_prerender_map_.end()) {
+    DVLOG(5) << "ref count = " << it->second->ref_count_;
   }
-  const GURL url = id_url_iter->second;
-  ids_to_url_map_.erase(id_url_iter);
-  manager_->MaybeCancelPrerender(url);
+
+  ids_to_prerender_map_.erase(child_and_prerender_id);
+  DVLOG(4) << "... final map size = " << ids_to_prerender_map_.size();
+  
 }
 
 void PrerenderLinkManager::OnAbandonPrerender(int child_id, int prerender_id) {
   DVLOG(2) << "OnAbandonPrerender, child_id = " << child_id
            << ", prerender_id = " << prerender_id;
   // TODO(gavinp,cbentzel): Implement reasonable behaviour for
   // navigation away from launcher.
-  const ChildAndPrerenderIdPair child_and_prerender_id(child_id, prerender_id);
-  ids_to_url_map_.erase(child_and_prerender_id);
+
+  //  const ChildAndPrerenderIdPair child_and_prerender_id(child_id, prerender_id);
+  // XYZZY: WHOAH NELLY
+  //ids_to_prerender_map_.erase(child_and_prerender_id);
 }
 
 void PrerenderLinkManager::OnChannelClosing(int child_id) {
   DVLOG(2) << "OnChannelClosing, child id = " << child_id;
   const ChildAndPrerenderIdPair child_and_minimum_prerender_id(
       child_id, std::numeric_limits<int>::min());
   const ChildAndPrerenderIdPair child_and_maximum_prerender_id(
       child_id, std::numeric_limits<int>::max());
   std::queue<int> prerender_ids_to_abandon;
-  for (IdPairToUrlMap::iterator
-           i = ids_to_url_map_.lower_bound(child_and_minimum_prerender_id),
-           e = ids_to_url_map_.upper_bound(child_and_maximum_prerender_id);
+  for (IdPairToPrerenderMap::iterator
+           i = ids_to_prerender_map_.lower_bound(child_and_minimum_prerender_id),
+           e = ids_to_prerender_map_.upper_bound(child_and_maximum_prerender_id);
        i != e; ++i) {
     prerender_ids_to_abandon.push(i->first.second);
   }
   while (!prerender_ids_to_abandon.empty()) {
     DVLOG(4) << "---> abandon prerender_id = "
              << prerender_ids_to_abandon.front();
     OnAbandonPrerender(child_id, prerender_ids_to_abandon.front());
     prerender_ids_to_abandon.pop();
   }
 }
 
 bool PrerenderLinkManager::IsEmpty() const {
-  return ids_to_url_map_.empty();
+  return ids_to_prerender_map_.empty();
 }
 
 }  // namespace prerender