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/browser/renderer_host/render_view_host_impl.h" | 5 #include "content/browser/renderer_host/render_view_host_impl.h" |
6 | 6 |
7 #include <set> | 7 #include <set> |
8 #include <string> | 8 #include <string> |
9 #include <utility> | 9 #include <utility> |
10 #include <vector> | 10 #include <vector> |
(...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
42 #include "content/browser/renderer_host/render_view_host_delegate_view.h" | 42 #include "content/browser/renderer_host/render_view_host_delegate_view.h" |
43 #include "content/browser/renderer_host/render_widget_host_delegate.h" | 43 #include "content/browser/renderer_host/render_widget_host_delegate.h" |
44 #include "content/browser/renderer_host/render_widget_host_view_base.h" | 44 #include "content/browser/renderer_host/render_widget_host_view_base.h" |
45 #include "content/common/browser_plugin/browser_plugin_messages.h" | 45 #include "content/common/browser_plugin/browser_plugin_messages.h" |
46 #include "content/common/content_switches_internal.h" | 46 #include "content/common/content_switches_internal.h" |
47 #include "content/common/drag_messages.h" | 47 #include "content/common/drag_messages.h" |
48 #include "content/common/frame_messages.h" | 48 #include "content/common/frame_messages.h" |
49 #include "content/common/input_messages.h" | 49 #include "content/common/input_messages.h" |
50 #include "content/common/inter_process_time_ticks_converter.h" | 50 #include "content/common/inter_process_time_ticks_converter.h" |
51 #include "content/common/render_message_filter.mojom.h" | 51 #include "content/common/render_message_filter.mojom.h" |
| 52 #include "content/common/renderer.mojom.h" |
52 #include "content/common/site_isolation_policy.h" | 53 #include "content/common/site_isolation_policy.h" |
53 #include "content/common/speech_recognition_messages.h" | 54 #include "content/common/speech_recognition_messages.h" |
54 #include "content/common/swapped_out_messages.h" | 55 #include "content/common/swapped_out_messages.h" |
55 #include "content/common/view_messages.h" | 56 #include "content/common/view_messages.h" |
56 #include "content/public/browser/ax_event_notification_details.h" | 57 #include "content/public/browser/ax_event_notification_details.h" |
57 #include "content/public/browser/browser_accessibility_state.h" | 58 #include "content/public/browser/browser_accessibility_state.h" |
58 #include "content/public/browser/browser_context.h" | 59 #include "content/public/browser/browser_context.h" |
59 #include "content/public/browser/browser_message_filter.h" | 60 #include "content/public/browser/browser_message_filter.h" |
60 #include "content/public/browser/content_browser_client.h" | 61 #include "content/public/browser/content_browser_client.h" |
61 #include "content/public/browser/focused_node_details.h" | 62 #include "content/public/browser/focused_node_details.h" |
(...skipping 271 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
333 base::debug::DumpWithoutCrashing(); | 334 base::debug::DumpWithoutCrashing(); |
334 | 335 |
335 GetWidget()->set_renderer_initialized(true); | 336 GetWidget()->set_renderer_initialized(true); |
336 | 337 |
337 // Ensure the RenderView starts with a next_page_id larger than any existing | 338 // Ensure the RenderView starts with a next_page_id larger than any existing |
338 // page ID it might be asked to render. | 339 // page ID it might be asked to render. |
339 int32_t next_page_id = 1; | 340 int32_t next_page_id = 1; |
340 if (max_page_id > -1) | 341 if (max_page_id > -1) |
341 next_page_id = max_page_id + 1; | 342 next_page_id = max_page_id + 1; |
342 | 343 |
343 ViewMsg_New_Params params; | 344 mojom::CreateViewParamsPtr params = mojom::CreateViewParams::New(); |
344 params.renderer_preferences = | 345 params->renderer_preferences = |
345 delegate_->GetRendererPrefs(GetProcess()->GetBrowserContext()); | 346 delegate_->GetRendererPrefs(GetProcess()->GetBrowserContext()); |
346 #if defined(OS_WIN) | 347 #if defined(OS_WIN) |
347 GetWindowsSpecificPrefs(¶ms.renderer_preferences); | 348 GetWindowsSpecificPrefs(¶ms->renderer_preferences); |
348 #endif | 349 #endif |
349 params.web_preferences = GetWebkitPreferences(); | 350 params->web_preferences = GetWebkitPreferences(); |
350 params.view_id = GetRoutingID(); | 351 params->view_id = GetRoutingID(); |
351 params.main_frame_routing_id = main_frame_routing_id_; | 352 params->main_frame_routing_id = main_frame_routing_id_; |
352 if (main_frame_routing_id_ != MSG_ROUTING_NONE) { | 353 if (main_frame_routing_id_ != MSG_ROUTING_NONE) { |
353 RenderFrameHostImpl* main_rfh = RenderFrameHostImpl::FromID( | 354 RenderFrameHostImpl* main_rfh = RenderFrameHostImpl::FromID( |
354 GetProcess()->GetID(), main_frame_routing_id_); | 355 GetProcess()->GetID(), main_frame_routing_id_); |
355 DCHECK(main_rfh); | 356 DCHECK(main_rfh); |
356 RenderWidgetHostImpl* main_rwh = main_rfh->GetRenderWidgetHost(); | 357 RenderWidgetHostImpl* main_rwh = main_rfh->GetRenderWidgetHost(); |
357 params.main_frame_widget_routing_id = main_rwh->GetRoutingID(); | 358 params->main_frame_widget_routing_id = main_rwh->GetRoutingID(); |
358 } | 359 } |
359 params.session_storage_namespace_id = | 360 params->session_storage_namespace_id = |
360 delegate_->GetSessionStorageNamespace(instance_.get())->id(); | 361 delegate_->GetSessionStorageNamespace(instance_.get())->id(); |
361 // Ensure the RenderView sets its opener correctly. | 362 // Ensure the RenderView sets its opener correctly. |
362 params.opener_frame_route_id = opener_frame_route_id; | 363 params->opener_frame_route_id = opener_frame_route_id; |
363 params.swapped_out = !is_active_; | 364 params->swapped_out = !is_active_; |
364 params.replicated_frame_state = replicated_frame_state; | 365 params->replicated_frame_state = replicated_frame_state; |
365 params.proxy_routing_id = proxy_route_id; | 366 params->proxy_routing_id = proxy_route_id; |
366 params.hidden = GetWidget()->is_hidden(); | 367 params->hidden = GetWidget()->is_hidden(); |
367 params.never_visible = delegate_->IsNeverVisible(); | 368 params->never_visible = delegate_->IsNeverVisible(); |
368 params.window_was_created_with_opener = window_was_created_with_opener; | 369 params->window_was_created_with_opener = window_was_created_with_opener; |
369 params.next_page_id = next_page_id; | 370 params->next_page_id = next_page_id; |
370 params.enable_auto_resize = GetWidget()->auto_resize_enabled(); | 371 params->enable_auto_resize = GetWidget()->auto_resize_enabled(); |
371 params.min_size = GetWidget()->min_size_for_auto_resize(); | 372 params->min_size = GetWidget()->min_size_for_auto_resize(); |
372 params.max_size = GetWidget()->max_size_for_auto_resize(); | 373 params->max_size = GetWidget()->max_size_for_auto_resize(); |
373 params.page_zoom_level = delegate_->GetPendingPageZoomLevel(); | 374 params->page_zoom_level = delegate_->GetPendingPageZoomLevel(); |
374 params.image_decode_color_space = gfx::ICCProfile::FromBestMonitor(); | 375 params->image_decode_color_space = gfx::ICCProfile::FromBestMonitor(); |
375 GetWidget()->GetResizeParams(¶ms.initial_size); | |
376 | 376 |
377 if (!Send(new ViewMsg_New(params))) | 377 GetWidget()->GetResizeParams(¶ms->initial_size); |
378 return false; | 378 GetWidget()->SetInitialRenderSizeParams(params->initial_size); |
379 GetWidget()->SetInitialRenderSizeParams(params.initial_size); | 379 |
| 380 RenderProcessHostImpl* process = |
| 381 static_cast<RenderProcessHostImpl*>(GetProcess()); |
| 382 process->GetRendererInterface()->CreateView(std::move(params)); |
380 | 383 |
381 // If the RWHV has not yet been set, the surface ID namespace will get | 384 // If the RWHV has not yet been set, the surface ID namespace will get |
382 // passed down by the call to SetView(). | 385 // passed down by the call to SetView(). |
383 if (GetWidget()->GetView()) { | 386 if (GetWidget()->GetView()) { |
384 Send(new ViewMsg_SetSurfaceClientId( | 387 Send(new ViewMsg_SetSurfaceClientId( |
385 GetRoutingID(), GetWidget()->GetView()->GetSurfaceClientId())); | 388 GetRoutingID(), GetWidget()->GetView()->GetSurfaceClientId())); |
386 } | 389 } |
387 | 390 |
388 // If it's enabled, tell the renderer to set up the Javascript bindings for | 391 // If it's enabled, tell the renderer to set up the Javascript bindings for |
389 // sending messages back to the browser. | 392 // sending messages back to the browser. |
(...skipping 934 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1324 // Note: We are using the origin URL provided by the sender here. It may be | 1327 // Note: We are using the origin URL provided by the sender here. It may be |
1325 // different from the receiver's. | 1328 // different from the receiver's. |
1326 file_system_file.url = | 1329 file_system_file.url = |
1327 GURL(storage::GetIsolatedFileSystemRootURIString( | 1330 GURL(storage::GetIsolatedFileSystemRootURIString( |
1328 file_system_url.origin(), filesystem_id, std::string()) | 1331 file_system_url.origin(), filesystem_id, std::string()) |
1329 .append(register_name)); | 1332 .append(register_name)); |
1330 } | 1333 } |
1331 } | 1334 } |
1332 | 1335 |
1333 } // namespace content | 1336 } // namespace content |
OLD | NEW |