Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1235)

Unified Diff: content/renderer/render_view_impl.cc

Issue 964403003: Make it possible to set the display mode from Chromium (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Re-enable test for Android, force "was resized" IPC message there. Created 5 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « content/public/test/render_view_test.cc ('k') | content/renderer/render_widget.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/renderer/render_view_impl.cc
diff --git a/content/renderer/render_view_impl.cc b/content/renderer/render_view_impl.cc
index 9a4a22ccb4c0ab6cf4b02b0dcfd958da43a5a15b..9e0c4207e80039bff552964d85310cd9972ffedf 100644
--- a/content/renderer/render_view_impl.cc
+++ b/content/renderer/render_view_impl.cc
@@ -671,6 +671,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);
@@ -725,6 +726,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(
@@ -2688,6 +2690,7 @@ void RenderViewImpl::OnDisableAutoResize(const gfx::Size& new_size) {
visible_viewport_size_,
resizer_rect_,
is_fullscreen_granted_,
+ display_mode_,
NO_RESIZE_ACK);
}
}
@@ -2875,6 +2878,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_;
@@ -3696,6 +3703,7 @@ void RenderViewImpl::SetDeviceScaleFactorForTesting(float factor) {
params.top_controls_height = 0.f;
params.resizer_rect = WebRect();
params.is_fullscreen_granted = is_fullscreen_granted();
+ params.display_mode = display_mode_;
OnResize(params);
}
« no previous file with comments | « content/public/test/render_view_test.cc ('k') | content/renderer/render_widget.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698