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 320 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
331 params.swapped_out = !is_active_; | 331 params.swapped_out = !is_active_; |
332 params.replicated_frame_state = replicated_frame_state; | 332 params.replicated_frame_state = replicated_frame_state; |
333 params.proxy_routing_id = proxy_route_id; | 333 params.proxy_routing_id = proxy_route_id; |
334 params.hidden = GetWidget()->is_hidden(); | 334 params.hidden = GetWidget()->is_hidden(); |
335 params.never_visible = delegate_->IsNeverVisible(); | 335 params.never_visible = delegate_->IsNeverVisible(); |
336 params.window_was_created_with_opener = window_was_created_with_opener; | 336 params.window_was_created_with_opener = window_was_created_with_opener; |
337 params.next_page_id = next_page_id; | 337 params.next_page_id = next_page_id; |
338 params.enable_auto_resize = GetWidget()->auto_resize_enabled(); | 338 params.enable_auto_resize = GetWidget()->auto_resize_enabled(); |
339 params.min_size = GetWidget()->min_size_for_auto_resize(); | 339 params.min_size = GetWidget()->min_size_for_auto_resize(); |
340 params.max_size = GetWidget()->max_size_for_auto_resize(); | 340 params.max_size = GetWidget()->max_size_for_auto_resize(); |
| 341 params.page_zoom_level = delegate_->GetPendingPageZoomLevel(); |
341 GetWidget()->GetResizeParams(¶ms.initial_size); | 342 GetWidget()->GetResizeParams(¶ms.initial_size); |
342 | 343 |
343 if (!Send(new ViewMsg_New(params))) | 344 if (!Send(new ViewMsg_New(params))) |
344 return false; | 345 return false; |
345 GetWidget()->SetInitialRenderSizeParams(params.initial_size); | 346 GetWidget()->SetInitialRenderSizeParams(params.initial_size); |
346 | 347 |
347 // If the RWHV has not yet been set, the surface ID namespace will get | 348 // If the RWHV has not yet been set, the surface ID namespace will get |
348 // passed down by the call to SetView(). | 349 // passed down by the call to SetView(). |
349 if (GetWidget()->GetView()) { | 350 if (GetWidget()->GetView()) { |
350 Send(new ViewMsg_SetSurfaceIdNamespace( | 351 Send(new ViewMsg_SetSurfaceIdNamespace( |
(...skipping 998 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1349 } else { | 1350 } else { |
1350 render_view_ready_on_process_launch_ = true; | 1351 render_view_ready_on_process_launch_ = true; |
1351 } | 1352 } |
1352 } | 1353 } |
1353 | 1354 |
1354 void RenderViewHostImpl::RenderViewReady() { | 1355 void RenderViewHostImpl::RenderViewReady() { |
1355 delegate_->RenderViewReady(this); | 1356 delegate_->RenderViewReady(this); |
1356 } | 1357 } |
1357 | 1358 |
1358 } // namespace content | 1359 } // namespace content |
OLD | NEW |