| 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 300 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 311 params.session_storage_namespace_id = | 311 params.session_storage_namespace_id = |
| 312 delegate_->GetSessionStorageNamespace(instance_)->id(); | 312 delegate_->GetSessionStorageNamespace(instance_)->id(); |
| 313 params.frame_name = frame_name; | 313 params.frame_name = frame_name; |
| 314 // Ensure the RenderView sets its opener correctly. | 314 // Ensure the RenderView sets its opener correctly. |
| 315 params.opener_route_id = opener_route_id; | 315 params.opener_route_id = opener_route_id; |
| 316 params.swapped_out = !IsRVHStateActive(rvh_state_); | 316 params.swapped_out = !IsRVHStateActive(rvh_state_); |
| 317 params.hidden = is_hidden(); | 317 params.hidden = is_hidden(); |
| 318 params.next_page_id = next_page_id; | 318 params.next_page_id = next_page_id; |
| 319 GetWebScreenInfo(¶ms.screen_info); | 319 GetWebScreenInfo(¶ms.screen_info); |
| 320 params.accessibility_mode = accessibility_mode(); | 320 params.accessibility_mode = accessibility_mode(); |
| 321 params.allow_partial_swap = !GetProcess()->IsGuest(); | |
| 322 | 321 |
| 323 Send(new ViewMsg_New(params)); | 322 Send(new ViewMsg_New(params)); |
| 324 | 323 |
| 325 // If it's enabled, tell the renderer to set up the Javascript bindings for | 324 // If it's enabled, tell the renderer to set up the Javascript bindings for |
| 326 // sending messages back to the browser. | 325 // sending messages back to the browser. |
| 327 if (GetProcess()->IsGuest()) | 326 if (GetProcess()->IsGuest()) |
| 328 DCHECK_EQ(0, enabled_bindings_); | 327 DCHECK_EQ(0, enabled_bindings_); |
| 329 Send(new ViewMsg_AllowBindings(GetRoutingID(), enabled_bindings_)); | 328 Send(new ViewMsg_AllowBindings(GetRoutingID(), enabled_bindings_)); |
| 330 // Let our delegate know that we created a RenderView. | 329 // Let our delegate know that we created a RenderView. |
| 331 delegate_->RenderViewCreated(this); | 330 delegate_->RenderViewCreated(this); |
| (...skipping 1767 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2099 void RenderViewHostImpl::AttachToFrameTree() { | 2098 void RenderViewHostImpl::AttachToFrameTree() { |
| 2100 FrameTree* frame_tree = delegate_->GetFrameTree(); | 2099 FrameTree* frame_tree = delegate_->GetFrameTree(); |
| 2101 | 2100 |
| 2102 frame_tree->ResetForMainFrameSwap(); | 2101 frame_tree->ResetForMainFrameSwap(); |
| 2103 if (main_frame_id() != FrameTreeNode::kInvalidFrameId) { | 2102 if (main_frame_id() != FrameTreeNode::kInvalidFrameId) { |
| 2104 frame_tree->OnFirstNavigationAfterSwap(main_frame_id()); | 2103 frame_tree->OnFirstNavigationAfterSwap(main_frame_id()); |
| 2105 } | 2104 } |
| 2106 } | 2105 } |
| 2107 | 2106 |
| 2108 } // namespace content | 2107 } // namespace content |
| OLD | NEW |