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> |
11 | 11 |
12 #include "base/callback.h" | 12 #include "base/callback.h" |
13 #include "base/command_line.h" | 13 #include "base/command_line.h" |
14 #include "base/i18n/rtl.h" | 14 #include "base/i18n/rtl.h" |
15 #include "base/json/json_reader.h" | 15 #include "base/json/json_reader.h" |
16 #include "base/message_loop/message_loop.h" | 16 #include "base/message_loop/message_loop.h" |
17 #include "base/metrics/field_trial.h" | 17 #include "base/metrics/field_trial.h" |
18 #include "base/metrics/histogram.h" | 18 #include "base/metrics/histogram.h" |
19 #include "base/stl_util.h" | 19 #include "base/stl_util.h" |
20 #include "base/strings/string_util.h" | 20 #include "base/strings/string_util.h" |
21 #include "base/strings/utf_string_conversions.h" | 21 #include "base/strings/utf_string_conversions.h" |
22 #include "base/sys_info.h" | 22 #include "base/sys_info.h" |
23 #include "base/time/time.h" | 23 #include "base/time/time.h" |
24 #include "base/trace_event/trace_event.h" | 24 #include "base/trace_event/trace_event.h" |
25 #include "base/values.h" | 25 #include "base/values.h" |
26 #include "cc/base/switches.h" | 26 #include "cc/base/switches.h" |
27 #include "content/browser/bad_message.h" | 27 #include "content/browser/bad_message.h" |
28 #include "content/browser/browser_plugin/browser_plugin_guest.h" | |
28 #include "content/browser/child_process_security_policy_impl.h" | 29 #include "content/browser/child_process_security_policy_impl.h" |
29 #include "content/browser/dom_storage/session_storage_namespace_impl.h" | 30 #include "content/browser/dom_storage/session_storage_namespace_impl.h" |
30 #include "content/browser/frame_host/frame_tree.h" | 31 #include "content/browser/frame_host/frame_tree.h" |
31 #include "content/browser/gpu/compositor_util.h" | 32 #include "content/browser/gpu/compositor_util.h" |
32 #include "content/browser/gpu/gpu_data_manager_impl.h" | 33 #include "content/browser/gpu/gpu_data_manager_impl.h" |
33 #include "content/browser/gpu/gpu_process_host.h" | 34 #include "content/browser/gpu/gpu_process_host.h" |
34 #include "content/browser/gpu/gpu_surface_tracker.h" | 35 #include "content/browser/gpu/gpu_surface_tracker.h" |
35 #include "content/browser/host_zoom_map_impl.h" | 36 #include "content/browser/host_zoom_map_impl.h" |
36 #include "content/browser/loader/resource_dispatcher_host_impl.h" | 37 #include "content/browser/loader/resource_dispatcher_host_impl.h" |
37 #include "content/browser/renderer_host/dip_util.h" | 38 #include "content/browser/renderer_host/dip_util.h" |
(...skipping 280 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
318 params.opener_route_id = opener_route_id; | 319 params.opener_route_id = opener_route_id; |
319 params.swapped_out = !is_active_; | 320 params.swapped_out = !is_active_; |
320 params.proxy_routing_id = proxy_route_id; | 321 params.proxy_routing_id = proxy_route_id; |
321 params.hidden = is_hidden(); | 322 params.hidden = is_hidden(); |
322 params.never_visible = delegate_->IsNeverVisible(); | 323 params.never_visible = delegate_->IsNeverVisible(); |
323 params.window_was_created_with_opener = window_was_created_with_opener; | 324 params.window_was_created_with_opener = window_was_created_with_opener; |
324 params.next_page_id = next_page_id; | 325 params.next_page_id = next_page_id; |
325 params.enable_auto_resize = auto_resize_enabled(); | 326 params.enable_auto_resize = auto_resize_enabled(); |
326 params.min_size = min_size_for_auto_resize(); | 327 params.min_size = min_size_for_auto_resize(); |
327 params.max_size = max_size_for_auto_resize(); | 328 params.max_size = max_size_for_auto_resize(); |
329 params.is_inner_web_contents_in_site_per_process = | |
nasko
2015/05/22 16:32:27
Why not use this conditional and set the proxy_rou
Charlie Reis
2015/05/22 23:44:31
+1
lazyboy
2015/05/26 16:32:54
OK.
Guess that's OK, we wanted to be explicit abou
| |
330 base::CommandLine::ForCurrentProcess()->HasSwitch( | |
331 switches::kSitePerProcess) && | |
332 BrowserPluginGuest::IsGuest(this); | |
328 GetResizeParams(¶ms.initial_size); | 333 GetResizeParams(¶ms.initial_size); |
329 if (!is_active_) { | 334 if (!is_active_) { |
330 params.replicated_frame_state = | 335 params.replicated_frame_state = |
331 static_cast<RenderFrameHostImpl*>(GetMainFrame())->frame_tree_node() | 336 static_cast<RenderFrameHostImpl*>(GetMainFrame())->frame_tree_node() |
332 ->current_replication_state(); | 337 ->current_replication_state(); |
333 } | 338 } |
334 | 339 |
335 if (!Send(new ViewMsg_New(params))) | 340 if (!Send(new ViewMsg_New(params))) |
336 return false; | 341 return false; |
337 SetInitialRenderSizeParams(params.initial_size); | 342 SetInitialRenderSizeParams(params.initial_size); |
(...skipping 1086 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
1424 if (!policy->CanReadFile(GetProcess()->GetID(), file)) | 1429 if (!policy->CanReadFile(GetProcess()->GetID(), file)) |
1425 policy->GrantReadFile(GetProcess()->GetID(), file); | 1430 policy->GrantReadFile(GetProcess()->GetID(), file); |
1426 } | 1431 } |
1427 } | 1432 } |
1428 | 1433 |
1429 void RenderViewHostImpl::SelectWordAroundCaret() { | 1434 void RenderViewHostImpl::SelectWordAroundCaret() { |
1430 Send(new ViewMsg_SelectWordAroundCaret(GetRoutingID())); | 1435 Send(new ViewMsg_SelectWordAroundCaret(GetRoutingID())); |
1431 } | 1436 } |
1432 | 1437 |
1433 } // namespace content | 1438 } // namespace content |
OLD | NEW |