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

Side by Side Diff: content/browser/frame_host/render_frame_host_manager.h

Issue 1894193002: Remove RenderFrameHostManager::MoveToPendingDeleteHosts (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fixes based on review by alexmos@ Created 4 years, 8 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
« no previous file with comments | « no previous file | content/browser/frame_host/render_frame_host_manager.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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 #ifndef CONTENT_BROWSER_FRAME_HOST_RENDER_FRAME_HOST_MANAGER_H_ 5 #ifndef CONTENT_BROWSER_FRAME_HOST_RENDER_FRAME_HOST_MANAGER_H_
6 #define CONTENT_BROWSER_FRAME_HOST_RENDER_FRAME_HOST_MANAGER_H_ 6 #define CONTENT_BROWSER_FRAME_HOST_RENDER_FRAME_HOST_MANAGER_H_
7 7
8 #include <stdint.h> 8 #include <stdint.h>
9 9
10 #include <list> 10 #include <list>
(...skipping 687 matching lines...) Expand 10 before | Expand all | Expand 10 after
698 // RenderFrameHost has committed. |old_render_frame_host| will either be 698 // RenderFrameHost has committed. |old_render_frame_host| will either be
699 // deleted or put on the pending delete list during this call. 699 // deleted or put on the pending delete list during this call.
700 void SwapOutOldFrame( 700 void SwapOutOldFrame(
701 std::unique_ptr<RenderFrameHostImpl> old_render_frame_host); 701 std::unique_ptr<RenderFrameHostImpl> old_render_frame_host);
702 702
703 // Discards a RenderFrameHost that was never made active (for active ones 703 // Discards a RenderFrameHost that was never made active (for active ones
704 // SwapOutOldFrame is used instead). 704 // SwapOutOldFrame is used instead).
705 void DiscardUnusedFrame( 705 void DiscardUnusedFrame(
706 std::unique_ptr<RenderFrameHostImpl> render_frame_host); 706 std::unique_ptr<RenderFrameHostImpl> render_frame_host);
707 707
708 // Holds |render_frame_host| until it can be deleted when its swap out ACK
709 // arrives.
710 void MoveToPendingDeleteHosts(
711 std::unique_ptr<RenderFrameHostImpl> render_frame_host);
712
713 // Helper method to terminate the pending RenderFrameHost. The frame may be 708 // Helper method to terminate the pending RenderFrameHost. The frame may be
714 // deleted immediately, or it may be kept around in hopes of later reuse. 709 // deleted immediately, or it may be kept around in hopes of later reuse.
715 void CancelPending(); 710 void CancelPending();
716 711
717 // Clears pending_render_frame_host_, returning it to the caller for disposal. 712 // Clears pending_render_frame_host_, returning it to the caller for disposal.
718 std::unique_ptr<RenderFrameHostImpl> UnsetPendingRenderFrameHost(); 713 std::unique_ptr<RenderFrameHostImpl> UnsetPendingRenderFrameHost();
719 714
720 // Helper method to set the active RenderFrameHost. Returns the old 715 // Helper method to set the active RenderFrameHost. Returns the old
721 // RenderFrameHost and updates counts. 716 // RenderFrameHost and updates counts.
722 std::unique_ptr<RenderFrameHostImpl> SetRenderFrameHost( 717 std::unique_ptr<RenderFrameHostImpl> SetRenderFrameHost(
(...skipping 80 matching lines...) Expand 10 before | Expand all | Expand 10 after
803 std::unique_ptr<RenderFrameHostImpl> speculative_render_frame_host_; 798 std::unique_ptr<RenderFrameHostImpl> speculative_render_frame_host_;
804 799
805 base::WeakPtrFactory<RenderFrameHostManager> weak_factory_; 800 base::WeakPtrFactory<RenderFrameHostManager> weak_factory_;
806 801
807 DISALLOW_COPY_AND_ASSIGN(RenderFrameHostManager); 802 DISALLOW_COPY_AND_ASSIGN(RenderFrameHostManager);
808 }; 803 };
809 804
810 } // namespace content 805 } // namespace content
811 806
812 #endif // CONTENT_BROWSER_FRAME_HOST_RENDER_FRAME_HOST_MANAGER_H_ 807 #endif // CONTENT_BROWSER_FRAME_HOST_RENDER_FRAME_HOST_MANAGER_H_
OLDNEW
« no previous file with comments | « no previous file | content/browser/frame_host/render_frame_host_manager.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698