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

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

Issue 2475693002: Do not reset NavigationHandle when navigating same-page (Closed)
Patch Set: Rebase + removed DCHECK Created 4 years, 1 month 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 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_IMPL_H_ 5 #ifndef CONTENT_BROWSER_FRAME_HOST_RENDER_FRAME_HOST_IMPL_H_
6 #define CONTENT_BROWSER_FRAME_HOST_RENDER_FRAME_HOST_IMPL_H_ 6 #define CONTENT_BROWSER_FRAME_HOST_RENDER_FRAME_HOST_IMPL_H_
7 7
8 #include <stddef.h> 8 #include <stddef.h>
9 #include <stdint.h> 9 #include <stdint.h>
10 10
(...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after
43 #include "third_party/WebKit/public/platform/WebInsecureRequestPolicy.h" 43 #include "third_party/WebKit/public/platform/WebInsecureRequestPolicy.h"
44 #include "third_party/WebKit/public/web/WebTextDirection.h" 44 #include "third_party/WebKit/public/web/WebTextDirection.h"
45 #include "third_party/WebKit/public/web/WebTreeScopeType.h" 45 #include "third_party/WebKit/public/web/WebTreeScopeType.h"
46 #include "ui/accessibility/ax_node_data.h" 46 #include "ui/accessibility/ax_node_data.h"
47 #include "ui/base/page_transition_types.h" 47 #include "ui/base/page_transition_types.h"
48 48
49 class GURL; 49 class GURL;
50 struct AccessibilityHostMsg_EventParams; 50 struct AccessibilityHostMsg_EventParams;
51 struct AccessibilityHostMsg_FindInPageResultParams; 51 struct AccessibilityHostMsg_FindInPageResultParams;
52 struct AccessibilityHostMsg_LocationChangeParams; 52 struct AccessibilityHostMsg_LocationChangeParams;
53 struct FrameHostMsg_DidCommitProvisionalLoad_Params;
53 struct FrameHostMsg_DidFailProvisionalLoadWithError_Params; 54 struct FrameHostMsg_DidFailProvisionalLoadWithError_Params;
54 struct FrameHostMsg_OpenURL_Params; 55 struct FrameHostMsg_OpenURL_Params;
55 struct FrameMsg_TextTrackSettings_Params; 56 struct FrameMsg_TextTrackSettings_Params;
56 #if defined(USE_EXTERNAL_POPUP_MENU) 57 #if defined(USE_EXTERNAL_POPUP_MENU)
57 struct FrameHostMsg_ShowPopup_Params; 58 struct FrameHostMsg_ShowPopup_Params;
58 #endif 59 #endif
59 60
60 namespace base { 61 namespace base {
61 class ListValue; 62 class ListValue;
62 } 63 }
(...skipping 739 matching lines...) Expand 10 before | Expand all | Expand 10 after
802 // Deletes the Web Bluetooth Service owned by the frame. 803 // Deletes the Web Bluetooth Service owned by the frame.
803 void DeleteWebBluetoothService(); 804 void DeleteWebBluetoothService();
804 805
805 // Allows tests to disable the swapout event timer to simulate bugs that 806 // Allows tests to disable the swapout event timer to simulate bugs that
806 // happen before it fires (to avoid flakiness). 807 // happen before it fires (to avoid flakiness).
807 void DisableSwapOutTimerForTesting(); 808 void DisableSwapOutTimerForTesting();
808 809
809 void OnRendererConnect(const service_manager::ServiceInfo& local_info, 810 void OnRendererConnect(const service_manager::ServiceInfo& local_info,
810 const service_manager::ServiceInfo& remote_info); 811 const service_manager::ServiceInfo& remote_info);
811 812
813 // Returns ownership of the NavigationHandle associated with a navigation that
814 // just committed.
815 std::unique_ptr<NavigationHandleImpl> TakeNavigationHandleForCommit(
816 const FrameHostMsg_DidCommitProvisionalLoad_Params& params);
817
812 // For now, RenderFrameHosts indirectly keep RenderViewHosts alive via a 818 // For now, RenderFrameHosts indirectly keep RenderViewHosts alive via a
813 // refcount that calls Shutdown when it reaches zero. This allows each 819 // refcount that calls Shutdown when it reaches zero. This allows each
814 // RenderFrameHostManager to just care about RenderFrameHosts, while ensuring 820 // RenderFrameHostManager to just care about RenderFrameHosts, while ensuring
815 // we have a RenderViewHost for each RenderFrameHost. 821 // we have a RenderViewHost for each RenderFrameHost.
816 // TODO(creis): RenderViewHost will eventually go away and be replaced with 822 // TODO(creis): RenderViewHost will eventually go away and be replaced with
817 // some form of page context. 823 // some form of page context.
818 RenderViewHostImpl* render_view_host_; 824 RenderViewHostImpl* render_view_host_;
819 825
820 RenderFrameHostDelegate* delegate_; 826 RenderFrameHostDelegate* delegate_;
821 827
(...skipping 236 matching lines...) Expand 10 before | Expand all | Expand 10 after
1058 remote_associated_interfaces_; 1064 remote_associated_interfaces_;
1059 // NOTE: This must be the last member. 1065 // NOTE: This must be the last member.
1060 base::WeakPtrFactory<RenderFrameHostImpl> weak_ptr_factory_; 1066 base::WeakPtrFactory<RenderFrameHostImpl> weak_ptr_factory_;
1061 1067
1062 DISALLOW_COPY_AND_ASSIGN(RenderFrameHostImpl); 1068 DISALLOW_COPY_AND_ASSIGN(RenderFrameHostImpl);
1063 }; 1069 };
1064 1070
1065 } // namespace content 1071 } // namespace content
1066 1072
1067 #endif // CONTENT_BROWSER_FRAME_HOST_RENDER_FRAME_HOST_IMPL_H_ 1073 #endif // CONTENT_BROWSER_FRAME_HOST_RENDER_FRAME_HOST_IMPL_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698