| 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 901 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 912 // navigation was being initiated in the browser process. Drop the | 912 // navigation was being initiated in the browser process. Drop the |
| 913 // navigation and don't create the frame in that case. See | 913 // navigation and don't create the frame in that case. See |
| 914 // https://crbug.com/526304. | 914 // https://crbug.com/526304. |
| 915 if (!proxy) | 915 if (!proxy) |
| 916 return; | 916 return; |
| 917 | 917 |
| 918 render_frame = RenderFrameImpl::Create(proxy->render_view(), routing_id); | 918 render_frame = RenderFrameImpl::Create(proxy->render_view(), routing_id); |
| 919 render_frame->InitializeBlameContext(nullptr); | 919 render_frame->InitializeBlameContext(nullptr); |
| 920 render_frame->proxy_routing_id_ = proxy_routing_id; | 920 render_frame->proxy_routing_id_ = proxy_routing_id; |
| 921 web_frame = blink::WebLocalFrame::createProvisional( | 921 web_frame = blink::WebLocalFrame::createProvisional( |
| 922 render_frame, proxy->web_frame(), replicated_state.sandbox_flags, | 922 render_frame, proxy->web_frame(), replicated_state.sandbox_flags); |
| 923 frame_owner_properties); | |
| 924 } | 923 } |
| 925 render_frame->BindToWebFrame(web_frame); | 924 render_frame->BindToWebFrame(web_frame); |
| 926 CHECK(parent_routing_id != MSG_ROUTING_NONE || !web_frame->parent()); | 925 CHECK(parent_routing_id != MSG_ROUTING_NONE || !web_frame->parent()); |
| 927 | 926 |
| 928 if (widget_params.routing_id != MSG_ROUTING_NONE) { | 927 if (widget_params.routing_id != MSG_ROUTING_NONE) { |
| 929 CHECK(!web_frame->parent() || | 928 CHECK(!web_frame->parent() || |
| 930 SiteIsolationPolicy::AreCrossProcessFramesPossible()); | 929 SiteIsolationPolicy::AreCrossProcessFramesPossible()); |
| 931 render_frame->render_widget_ = RenderWidget::CreateForFrame( | 930 render_frame->render_widget_ = RenderWidget::CreateForFrame( |
| 932 widget_params.routing_id, widget_params.hidden, | 931 widget_params.routing_id, widget_params.hidden, |
| 933 render_frame->render_view_->screen_info(), compositor_deps, web_frame); | 932 render_frame->render_view_->screen_info(), compositor_deps, web_frame); |
| (...skipping 5109 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 6043 int match_count, | 6042 int match_count, |
| 6044 int ordinal, | 6043 int ordinal, |
| 6045 const WebRect& selection_rect, | 6044 const WebRect& selection_rect, |
| 6046 bool final_status_update) { | 6045 bool final_status_update) { |
| 6047 Send(new FrameHostMsg_Find_Reply(routing_id_, request_id, match_count, | 6046 Send(new FrameHostMsg_Find_Reply(routing_id_, request_id, match_count, |
| 6048 selection_rect, ordinal, | 6047 selection_rect, ordinal, |
| 6049 final_status_update)); | 6048 final_status_update)); |
| 6050 } | 6049 } |
| 6051 | 6050 |
| 6052 } // namespace content | 6051 } // namespace content |
| OLD | NEW |