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/render_view_test.h" | 5 #include "content/public/test/render_view_test.h" |
6 | 6 |
7 #include <cctype> | 7 #include <cctype> |
8 | 8 |
9 #include "base/location.h" | 9 #include "base/location.h" |
10 #include "base/run_loop.h" | 10 #include "base/run_loop.h" |
(...skipping 43 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
54 using blink::WebLocalFrame; | 54 using blink::WebLocalFrame; |
55 using blink::WebMouseEvent; | 55 using blink::WebMouseEvent; |
56 using blink::WebScriptSource; | 56 using blink::WebScriptSource; |
57 using blink::WebString; | 57 using blink::WebString; |
58 using blink::WebURLRequest; | 58 using blink::WebURLRequest; |
59 | 59 |
60 namespace { | 60 namespace { |
61 | 61 |
62 const int32 kRouteId = 5; | 62 const int32 kRouteId = 5; |
63 const int32 kMainFrameRouteId = 6; | 63 const int32 kMainFrameRouteId = 6; |
64 const int32 kMainFrameWidgetRouteId = 8; | |
64 const int32 kNewWindowRouteId = 7; | 65 const int32 kNewWindowRouteId = 7; |
65 const int32 kNewFrameRouteId = 10; | 66 const int32 kNewFrameRouteId = 10; |
66 const int32 kSurfaceId = 42; | 67 const int32 kSurfaceId = 42; |
67 | 68 |
68 // Converts |ascii_character| into |key_code| and returns true on success. | 69 // Converts |ascii_character| into |key_code| and returns true on success. |
69 // Handles only the characters needed by tests. | 70 // Handles only the characters needed by tests. |
70 bool GetWindowsKeyCode(char ascii_character, int* key_code) { | 71 bool GetWindowsKeyCode(char ascii_character, int* key_code) { |
71 if (isalnum(ascii_character)) { | 72 if (isalnum(ascii_character)) { |
72 *key_code = base::ToUpperASCII(ascii_character); | 73 *key_code = base::ToUpperASCII(ascii_character); |
73 return true; | 74 return true; |
(...skipping 128 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
202 SetBrowserClientForTesting(content_browser_client_.get()); | 203 SetBrowserClientForTesting(content_browser_client_.get()); |
203 SetRendererClientForTesting(content_renderer_client_.get()); | 204 SetRendererClientForTesting(content_renderer_client_.get()); |
204 | 205 |
205 // Subclasses can set render_thread_ with their own implementation before | 206 // Subclasses can set render_thread_ with their own implementation before |
206 // calling RenderViewTest::SetUp(). | 207 // calling RenderViewTest::SetUp(). |
207 if (!render_thread_) | 208 if (!render_thread_) |
208 render_thread_.reset(new MockRenderThread()); | 209 render_thread_.reset(new MockRenderThread()); |
209 render_thread_->set_routing_id(kRouteId); | 210 render_thread_->set_routing_id(kRouteId); |
210 render_thread_->set_surface_id(kSurfaceId); | 211 render_thread_->set_surface_id(kSurfaceId); |
211 render_thread_->set_new_window_routing_id(kNewWindowRouteId); | 212 render_thread_->set_new_window_routing_id(kNewWindowRouteId); |
213 render_thread_->set_new_window_main_frame_widget_routing_id( | |
214 kMainFrameWidgetRouteId); | |
212 render_thread_->set_new_frame_routing_id(kNewFrameRouteId); | 215 render_thread_->set_new_frame_routing_id(kNewFrameRouteId); |
213 | 216 |
214 #if defined(OS_MACOSX) | 217 #if defined(OS_MACOSX) |
215 autorelease_pool_.reset(new base::mac::ScopedNSAutoreleasePool()); | 218 autorelease_pool_.reset(new base::mac::ScopedNSAutoreleasePool()); |
216 #endif | 219 #endif |
217 command_line_.reset(new base::CommandLine(base::CommandLine::NO_PROGRAM)); | 220 command_line_.reset(new base::CommandLine(base::CommandLine::NO_PROGRAM)); |
218 params_.reset(new MainFunctionParams(*command_line_)); | 221 params_.reset(new MainFunctionParams(*command_line_)); |
219 platform_.reset(new RendererMainPlatformDelegate(*params_)); | 222 platform_.reset(new RendererMainPlatformDelegate(*params_)); |
220 platform_->PlatformInitialize(); | 223 platform_->PlatformInitialize(); |
221 | 224 |
(...skipping 16 matching lines...) Expand all Loading... | |
238 | 241 |
239 compositor_deps_.reset(new FakeCompositorDependencies); | 242 compositor_deps_.reset(new FakeCompositorDependencies); |
240 mock_process_.reset(new MockRenderProcess); | 243 mock_process_.reset(new MockRenderProcess); |
241 | 244 |
242 ViewMsg_New_Params view_params; | 245 ViewMsg_New_Params view_params; |
243 view_params.opener_frame_route_id = MSG_ROUTING_NONE; | 246 view_params.opener_frame_route_id = MSG_ROUTING_NONE; |
244 view_params.window_was_created_with_opener = false; | 247 view_params.window_was_created_with_opener = false; |
245 view_params.renderer_preferences = RendererPreferences(); | 248 view_params.renderer_preferences = RendererPreferences(); |
246 view_params.web_preferences = WebPreferences(); | 249 view_params.web_preferences = WebPreferences(); |
247 view_params.view_id = kRouteId; | 250 view_params.view_id = kRouteId; |
251 view_params.view_surface_id = kSurfaceId; | |
248 view_params.main_frame_routing_id = kMainFrameRouteId; | 252 view_params.main_frame_routing_id = kMainFrameRouteId; |
249 view_params.surface_id = kSurfaceId; | 253 view_params.main_frame_widget_routing_id = kMainFrameWidgetRouteId; |
250 view_params.session_storage_namespace_id = kInvalidSessionStorageNamespaceId; | 254 view_params.session_storage_namespace_id = kInvalidSessionStorageNamespaceId; |
255 view_params.widget_surface_id = kSurfaceId + 1; | |
ncarter (slow)
2015/09/03 20:24:37
Same question here: how much of a hack is this? Ca
dcheng
2015/09/03 21:29:24
Same.
| |
251 view_params.swapped_out = false; | 256 view_params.swapped_out = false; |
252 view_params.replicated_frame_state = FrameReplicationState(); | 257 view_params.replicated_frame_state = FrameReplicationState(); |
253 view_params.proxy_routing_id = MSG_ROUTING_NONE; | 258 view_params.proxy_routing_id = MSG_ROUTING_NONE; |
254 view_params.hidden = false; | 259 view_params.hidden = false; |
255 view_params.never_visible = false; | 260 view_params.never_visible = false; |
256 view_params.next_page_id = 1; | 261 view_params.next_page_id = 1; |
257 view_params.initial_size = *InitialSizeParams(); | 262 view_params.initial_size = *InitialSizeParams(); |
258 view_params.enable_auto_resize = false; | 263 view_params.enable_auto_resize = false; |
259 view_params.min_size = gfx::Size(); | 264 view_params.min_size = gfx::Size(); |
260 view_params.max_size = gfx::Size(); | 265 view_params.max_size = gfx::Size(); |
(...skipping 324 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
585 TestRenderFrame* frame = | 590 TestRenderFrame* frame = |
586 static_cast<TestRenderFrame*>(impl->GetMainRenderFrame()); | 591 static_cast<TestRenderFrame*>(impl->GetMainRenderFrame()); |
587 frame->Navigate(common_params, StartNavigationParams(), request_params); | 592 frame->Navigate(common_params, StartNavigationParams(), request_params); |
588 | 593 |
589 // The load actually happens asynchronously, so we pump messages to process | 594 // The load actually happens asynchronously, so we pump messages to process |
590 // the pending continuation. | 595 // the pending continuation. |
591 FrameLoadWaiter(frame).Wait(); | 596 FrameLoadWaiter(frame).Wait(); |
592 } | 597 } |
593 | 598 |
594 } // namespace content | 599 } // namespace content |
OLD | NEW |