diff options
| author | tdresser@chromium.org <tdresser@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-03-01 15:40:09 +0000 |
|---|---|---|
| committer | tdresser@chromium.org <tdresser@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-03-01 15:40:09 +0000 |
| commit | 43d9d78406fe298baa50121d75c5d369f47b053d (patch) | |
| tree | 00e6491ac567d37ee453302357c2b301007038f4 /webkit | |
| parent | a39dc844ffe627284581a65c11d62e6a585caf08 (diff) | |
| download | chromium_src-43d9d78406fe298baa50121d75c5d369f47b053d.zip chromium_src-43d9d78406fe298baa50121d75c5d369f47b053d.tar.gz chromium_src-43d9d78406fe298baa50121d75c5d369f47b053d.tar.bz2 | |
Pass DefaultDeviceScaleFactor to webkit
DefaultDeviceScaleFactor will be based solely on the screen DPI, as opposed to DeviceScaleFactor,
which incorporates information from the viewport tag.
This is a follow-up to: https://bugs.webkit.org/show_bug.cgi?id=79534
BUG=115231
TEST=None
Review URL: http://codereview.chromium.org/9500015
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@124411 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit')
| -rw-r--r-- | webkit/glue/webpreferences.cc | 2 | ||||
| -rw-r--r-- | webkit/glue/webpreferences.h | 1 |
2 files changed, 3 insertions, 0 deletions
diff --git a/webkit/glue/webpreferences.cc b/webkit/glue/webpreferences.cc index c1552d1..f30f594 100644 --- a/webkit/glue/webpreferences.cc +++ b/webkit/glue/webpreferences.cc @@ -36,6 +36,7 @@ WebPreferences::WebPreferences() default_fixed_font_size(13), minimum_font_size(0), minimum_logical_font_size(6), + default_device_scale_factor(1), default_encoding("ISO-8859-1"), javascript_enabled(true), web_security_enabled(true), @@ -186,6 +187,7 @@ void WebPreferences::Apply(WebView* web_view) const { settings->setDefaultFixedFontSize(default_fixed_font_size); settings->setMinimumFontSize(minimum_font_size); settings->setMinimumLogicalFontSize(minimum_logical_font_size); + settings->setDefaultDeviceScaleFactor(default_device_scale_factor); settings->setDefaultTextEncodingName(ASCIIToUTF16(default_encoding)); settings->setJavaScriptEnabled(javascript_enabled); settings->setWebSecurityEnabled(web_security_enabled); diff --git a/webkit/glue/webpreferences.h b/webkit/glue/webpreferences.h index e3a9664..08b0784 100644 --- a/webkit/glue/webpreferences.h +++ b/webkit/glue/webpreferences.h @@ -43,6 +43,7 @@ struct WEBKIT_GLUE_EXPORT WebPreferences { int default_fixed_font_size; int minimum_font_size; int minimum_logical_font_size; + int default_device_scale_factor; std::string default_encoding; bool javascript_enabled; bool web_security_enabled; |