Chromium Code Reviews| Index: content/renderer/render_view_impl.cc |
| diff --git a/content/renderer/render_view_impl.cc b/content/renderer/render_view_impl.cc |
| index 02ed7244a4193f196df38a3488c8926478ece467..81a0df0215b5bc1efdfca94e1b289b5a6dfa6c4b 100644 |
| --- a/content/renderer/render_view_impl.cc |
| +++ b/content/renderer/render_view_impl.cc |
| @@ -662,6 +662,7 @@ void RenderViewImpl::Initialize(const ViewMsg_New_Params& params, |
| surface_id_ = params.surface_id; |
| if (params.opener_route_id != MSG_ROUTING_NONE && was_created_by_renderer) |
| opener_id_ = params.opener_route_id; |
| + display_mode_= params.initial_size.display_mode; |
| // Ensure we start with a valid next_page_id_ from the browser. |
| DCHECK_GE(next_page_id_, 0); |
| @@ -718,6 +719,7 @@ void RenderViewImpl::Initialize(const ViewMsg_New_Params& params, |
| g_view_map.Get().insert(std::make_pair(webview(), this)); |
| g_routing_id_view_map.Get().insert(std::make_pair(routing_id_, this)); |
| webview()->setDeviceScaleFactor(device_scale_factor_); |
| + webview()->setDisplayMode(display_mode_); |
| webview()->settings()->setPreferCompositingToLCDTextEnabled( |
| PreferCompositingToLCDText(compositor_deps_, device_scale_factor_)); |
| webview()->settings()->setThreadedScrollingEnabled( |
| @@ -2890,6 +2892,7 @@ void RenderViewImpl::OnDisableAutoResize(const gfx::Size& new_size) { |
| visible_viewport_size_, |
| resizer_rect_, |
| is_fullscreen_, |
| + display_mode_, |
| NO_RESIZE_ACK); |
| } |
| } |
| @@ -3075,6 +3078,10 @@ void RenderViewImpl::OnResize(const ViewMsg_Resize_Params& params) { |
| ShouldDisplayScrollbars(params.new_size.width(), |
| params.new_size.height())); |
| } |
| + if (display_mode_ != params.display_mode) { |
| + display_mode_ = params.display_mode; |
| + webview()->setDisplayMode(display_mode_); |
| + } |
| } |
| gfx::Size old_visible_viewport_size = visible_viewport_size_; |
| @@ -3895,7 +3902,8 @@ void RenderViewImpl::SetDeviceScaleFactorForTesting(float factor) { |
| params.top_controls_shrink_blink_size = false; |
| params.top_controls_height = 0.f; |
| params.resizer_rect = WebRect(); |
| - params.is_fullscreen = is_fullscreen(); |
| + params.is_fullscreen = is_fullscreen_; |
|
scheib
2015/03/27 16:50:51
Dropping the is_fullscreen() accessor should come
|
| + params.display_mode = display_mode_; |
| OnResize(params); |
| } |