OLD | NEW |
---|---|
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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/public/test/mock_render_thread.h" | 5 #include "content/public/test/mock_render_thread.h" |
6 | 6 |
7 #include "base/single_thread_task_runner.h" | 7 #include "base/single_thread_task_runner.h" |
8 #include "base/thread_task_runner_handle.h" | 8 #include "base/thread_task_runner_handle.h" |
9 #include "content/common/frame_messages.h" | 9 #include "content/common/frame_messages.h" |
10 #include "content/common/view_messages.h" | 10 #include "content/common/view_messages.h" |
(...skipping 197 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
208 int* route_id, | 208 int* route_id, |
209 int* surface_id) { | 209 int* surface_id) { |
210 opener_id_ = opener_id; | 210 opener_id_ = opener_id; |
211 *route_id = routing_id_; | 211 *route_id = routing_id_; |
212 *surface_id = surface_id_; | 212 *surface_id = surface_id_; |
213 } | 213 } |
214 | 214 |
215 // The View expects to be returned a valid route_id different from its own. | 215 // The View expects to be returned a valid route_id different from its own. |
216 void MockRenderThread::OnCreateWindow( | 216 void MockRenderThread::OnCreateWindow( |
217 const ViewHostMsg_CreateWindow_Params& params, | 217 const ViewHostMsg_CreateWindow_Params& params, |
218 int* route_id, | 218 ViewHostMsg_CreateWindow_Reply* reply) { |
219 int* main_frame_route_id, | 219 reply->route_id = new_window_routing_id_; |
220 int* surface_id, | 220 reply->main_frame_route_id = new_window_main_frame_routing_id_; |
221 int64* cloned_session_storage_namespace_id) { | 221 // TODO(dcheng): Set main_frame_widget_route_id too?? |
ncarter (slow)
2015/08/24 20:55:35
You ought to at least set it to something, I think
dcheng
2015/09/03 16:33:09
Done.
| |
222 *route_id = new_window_routing_id_; | 222 reply->surface_id = surface_id_; |
223 *main_frame_route_id = new_window_main_frame_routing_id_; | 223 reply->cloned_session_storage_namespace_id = 0; |
224 *surface_id = surface_id_; | |
225 *cloned_session_storage_namespace_id = 0; | |
226 } | 224 } |
227 | 225 |
228 // The Frame expects to be returned a valid route_id different from its own. | 226 // The Frame expects to be returned a valid route_id different from its own. |
229 void MockRenderThread::OnCreateChildFrame(int new_frame_routing_id, | 227 void MockRenderThread::OnCreateChildFrame(int new_frame_routing_id, |
230 blink::WebTreeScopeType scope, | 228 blink::WebTreeScopeType scope, |
231 const std::string& frame_name, | 229 const std::string& frame_name, |
232 blink::WebSandboxFlags sandbox_flags, | 230 blink::WebSandboxFlags sandbox_flags, |
233 int* new_render_frame_id) { | 231 int* new_render_frame_id) { |
234 *new_render_frame_id = new_frame_routing_id_++; | 232 *new_render_frame_id = new_frame_routing_id_++; |
235 } | 233 } |
(...skipping 26 matching lines...) Expand all Loading... | |
262 void MockRenderThread::OnDuplicateSection( | 260 void MockRenderThread::OnDuplicateSection( |
263 base::SharedMemoryHandle renderer_handle, | 261 base::SharedMemoryHandle renderer_handle, |
264 base::SharedMemoryHandle* browser_handle) { | 262 base::SharedMemoryHandle* browser_handle) { |
265 // We don't have to duplicate the input handles since RenderViewTest does not | 263 // We don't have to duplicate the input handles since RenderViewTest does not |
266 // separate a browser process from a renderer process. | 264 // separate a browser process from a renderer process. |
267 *browser_handle = renderer_handle; | 265 *browser_handle = renderer_handle; |
268 } | 266 } |
269 #endif // defined(OS_WIN) | 267 #endif // defined(OS_WIN) |
270 | 268 |
271 } // namespace content | 269 } // namespace content |
OLD | NEW |