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 2055 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2066 // This window can't be closed from a window.close() call until we receive a | 2066 // This window can't be closed from a window.close() call until we receive a |
2067 // message from the Browser process explicitly allowing it. | 2067 // message from the Browser process explicitly allowing it. |
2068 script_can_close_ = false; | 2068 script_can_close_ = false; |
2069 | 2069 |
2070 ViewHostMsg_CreateWindow_Params params; | 2070 ViewHostMsg_CreateWindow_Params params; |
2071 params.opener_id = routing_id_; | 2071 params.opener_id = routing_id_; |
2072 params.user_gesture = creator->isProcessingUserGesture(); | 2072 params.user_gesture = creator->isProcessingUserGesture(); |
2073 params.window_container_type = WindowFeaturesToContainerType(features); | 2073 params.window_container_type = WindowFeaturesToContainerType(features); |
2074 params.session_storage_namespace_id = session_storage_namespace_id_; | 2074 params.session_storage_namespace_id = session_storage_namespace_id_; |
2075 params.frame_name = frame_name; | 2075 params.frame_name = frame_name; |
| 2076 params.opener_frame_id = creator->identifier(); |
| 2077 params.opener_url = creator->url(); |
| 2078 if (!request.isNull()) |
| 2079 params.target_url = request.url(); |
2076 | 2080 |
2077 int32 routing_id = MSG_ROUTING_NONE; | 2081 int32 routing_id = MSG_ROUTING_NONE; |
2078 int64 cloned_session_storage_namespace_id; | 2082 int64 cloned_session_storage_namespace_id; |
2079 bool opener_suppressed = creator->willSuppressOpenerInNewFrame(); | 2083 bool opener_suppressed = creator->willSuppressOpenerInNewFrame(); |
2080 | 2084 |
2081 render_thread_->Send( | 2085 render_thread_->Send( |
2082 new ViewHostMsg_CreateWindow(params, | 2086 new ViewHostMsg_CreateWindow(params, |
2083 &routing_id, | 2087 &routing_id, |
2084 &cloned_session_storage_namespace_id)); | 2088 &cloned_session_storage_namespace_id)); |
2085 if (routing_id == MSG_ROUTING_NONE) | 2089 if (routing_id == MSG_ROUTING_NONE) |
(...skipping 3628 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
5714 if (cmd == kJavaScriptStressTestSetStressRunType) { | 5718 if (cmd == kJavaScriptStressTestSetStressRunType) { |
5715 v8::Testing::SetStressRunType(static_cast<v8::Testing::StressType>(param)); | 5719 v8::Testing::SetStressRunType(static_cast<v8::Testing::StressType>(param)); |
5716 } else if (cmd == kJavaScriptStressTestPrepareStressRun) { | 5720 } else if (cmd == kJavaScriptStressTestPrepareStressRun) { |
5717 v8::Testing::PrepareStressRun(param); | 5721 v8::Testing::PrepareStressRun(param); |
5718 } | 5722 } |
5719 } | 5723 } |
5720 | 5724 |
5721 void RenderView::OnContextMenuClosed() { | 5725 void RenderView::OnContextMenuClosed() { |
5722 context_menu_node_.reset(); | 5726 context_menu_node_.reset(); |
5723 } | 5727 } |
OLD | NEW |