diff options
| author | gavinp@chromium.org <gavinp@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-10-17 16:01:01 +0000 |
|---|---|---|
| committer | gavinp@chromium.org <gavinp@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-10-17 16:01:01 +0000 |
| commit | 3a6ec768208d2d056aa971e7e4bdc5305343db7b (patch) | |
| tree | a51407c067b25d50a1c6fd7cd8d23b07a3d6579d /chrome/browser/task_manager | |
| parent | 06bd1504b1fb39e954815ad8bfd2c0903b2d0d18 (diff) | |
| download | chromium_src-3a6ec768208d2d056aa971e7e4bdc5305343db7b.zip chromium_src-3a6ec768208d2d056aa971e7e4bdc5305343db7b.tar.gz chromium_src-3a6ec768208d2d056aa971e7e4bdc5305343db7b.tar.bz2 | |
Fix prerender histograms for multiple prerender case.
Unfortunately, the prerender histograms mechanism for determining origin was basically a global variable; when multiple prerenders can be in flight at the same time, this doesn't work so well.
To fix this, track the origin of prerenders in the PrerenderData and in the structure keeping track of prerendered web_contents, and pass explicit origins in for histogram recording.
The "wash" determination still uses the window, which is the same as the TTL, and so it's passed in at initialization rather than being another constant in prerender_histograms.cc.
BUG=None
Review URL: https://chromiumcodereview.appspot.com/11028037
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@162418 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/task_manager')
| -rw-r--r-- | chrome/browser/task_manager/task_manager_resource_providers.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/chrome/browser/task_manager/task_manager_resource_providers.cc b/chrome/browser/task_manager/task_manager_resource_providers.cc index 88a0f56..7522af8 100644 --- a/chrome/browser/task_manager/task_manager_resource_providers.cc +++ b/chrome/browser/task_manager/task_manager_resource_providers.cc @@ -280,7 +280,7 @@ bool TaskManagerTabContentsResource::IsPrerendering() const { tab_contents_->profile()); return prerender_manager && prerender_manager->IsWebContentsPrerendering( - tab_contents_->web_contents()); + tab_contents_->web_contents(), NULL); } bool TaskManagerTabContentsResource::HostsExtension() const { |