OLD | NEW |
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/renderer/render_frame_impl.h" | 5 #include "content/renderer/render_frame_impl.h" |
6 | 6 |
7 #include <map> | 7 #include <map> |
8 #include <string> | 8 #include <string> |
9 #include <utility> | 9 #include <utility> |
10 #include <vector> | 10 #include <vector> |
(...skipping 889 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
900 // navigation was being initiated in the browser process. Drop the | 900 // navigation was being initiated in the browser process. Drop the |
901 // navigation and don't create the frame in that case. See | 901 // navigation and don't create the frame in that case. See |
902 // https://crbug.com/526304. | 902 // https://crbug.com/526304. |
903 if (!proxy) | 903 if (!proxy) |
904 return; | 904 return; |
905 | 905 |
906 render_frame = RenderFrameImpl::Create(proxy->render_view(), routing_id); | 906 render_frame = RenderFrameImpl::Create(proxy->render_view(), routing_id); |
907 render_frame->InitializeBlameContext(nullptr); | 907 render_frame->InitializeBlameContext(nullptr); |
908 render_frame->proxy_routing_id_ = proxy_routing_id; | 908 render_frame->proxy_routing_id_ = proxy_routing_id; |
909 web_frame = blink::WebLocalFrame::createProvisional( | 909 web_frame = blink::WebLocalFrame::createProvisional( |
910 render_frame, proxy->web_frame(), replicated_state.sandbox_flags, | 910 render_frame, proxy->web_frame(), replicated_state.sandbox_flags); |
911 frame_owner_properties); | |
912 } | 911 } |
913 render_frame->BindToWebFrame(web_frame); | 912 render_frame->BindToWebFrame(web_frame); |
914 CHECK(parent_routing_id != MSG_ROUTING_NONE || !web_frame->parent()); | 913 CHECK(parent_routing_id != MSG_ROUTING_NONE || !web_frame->parent()); |
915 | 914 |
916 if (widget_params.routing_id != MSG_ROUTING_NONE) { | 915 if (widget_params.routing_id != MSG_ROUTING_NONE) { |
917 CHECK(!web_frame->parent() || | 916 CHECK(!web_frame->parent() || |
918 SiteIsolationPolicy::AreCrossProcessFramesPossible()); | 917 SiteIsolationPolicy::AreCrossProcessFramesPossible()); |
919 render_frame->render_widget_ = RenderWidget::CreateForFrame( | 918 render_frame->render_widget_ = RenderWidget::CreateForFrame( |
920 widget_params.routing_id, widget_params.hidden, | 919 widget_params.routing_id, widget_params.hidden, |
921 render_frame->render_view_->screen_info(), compositor_deps, web_frame); | 920 render_frame->render_view_->screen_info(), compositor_deps, web_frame); |
(...skipping 5111 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
6033 int match_count, | 6032 int match_count, |
6034 int ordinal, | 6033 int ordinal, |
6035 const WebRect& selection_rect, | 6034 const WebRect& selection_rect, |
6036 bool final_status_update) { | 6035 bool final_status_update) { |
6037 Send(new FrameHostMsg_Find_Reply(routing_id_, request_id, match_count, | 6036 Send(new FrameHostMsg_Find_Reply(routing_id_, request_id, match_count, |
6038 selection_rect, ordinal, | 6037 selection_rect, ordinal, |
6039 final_status_update)); | 6038 final_status_update)); |
6040 } | 6039 } |
6041 | 6040 |
6042 } // namespace content | 6041 } // namespace content |
OLD | NEW |