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

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

Issue 257153003: We have a problem in the process on destroying WebContentsImpl because (Closed) Base URL: https://git.chromium.org/chromium/src.git@master
Patch Set: Rebased onto origin/lkgr Created 6 years, 7 months 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
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_manager.h" 5 #include "chrome/browser/prerender/prerender_manager.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <functional> 8 #include <functional>
9 #include <string> 9 #include <string>
10 #include <vector> 10 #include <vector>
(...skipping 1101 matching lines...) Expand 10 before | Expand all | Expand 10 after
1112 bool is_main_frame, 1112 bool is_main_frame,
1113 const GURL& validated_url, 1113 const GURL& validated_url,
1114 int error_code, 1114 int error_code,
1115 const base::string16& error_description, 1115 const base::string16& error_description,
1116 content::RenderViewHost* render_view_host) { 1116 content::RenderViewHost* render_view_host) {
1117 if (!is_main_frame) 1117 if (!is_main_frame)
1118 return; 1118 return;
1119 prerender_data_->ClearPendingSwap(); 1119 prerender_data_->ClearPendingSwap();
1120 } 1120 }
1121 1121
1122 void PrerenderManager::PendingSwap::WebContentsDestroyed( 1122 void PrerenderManager::PendingSwap::WebContentsDestroyed() {
1123 content::WebContents* web_contents) {
1124 prerender_data_->ClearPendingSwap(); 1123 prerender_data_->ClearPendingSwap();
1125 } 1124 }
1126 1125
1127 void PrerenderManager::PendingSwap::RecordEvent(PrerenderEvent event) const { 1126 void PrerenderManager::PendingSwap::RecordEvent(PrerenderEvent event) const {
1128 manager_->RecordEvent(prerender_data_->contents(), event); 1127 manager_->RecordEvent(prerender_data_->contents(), event);
1129 } 1128 }
1130 1129
1131 void PrerenderManager::PendingSwap::OnMergeCompleted( 1130 void PrerenderManager::PendingSwap::OnMergeCompleted(
1132 SessionStorageNamespace::MergeResult result) { 1131 SessionStorageNamespace::MergeResult result) {
1133 UMA_HISTOGRAM_TIMES("Prerender.SessionStorageNamespaceMergeTime", 1132 UMA_HISTOGRAM_TIMES("Prerender.SessionStorageNamespaceMergeTime",
(...skipping 688 matching lines...) Expand 10 before | Expand all | Expand 10 after
1822 histograms_->RecordNetworkBytes(used, prerender_bytes, recent_profile_bytes); 1821 histograms_->RecordNetworkBytes(used, prerender_bytes, recent_profile_bytes);
1823 } 1822 }
1824 1823
1825 void PrerenderManager::AddProfileNetworkBytesIfEnabled(int64 bytes) { 1824 void PrerenderManager::AddProfileNetworkBytesIfEnabled(int64 bytes) {
1826 DCHECK_GE(bytes, 0); 1825 DCHECK_GE(bytes, 0);
1827 if (IsEnabled() && ActuallyPrerendering()) 1826 if (IsEnabled() && ActuallyPrerendering())
1828 profile_network_bytes_ += bytes; 1827 profile_network_bytes_ += bytes;
1829 } 1828 }
1830 1829
1831 } // namespace prerender 1830 } // namespace prerender
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698