diff options
| author | gavinp@chromium.org <gavinp@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-12-18 02:23:52 +0000 |
|---|---|---|
| committer | gavinp@chromium.org <gavinp@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-12-18 02:23:52 +0000 |
| commit | 762c724a9bcf0c3d20d63dd1b6d17e4b9d2b68c0 (patch) | |
| tree | 5b08b4e0a35424eb7bf0fda722b9cf8b10d1d03f /chrome/browser/prerender/prerender_link_manager.cc | |
| parent | bb2b60ac4a5cc1ebde77d71f9022a32e04286d83 (diff) | |
| download | chromium_src-762c724a9bcf0c3d20d63dd1b6d17e4b9d2b68c0.zip chromium_src-762c724a9bcf0c3d20d63dd1b6d17e4b9d2b68c0.tar.gz chromium_src-762c724a9bcf0c3d20d63dd1b6d17e4b9d2b68c0.tar.bz2 | |
Add Start/Stop event signalling on Prerenders.
We've switched to our new event names, we've made sure that the PrerenderHandle and the PrerenderLinkManager are connected, and now, we pass these events into WebKit.
This change depends on the WebKit changes in https://bugs.webkit.org/show_bug.cgi?id=96474 landing first. As well, this CL depends on the earlier work in https://chromiumcodereview.appspot.com/11316311/ , which makes the PrerenderHandle an observer of the PrerenderContents, being landed first. As well, since this code depends on WebPrerender.h changing, it actually needs to be staged carefully between WebKit & Chrome. Careful readers will also observe that this change obsoletes https://chromiumcodereview.appspot.com/10918189/ .
R=mmenke@chromium.org
BUG=None
Review URL: https://chromiumcodereview.appspot.com/11459003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@173625 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/prerender/prerender_link_manager.cc')
| -rw-r--r-- | chrome/browser/prerender/prerender_link_manager.cc | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/chrome/browser/prerender/prerender_link_manager.cc b/chrome/browser/prerender/prerender_link_manager.cc index ea45012..da68f89 100644 --- a/chrome/browser/prerender/prerender_link_manager.cc +++ b/chrome/browser/prerender/prerender_link_manager.cc @@ -98,7 +98,9 @@ void PrerenderLinkManager::OnCancelPrerender(int child_id, int prerender_id) { DVLOG(5) << "... canceling a prerender that doesn't exist."; return; } - PrerenderHandle* prerender_handle = id_to_handle_iter->second; + + scoped_ptr<PrerenderHandle> prerender_handle(id_to_handle_iter->second); + ids_to_handle_map_.erase(id_to_handle_iter); prerender_handle->OnCancel(); // Because OnCancel() can remove the prerender from the map, we need to |