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

Unified Diff: content/renderer/render_view_impl.cc

Issue 9500015: Pass DefaultDeviceScaleFactor to webkit (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Style nit Created 8 years, 10 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/renderer/render_view_impl.h ('k') | webkit/glue/webpreferences.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 8a65eb4971e4bcf88072deabaec7c37518fa4002..f560e29dbb57798d9c3248271e4f8de31c27743e 100644
--- a/content/renderer/render_view_impl.cc
+++ b/content/renderer/render_view_impl.cc
@@ -540,9 +540,6 @@ RenderViewImpl::RenderViewImpl(
webview()->enableFixedLayoutMode(enable_fixed_layout);
if (enable_fixed_layout)
webview()->settings()->setFixedElementsLayoutRelativeToFrame(true);
- base::StringToInt(command_line.GetSwitchValueASCII(
- switches::kDefaultDeviceScaleFactor),
- &default_device_scale_factor_);
content::GetContentClient()->renderer()->RenderViewCreated(this);
}
@@ -4417,9 +4414,9 @@ void RenderViewImpl::OnResize(const gfx::Size& new_size,
bool is_fullscreen) {
if (webview()) {
// This setting has no effect if fixed layout is not enabled.
- if (default_device_scale_factor_)
+ if (webkit_preferences_.default_device_scale_factor)
webview()->settings()->setLayoutFallbackWidth(
- new_size.width() / default_device_scale_factor_);
+ new_size.width() / webkit_preferences_.default_device_scale_factor);
webview()->hidePopups();
if (send_preferred_size_changes_) {
webview()->mainFrame()->setCanHaveScrollbars(
« no previous file with comments | « content/renderer/render_view_impl.h ('k') | webkit/glue/webpreferences.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698