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

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

Issue 2625773002: Reenable framebusting (Closed)
Patch Set: Pass through FrameReplicationState Created 3 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 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 #include "content/browser/frame_host/render_frame_host_manager.h" 5 #include "content/browser/frame_host/render_frame_host_manager.h"
6 6
7 #include <stddef.h> 7 #include <stddef.h>
8 8
9 #include <algorithm> 9 #include <algorithm>
10 #include <string> 10 #include <string>
(...skipping 1041 matching lines...) Expand 10 before | Expand all | Expand 10 after
1052 RenderFrameHostImpl* render_frame_host) { 1052 RenderFrameHostImpl* render_frame_host) {
1053 if (render_frame_host == pending_render_frame_host_.get()) 1053 if (render_frame_host == pending_render_frame_host_.get())
1054 CancelPending(); 1054 CancelPending();
1055 else if (render_frame_host == speculative_render_frame_host_.get()) { 1055 else if (render_frame_host == speculative_render_frame_host_.get()) {
1056 // TODO(nasko, clamy): This should just clean up the speculative RFH 1056 // TODO(nasko, clamy): This should just clean up the speculative RFH
1057 // without canceling the request. See https://crbug.com/636119. 1057 // without canceling the request. See https://crbug.com/636119.
1058 frame_tree_node_->ResetNavigationRequest(false); 1058 frame_tree_node_->ResetNavigationRequest(false);
1059 } 1059 }
1060 } 1060 }
1061 1061
1062 void RenderFrameHostManager::OnSetHasReceivedUserGesture() {
1063 for (const auto& pair : proxy_hosts_) {
1064 pair.second->Send(
1065 new FrameMsg_SetHasReceivedUserGesture(pair.second->GetRoutingID()));
1066 }
1067 }
1068
1062 void RenderFrameHostManager::ActiveFrameCountIsZero( 1069 void RenderFrameHostManager::ActiveFrameCountIsZero(
1063 SiteInstanceImpl* site_instance) { 1070 SiteInstanceImpl* site_instance) {
1064 // |site_instance| no longer contains any active RenderFrameHosts, so we don't 1071 // |site_instance| no longer contains any active RenderFrameHosts, so we don't
1065 // need to maintain a proxy there anymore. 1072 // need to maintain a proxy there anymore.
1066 RenderFrameProxyHost* proxy = GetRenderFrameProxyHost(site_instance); 1073 RenderFrameProxyHost* proxy = GetRenderFrameProxyHost(site_instance);
1067 CHECK(proxy); 1074 CHECK(proxy);
1068 1075
1069 DeleteRenderFrameProxyHost(site_instance); 1076 DeleteRenderFrameProxyHost(site_instance);
1070 } 1077 }
1071 1078
(...skipping 1691 matching lines...) Expand 10 before | Expand all | Expand 10 after
2763 resolved_url)) { 2770 resolved_url)) {
2764 DCHECK(!dest_instance || 2771 DCHECK(!dest_instance ||
2765 dest_instance == render_frame_host_->GetSiteInstance()); 2772 dest_instance == render_frame_host_->GetSiteInstance());
2766 return false; 2773 return false;
2767 } 2774 }
2768 2775
2769 return true; 2776 return true;
2770 } 2777 }
2771 2778
2772 } // namespace content 2779 } // namespace content
OLDNEW
« no previous file with comments | « content/browser/frame_host/render_frame_host_manager.h ('k') | content/browser/frame_host/render_frame_proxy_host.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698