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 307 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
318 params.opener_route_id = opener_route_id; | 318 params.opener_route_id = opener_route_id; |
319 params.swapped_out = !is_active_; | 319 params.swapped_out = !is_active_; |
320 params.proxy_routing_id = proxy_route_id; | 320 params.proxy_routing_id = proxy_route_id; |
321 params.hidden = is_hidden(); | 321 params.hidden = is_hidden(); |
322 params.never_visible = delegate_->IsNeverVisible(); | 322 params.never_visible = delegate_->IsNeverVisible(); |
323 params.window_was_created_with_opener = window_was_created_with_opener; | 323 params.window_was_created_with_opener = window_was_created_with_opener; |
324 params.next_page_id = next_page_id; | 324 params.next_page_id = next_page_id; |
325 params.enable_auto_resize = auto_resize_enabled(); | 325 params.enable_auto_resize = auto_resize_enabled(); |
326 params.min_size = min_size_for_auto_resize(); | 326 params.min_size = min_size_for_auto_resize(); |
327 params.max_size = max_size_for_auto_resize(); | 327 params.max_size = max_size_for_auto_resize(); |
| 328 params.surface_id_namespace = 0; |
| 329 if (view_) |
| 330 params.surface_id_namespace = view_->GetSurfaceIdNamespace(); |
328 GetResizeParams(¶ms.initial_size); | 331 GetResizeParams(¶ms.initial_size); |
329 if (!is_active_) { | 332 if (!is_active_) { |
330 params.replicated_frame_state = | 333 params.replicated_frame_state = |
331 static_cast<RenderFrameHostImpl*>(GetMainFrame())->frame_tree_node() | 334 static_cast<RenderFrameHostImpl*>(GetMainFrame())->frame_tree_node() |
332 ->current_replication_state(); | 335 ->current_replication_state(); |
333 } | 336 } |
334 | 337 |
335 if (!Send(new ViewMsg_New(params))) | 338 if (!Send(new ViewMsg_New(params))) |
336 return false; | 339 return false; |
337 SetInitialRenderSizeParams(params.initial_size); | 340 SetInitialRenderSizeParams(params.initial_size); |
(...skipping 1079 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1417 if (!policy->CanReadFile(GetProcess()->GetID(), file)) | 1420 if (!policy->CanReadFile(GetProcess()->GetID(), file)) |
1418 policy->GrantReadFile(GetProcess()->GetID(), file); | 1421 policy->GrantReadFile(GetProcess()->GetID(), file); |
1419 } | 1422 } |
1420 } | 1423 } |
1421 | 1424 |
1422 void RenderViewHostImpl::SelectWordAroundCaret() { | 1425 void RenderViewHostImpl::SelectWordAroundCaret() { |
1423 Send(new ViewMsg_SelectWordAroundCaret(GetRoutingID())); | 1426 Send(new ViewMsg_SelectWordAroundCaret(GetRoutingID())); |
1424 } | 1427 } |
1425 | 1428 |
1426 } // namespace content | 1429 } // namespace content |
OLD | NEW |