Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 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_proxy_host.h" | 5 #include "content/browser/frame_host/render_frame_proxy_host.h" |
| 6 | 6 |
| 7 #include <utility> | 7 #include <utility> |
| 8 | 8 |
| 9 #include "base/lazy_instance.h" | 9 #include "base/lazy_instance.h" |
| 10 #include "content/browser/bad_message.h" | 10 #include "content/browser/bad_message.h" |
| (...skipping 242 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 253 RenderFrameHostImpl* current_rfh = frame_tree_node_->current_frame_host(); | 253 RenderFrameHostImpl* current_rfh = frame_tree_node_->current_frame_host(); |
| 254 if (!site_instance_->IsRelatedSiteInstance(current_rfh->GetSiteInstance())) | 254 if (!site_instance_->IsRelatedSiteInstance(current_rfh->GetSiteInstance())) |
| 255 return; | 255 return; |
| 256 | 256 |
| 257 // Since this navigation targeted a specific RenderFrameProxy, it should stay | 257 // Since this navigation targeted a specific RenderFrameProxy, it should stay |
| 258 // in the current tab. | 258 // in the current tab. |
| 259 DCHECK_EQ(CURRENT_TAB, params.disposition); | 259 DCHECK_EQ(CURRENT_TAB, params.disposition); |
| 260 | 260 |
| 261 // TODO(alexmos, creis): Figure out whether |params.user_gesture| needs to be | 261 // TODO(alexmos, creis): Figure out whether |params.user_gesture| needs to be |
| 262 // passed in as well. | 262 // passed in as well. |
| 263 // TODO(lukasza): https://crbug.com/344348: Pass real method and post_data. | |
| 264 frame_tree_node_->navigator()->RequestTransferURL( | 263 frame_tree_node_->navigator()->RequestTransferURL( |
| 265 current_rfh, validated_url, site_instance_.get(), std::vector<GURL>(), | 264 current_rfh, validated_url, site_instance_.get(), std::vector<GURL>(), |
| 266 params.referrer, ui::PAGE_TRANSITION_LINK, GlobalRequestID(), | 265 params.referrer, ui::PAGE_TRANSITION_LINK, GlobalRequestID(), |
| 267 params.should_replace_current_entry, "GET", nullptr); | 266 params.should_replace_current_entry, params.uses_post ? "POST" : "GET", |
| 267 params.resource_request_body); | |
|
Charlie Reis
2016/06/09 22:59:42
Naively, I would expect this to fix https://crbug.
Łukasz Anforowicz
2016/06/10 19:53:51
Sorry for the confusion. The CL under view fixes
| |
| 268 } | 268 } |
| 269 | 269 |
| 270 void RenderFrameProxyHost::OnRouteMessageEvent( | 270 void RenderFrameProxyHost::OnRouteMessageEvent( |
| 271 const FrameMsg_PostMessage_Params& params) { | 271 const FrameMsg_PostMessage_Params& params) { |
| 272 RenderFrameHostImpl* target_rfh = frame_tree_node()->current_frame_host(); | 272 RenderFrameHostImpl* target_rfh = frame_tree_node()->current_frame_host(); |
| 273 | 273 |
| 274 // Only deliver the message if the request came from a RenderFrameHost in the | 274 // Only deliver the message if the request came from a RenderFrameHost in the |
| 275 // same BrowsingInstance or if this WebContents is dedicated to a browser | 275 // same BrowsingInstance or if this WebContents is dedicated to a browser |
| 276 // plugin guest. | 276 // plugin guest. |
| 277 // | 277 // |
| (...skipping 90 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 368 target_rfh->Send(new FrameMsg_AdvanceFocus(target_rfh->GetRoutingID(), type, | 368 target_rfh->Send(new FrameMsg_AdvanceFocus(target_rfh->GetRoutingID(), type, |
| 369 source_proxy_routing_id)); | 369 source_proxy_routing_id)); |
| 370 } | 370 } |
| 371 | 371 |
| 372 void RenderFrameProxyHost::OnFrameFocused() { | 372 void RenderFrameProxyHost::OnFrameFocused() { |
| 373 frame_tree_node_->frame_tree()->SetFocusedFrame(frame_tree_node_, | 373 frame_tree_node_->frame_tree()->SetFocusedFrame(frame_tree_node_, |
| 374 GetSiteInstance()); | 374 GetSiteInstance()); |
| 375 } | 375 } |
| 376 | 376 |
| 377 } // namespace content | 377 } // namespace content |
| OLD | NEW |