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

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

Issue 2494633004: Remove about:srcdoc url conversion. (Closed)
Patch Set: 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 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"
11 #include "content/browser/frame_host/cross_process_frame_connector.h" 11 #include "content/browser/frame_host/cross_process_frame_connector.h"
12 #include "content/browser/frame_host/frame_tree.h" 12 #include "content/browser/frame_host/frame_tree.h"
13 #include "content/browser/frame_host/frame_tree_node.h" 13 #include "content/browser/frame_host/frame_tree_node.h"
14 #include "content/browser/frame_host/navigator.h" 14 #include "content/browser/frame_host/navigator.h"
15 #include "content/browser/frame_host/render_frame_host_delegate.h" 15 #include "content/browser/frame_host/render_frame_host_delegate.h"
16 #include "content/browser/frame_host/render_widget_host_view_child_frame.h" 16 #include "content/browser/frame_host/render_widget_host_view_child_frame.h"
17 #include "content/browser/message_port_message_filter.h" 17 #include "content/browser/message_port_message_filter.h"
18 #include "content/browser/renderer_host/render_view_host_impl.h" 18 #include "content/browser/renderer_host/render_view_host_impl.h"
19 #include "content/browser/renderer_host/render_widget_host_view_base.h" 19 #include "content/browser/renderer_host/render_widget_host_view_base.h"
20 #include "content/browser/site_instance_impl.h" 20 #include "content/browser/site_instance_impl.h"
21 #include "content/common/frame_messages.h" 21 #include "content/common/frame_messages.h"
22 #include "content/common/frame_owner_properties.h" 22 #include "content/common/frame_owner_properties.h"
23 #include "content/public/browser/browser_thread.h" 23 #include "content/public/browser/browser_thread.h"
24 #include "content/public/common/url_constants.h"
24 #include "ipc/ipc_message.h" 25 #include "ipc/ipc_message.h"
25 26
26 namespace content { 27 namespace content {
27 28
28 namespace { 29 namespace {
29 30
30 // The (process id, routing id) pair that identifies one RenderFrameProxy. 31 // The (process id, routing id) pair that identifies one RenderFrameProxy.
31 typedef std::pair<int32_t, int32_t> RenderFrameProxyHostID; 32 typedef std::pair<int32_t, int32_t> RenderFrameProxyHostID;
32 typedef base::hash_map<RenderFrameProxyHostID, RenderFrameProxyHost*> 33 typedef base::hash_map<RenderFrameProxyHostID, RenderFrameProxyHost*>
33 RoutingIDFrameProxyMap; 34 RoutingIDFrameProxyMap;
(...skipping 205 matching lines...) Expand 10 before | Expand all | Expand 10 after
239 if (frame_tree_node_->IsMainFrame()) { 240 if (frame_tree_node_->IsMainFrame()) {
240 bad_message::ReceivedBadMessage(GetProcess(), bad_message::RFPH_DETACH); 241 bad_message::ReceivedBadMessage(GetProcess(), bad_message::RFPH_DETACH);
241 return; 242 return;
242 } 243 }
243 frame_tree_node_->frame_tree()->RemoveFrame(frame_tree_node_); 244 frame_tree_node_->frame_tree()->RemoveFrame(frame_tree_node_);
244 } 245 }
245 246
246 void RenderFrameProxyHost::OnOpenURL( 247 void RenderFrameProxyHost::OnOpenURL(
247 const FrameHostMsg_OpenURL_Params& params) { 248 const FrameHostMsg_OpenURL_Params& params) {
248 GURL validated_url(params.url); 249 GURL validated_url(params.url);
249 GetProcess()->FilterURL(false, &validated_url); 250 if (validated_url != GURL(content::kAboutSrcDocURL))
251 GetProcess()->FilterURL(false, &validated_url);
250 252
251 // Verify that we are in the same BrowsingInstance as the current 253 // Verify that we are in the same BrowsingInstance as the current
252 // RenderFrameHost. 254 // RenderFrameHost.
253 RenderFrameHostImpl* current_rfh = frame_tree_node_->current_frame_host(); 255 RenderFrameHostImpl* current_rfh = frame_tree_node_->current_frame_host();
254 if (!site_instance_->IsRelatedSiteInstance(current_rfh->GetSiteInstance())) 256 if (!site_instance_->IsRelatedSiteInstance(current_rfh->GetSiteInstance()))
255 return; 257 return;
256 258
257 // Since this navigation targeted a specific RenderFrameProxy, it should stay 259 // Since this navigation targeted a specific RenderFrameProxy, it should stay
258 // in the current tab. 260 // in the current tab.
259 DCHECK_EQ(WindowOpenDisposition::CURRENT_TAB, params.disposition); 261 DCHECK_EQ(WindowOpenDisposition::CURRENT_TAB, params.disposition);
(...skipping 116 matching lines...) Expand 10 before | Expand all | Expand 10 after
376 void RenderFrameProxyHost::OnFrameFocused() { 378 void RenderFrameProxyHost::OnFrameFocused() {
377 frame_tree_node_->current_frame_host()->delegate()->SetFocusedFrame( 379 frame_tree_node_->current_frame_host()->delegate()->SetFocusedFrame(
378 frame_tree_node_, GetSiteInstance()); 380 frame_tree_node_, GetSiteInstance());
379 } 381 }
380 382
381 void RenderFrameProxyHost::OnSetHasReceivedUserGesture() { 383 void RenderFrameProxyHost::OnSetHasReceivedUserGesture() {
382 frame_tree_node_->current_frame_host()->SetHasReceivedUserGesture(); 384 frame_tree_node_->current_frame_host()->SetHasReceivedUserGesture();
383 } 385 }
384 386
385 } // namespace content 387 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698