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 5824 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
5835 GetRequestContextFrameTypeForWebURLRequest(*request) == | 5835 GetRequestContextFrameTypeForWebURLRequest(*request) == |
5836 REQUEST_CONTEXT_FRAME_TYPE_NESTED); | 5836 REQUEST_CONTEXT_FRAME_TYPE_NESTED); |
5837 | 5837 |
5838 Send(new FrameHostMsg_BeginNavigation( | 5838 Send(new FrameHostMsg_BeginNavigation( |
5839 routing_id_, | 5839 routing_id_, |
5840 MakeCommonNavigationParams(request, should_replace_current_entry), | 5840 MakeCommonNavigationParams(request, should_replace_current_entry), |
5841 BeginNavigationParams(GetWebURLRequestHeaders(*request), | 5841 BeginNavigationParams(GetWebURLRequestHeaders(*request), |
5842 GetLoadFlagsForWebURLRequest(*request), | 5842 GetLoadFlagsForWebURLRequest(*request), |
5843 request->hasUserGesture(), | 5843 request->hasUserGesture(), |
5844 request->skipServiceWorker(), | 5844 request->skipServiceWorker(), |
5845 GetRequestContextTypeForWebURLRequest(*request)))); | 5845 GetRequestContextTypeForWebURLRequest(*request), |
| 5846 request->requestorOrigin()))); |
5846 } | 5847 } |
5847 | 5848 |
5848 void RenderFrameImpl::LoadDataURL( | 5849 void RenderFrameImpl::LoadDataURL( |
5849 const CommonNavigationParams& params, | 5850 const CommonNavigationParams& params, |
5850 const RequestNavigationParams& request_params, | 5851 const RequestNavigationParams& request_params, |
5851 WebLocalFrame* frame, | 5852 WebLocalFrame* frame, |
5852 blink::WebFrameLoadType load_type, | 5853 blink::WebFrameLoadType load_type, |
5853 blink::WebHistoryItem item_for_history_navigation, | 5854 blink::WebHistoryItem item_for_history_navigation, |
5854 blink::WebHistoryLoadType history_load_type, | 5855 blink::WebHistoryLoadType history_load_type, |
5855 bool is_client_redirect) { | 5856 bool is_client_redirect) { |
(...skipping 450 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
6306 // event target. Potentially a Pepper plugin will receive the event. | 6307 // event target. Potentially a Pepper plugin will receive the event. |
6307 // In order to tell whether a plugin gets the last mouse event and which it | 6308 // In order to tell whether a plugin gets the last mouse event and which it |
6308 // is, we set |pepper_last_mouse_event_target_| to null here. If a plugin gets | 6309 // is, we set |pepper_last_mouse_event_target_| to null here. If a plugin gets |
6309 // the event, it will notify us via DidReceiveMouseEvent() and set itself as | 6310 // the event, it will notify us via DidReceiveMouseEvent() and set itself as |
6310 // |pepper_last_mouse_event_target_|. | 6311 // |pepper_last_mouse_event_target_|. |
6311 pepper_last_mouse_event_target_ = nullptr; | 6312 pepper_last_mouse_event_target_ = nullptr; |
6312 #endif | 6313 #endif |
6313 } | 6314 } |
6314 | 6315 |
6315 } // namespace content | 6316 } // namespace content |
OLD | NEW |