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

Unified Diff: content/browser/frame_host/render_frame_host_manager.cc

Issue 1608743004: Switch RenderFrameHost pending deletion list to use scoped_ptr. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 11 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 side-by-side diff with in-line comments
Download patch
Index: content/browser/frame_host/render_frame_host_manager.cc
diff --git a/content/browser/frame_host/render_frame_host_manager.cc b/content/browser/frame_host/render_frame_host_manager.cc
index 0813bc659df43d9d8dfd9d2f8ed2f1a536747c86..34aec64822518698a2b381625531c7c279315952 100644
--- a/content/browser/frame_host/render_frame_host_manager.cc
+++ b/content/browser/frame_host/render_frame_host_manager.cc
@@ -720,14 +720,13 @@ void RenderFrameHostManager::MoveToPendingDeleteHosts(
// |render_frame_host| will be deleted when its SwapOut ACK is received, or
// when the timer times out, or when the RFHM itself is deleted (whichever
// comes first).
- pending_delete_hosts_.push_back(
- linked_ptr<RenderFrameHostImpl>(render_frame_host.release()));
+ pending_delete_hosts_.push_back(std::move(render_frame_host));
}
bool RenderFrameHostManager::IsPendingDeletion(
RenderFrameHostImpl* render_frame_host) {
for (const auto& rfh : pending_delete_hosts_) {
- if (rfh == render_frame_host)
+ if (rfh.get() == render_frame_host)
return true;
}
return false;
@@ -738,7 +737,7 @@ bool RenderFrameHostManager::DeleteFromPendingList(
for (RFHPendingDeleteList::iterator iter = pending_delete_hosts_.begin();
iter != pending_delete_hosts_.end();
iter++) {
- if (*iter == render_frame_host) {
+ if (iter->get() == render_frame_host) {
pending_delete_hosts_.erase(iter);
return true;
}

Powered by Google App Engine
This is Rietveld 408576698