OLD | NEW |
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 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 "chrome/renderer/render_view.h" | 5 #include "chrome/renderer/render_view.h" |
6 | 6 |
7 #include <algorithm> | 7 #include <algorithm> |
8 #include <cmath> | 8 #include <cmath> |
9 #include <string> | 9 #include <string> |
10 #include <vector> | 10 #include <vector> |
(...skipping 2044 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2055 // This window can't be closed from a window.close() call until we receive a | 2055 // This window can't be closed from a window.close() call until we receive a |
2056 // message from the Browser process explicitly allowing it. | 2056 // message from the Browser process explicitly allowing it. |
2057 script_can_close_ = false; | 2057 script_can_close_ = false; |
2058 | 2058 |
2059 ViewHostMsg_CreateWindow_Params params; | 2059 ViewHostMsg_CreateWindow_Params params; |
2060 params.opener_id = routing_id_; | 2060 params.opener_id = routing_id_; |
2061 params.user_gesture = creator->isProcessingUserGesture(); | 2061 params.user_gesture = creator->isProcessingUserGesture(); |
2062 params.window_container_type = WindowFeaturesToContainerType(features); | 2062 params.window_container_type = WindowFeaturesToContainerType(features); |
2063 params.session_storage_namespace_id = session_storage_namespace_id_; | 2063 params.session_storage_namespace_id = session_storage_namespace_id_; |
2064 params.frame_name = frame_name; | 2064 params.frame_name = frame_name; |
| 2065 params.opener_frame_id = creator->identifier(); |
| 2066 params.opener_url = creator->url(); |
| 2067 params.opener_security_origin = creator->securityOrigin().toString().utf8(); |
| 2068 if (!request.isNull()) |
| 2069 params.target_url = request.url(); |
2065 | 2070 |
2066 int32 routing_id = MSG_ROUTING_NONE; | 2071 int32 routing_id = MSG_ROUTING_NONE; |
2067 int64 cloned_session_storage_namespace_id; | 2072 int64 cloned_session_storage_namespace_id; |
2068 bool opener_suppressed = creator->willSuppressOpenerInNewFrame(); | 2073 bool opener_suppressed = creator->willSuppressOpenerInNewFrame(); |
2069 | 2074 |
2070 render_thread_->Send( | 2075 render_thread_->Send( |
2071 new ViewHostMsg_CreateWindow(params, | 2076 new ViewHostMsg_CreateWindow(params, |
2072 &routing_id, | 2077 &routing_id, |
2073 &cloned_session_storage_namespace_id)); | 2078 &cloned_session_storage_namespace_id)); |
2074 if (routing_id == MSG_ROUTING_NONE) | 2079 if (routing_id == MSG_ROUTING_NONE) |
(...skipping 3654 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
5729 if (cmd == kJavaScriptStressTestSetStressRunType) { | 5734 if (cmd == kJavaScriptStressTestSetStressRunType) { |
5730 v8::Testing::SetStressRunType(static_cast<v8::Testing::StressType>(param)); | 5735 v8::Testing::SetStressRunType(static_cast<v8::Testing::StressType>(param)); |
5731 } else if (cmd == kJavaScriptStressTestPrepareStressRun) { | 5736 } else if (cmd == kJavaScriptStressTestPrepareStressRun) { |
5732 v8::Testing::PrepareStressRun(param); | 5737 v8::Testing::PrepareStressRun(param); |
5733 } | 5738 } |
5734 } | 5739 } |
5735 | 5740 |
5736 void RenderView::OnContextMenuClosed() { | 5741 void RenderView::OnContextMenuClosed() { |
5737 context_menu_node_.reset(); | 5742 context_menu_node_.reset(); |
5738 } | 5743 } |
OLD | NEW |