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 981 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
992 // navigation was being initiated in the browser process. Drop the | 992 // navigation was being initiated in the browser process. Drop the |
993 // navigation and don't create the frame in that case. See | 993 // navigation and don't create the frame in that case. See |
994 // https://crbug.com/526304. | 994 // https://crbug.com/526304. |
995 if (!proxy) | 995 if (!proxy) |
996 return; | 996 return; |
997 | 997 |
998 render_frame = RenderFrameImpl::Create(proxy->render_view(), routing_id); | 998 render_frame = RenderFrameImpl::Create(proxy->render_view(), routing_id); |
999 render_frame->InitializeBlameContext(nullptr); | 999 render_frame->InitializeBlameContext(nullptr); |
1000 render_frame->proxy_routing_id_ = proxy_routing_id; | 1000 render_frame->proxy_routing_id_ = proxy_routing_id; |
1001 web_frame = blink::WebLocalFrame::createProvisional( | 1001 web_frame = blink::WebLocalFrame::createProvisional( |
1002 render_frame, proxy->web_frame(), replicated_state.sandbox_flags, | 1002 render_frame, proxy->web_frame(), replicated_state.sandbox_flags); |
1003 frame_owner_properties); | |
1004 } | 1003 } |
1005 render_frame->BindToWebFrame(web_frame); | 1004 render_frame->BindToWebFrame(web_frame); |
1006 CHECK(parent_routing_id != MSG_ROUTING_NONE || !web_frame->parent()); | 1005 CHECK(parent_routing_id != MSG_ROUTING_NONE || !web_frame->parent()); |
1007 | 1006 |
1008 if (widget_params.routing_id != MSG_ROUTING_NONE) { | 1007 if (widget_params.routing_id != MSG_ROUTING_NONE) { |
1009 CHECK(!web_frame->parent() || | 1008 CHECK(!web_frame->parent() || |
1010 SiteIsolationPolicy::AreCrossProcessFramesPossible()); | 1009 SiteIsolationPolicy::AreCrossProcessFramesPossible()); |
1011 render_frame->render_widget_ = RenderWidget::CreateForFrame( | 1010 render_frame->render_widget_ = RenderWidget::CreateForFrame( |
1012 widget_params.routing_id, widget_params.hidden, | 1011 widget_params.routing_id, widget_params.hidden, |
1013 render_frame->render_view_->screen_info(), compositor_deps, web_frame); | 1012 render_frame->render_view_->screen_info(), compositor_deps, web_frame); |
(...skipping 5202 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
6216 // event target. Potentially a Pepper plugin will receive the event. | 6215 // event target. Potentially a Pepper plugin will receive the event. |
6217 // In order to tell whether a plugin gets the last mouse event and which it | 6216 // In order to tell whether a plugin gets the last mouse event and which it |
6218 // is, we set |pepper_last_mouse_event_target_| to null here. If a plugin gets | 6217 // is, we set |pepper_last_mouse_event_target_| to null here. If a plugin gets |
6219 // the event, it will notify us via DidReceiveMouseEvent() and set itself as | 6218 // the event, it will notify us via DidReceiveMouseEvent() and set itself as |
6220 // |pepper_last_mouse_event_target_|. | 6219 // |pepper_last_mouse_event_target_|. |
6221 pepper_last_mouse_event_target_ = nullptr; | 6220 pepper_last_mouse_event_target_ = nullptr; |
6222 #endif | 6221 #endif |
6223 } | 6222 } |
6224 | 6223 |
6225 } // namespace content | 6224 } // namespace content |
OLD | NEW |