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

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/master again, resolved conflicts 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 1100 matching lines...) Expand 10 before | Expand all | Expand 10 after
1111 bool is_main_frame, 1111 bool is_main_frame,
1112 const GURL& validated_url, 1112 const GURL& validated_url,
1113 int error_code, 1113 int error_code,
1114 const base::string16& error_description, 1114 const base::string16& error_description,
1115 content::RenderViewHost* render_view_host) { 1115 content::RenderViewHost* render_view_host) {
1116 if (!is_main_frame) 1116 if (!is_main_frame)
1117 return; 1117 return;
1118 prerender_data_->ClearPendingSwap(); 1118 prerender_data_->ClearPendingSwap();
1119 } 1119 }
1120 1120
1121 void PrerenderManager::PendingSwap::WebContentsDestroyed( 1121 void PrerenderManager::PendingSwap::WebContentsDestroyed() {
1122 content::WebContents* web_contents) {
1123 prerender_data_->ClearPendingSwap(); 1122 prerender_data_->ClearPendingSwap();
1124 } 1123 }
1125 1124
1126 void PrerenderManager::PendingSwap::RecordEvent(PrerenderEvent event) const { 1125 void PrerenderManager::PendingSwap::RecordEvent(PrerenderEvent event) const {
1127 manager_->RecordEvent(prerender_data_->contents(), event); 1126 manager_->RecordEvent(prerender_data_->contents(), event);
1128 } 1127 }
1129 1128
1130 void PrerenderManager::PendingSwap::OnMergeCompleted( 1129 void PrerenderManager::PendingSwap::OnMergeCompleted(
1131 SessionStorageNamespace::MergeResult result) { 1130 SessionStorageNamespace::MergeResult result) {
1132 UMA_HISTOGRAM_TIMES("Prerender.SessionStorageNamespaceMergeTime", 1131 UMA_HISTOGRAM_TIMES("Prerender.SessionStorageNamespaceMergeTime",
(...skipping 688 matching lines...) Expand 10 before | Expand all | Expand 10 after
1821 histograms_->RecordNetworkBytes(used, prerender_bytes, recent_profile_bytes); 1820 histograms_->RecordNetworkBytes(used, prerender_bytes, recent_profile_bytes);
1822 } 1821 }
1823 1822
1824 void PrerenderManager::AddProfileNetworkBytesIfEnabled(int64 bytes) { 1823 void PrerenderManager::AddProfileNetworkBytesIfEnabled(int64 bytes) {
1825 DCHECK_GE(bytes, 0); 1824 DCHECK_GE(bytes, 0);
1826 if (IsEnabled() && ActuallyPrerendering()) 1825 if (IsEnabled() && ActuallyPrerendering())
1827 profile_network_bytes_ += bytes; 1826 profile_network_bytes_ += bytes;
1828 } 1827 }
1829 1828
1830 } // namespace prerender 1829 } // namespace prerender
OLDNEW
« no previous file with comments | « chrome/browser/prerender/prerender_manager.h ('k') | chrome/browser/printing/background_printing_manager.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698