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

Side by Side Diff: chrome/browser/prerender/prerender_link_manager.cc

Issue 10918189: Add PrerenderStatusEvent on Prerenders (Closed) Base URL: http://git.chromium.org/git/chromium.git@trunk
Patch Set: rebase to trunk, remove some unrelated fixes... Created 8 years, 1 month 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/browser/prerender/prerender_link_manager.h" 5 #include "chrome/browser/prerender/prerender_link_manager.h"
6 6
7 #include <limits> 7 #include <limits>
8 #include <queue> 8 #include <queue>
9 #include <utility> 9 #include <utility>
10 10
(...skipping 38 matching lines...) Expand 10 before | Expand all | Expand 10 after
49 << ", url = " << url.spec(); 49 << ", url = " << url.spec();
50 DVLOG(3) << "... referrer url = " << referrer.url.spec() 50 DVLOG(3) << "... referrer url = " << referrer.url.spec()
51 << ", size = (" << size.width() << ", " << size.height() << ")" 51 << ", size = (" << size.width() << ", " << size.height() << ")"
52 << ", render_view_route_id = " << render_view_route_id; 52 << ", render_view_route_id = " << render_view_route_id;
53 53
54 const ChildAndPrerenderIdPair child_and_prerender_id(child_id, prerender_id); 54 const ChildAndPrerenderIdPair child_and_prerender_id(child_id, prerender_id);
55 DCHECK_EQ(0U, ids_to_handle_map_.count(child_and_prerender_id)); 55 DCHECK_EQ(0U, ids_to_handle_map_.count(child_and_prerender_id));
56 56
57 scoped_ptr<PrerenderHandle> prerender_handle( 57 scoped_ptr<PrerenderHandle> prerender_handle(
58 manager_->AddPrerenderFromLinkRelPrerender( 58 manager_->AddPrerenderFromLinkRelPrerender(
59 child_id, render_view_route_id, url, referrer, size)); 59 child_id, prerender_id, render_view_route_id, url, referrer, size));
60 if (prerender_handle.get()) { 60 if (prerender_handle.get()) {
61 std::pair<IdPairToPrerenderHandleMap::iterator, bool> insert_result = 61 std::pair<IdPairToPrerenderHandleMap::iterator, bool> insert_result =
62 ids_to_handle_map_.insert(std::make_pair( 62 ids_to_handle_map_.insert(std::make_pair(
63 child_and_prerender_id, static_cast<PrerenderHandle*>(NULL))); 63 child_and_prerender_id, static_cast<PrerenderHandle*>(NULL)));
64 DCHECK(insert_result.second); 64 DCHECK(insert_result.second);
65 delete insert_result.first->second; 65 delete insert_result.first->second;
66 insert_result.first->second = prerender_handle.release(); 66 insert_result.first->second = prerender_handle.release();
67 return true; 67 return true;
68 } 68 }
69 return false; 69 return false;
(...skipping 58 matching lines...) Expand 10 before | Expand all | Expand 10 after
128 } 128 }
129 129
130 void PrerenderLinkManager::RemovePrerender( 130 void PrerenderLinkManager::RemovePrerender(
131 const IdPairToPrerenderHandleMap::iterator& id_to_handle_iter) { 131 const IdPairToPrerenderHandleMap::iterator& id_to_handle_iter) {
132 PrerenderHandle* prerender_handle = id_to_handle_iter->second; 132 PrerenderHandle* prerender_handle = id_to_handle_iter->second;
133 delete prerender_handle; 133 delete prerender_handle;
134 ids_to_handle_map_.erase(id_to_handle_iter); 134 ids_to_handle_map_.erase(id_to_handle_iter);
135 } 135 }
136 136
137 } // namespace prerender 137 } // namespace prerender
OLDNEW
« no previous file with comments | « chrome/browser/prerender/prerender_contents.cc ('k') | chrome/browser/prerender/prerender_manager.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698