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 /content/browser/tab_contents/tab_contents.cc | |
| 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 'content/browser/tab_contents/tab_contents.cc')
| -rw-r--r-- | content/browser/tab_contents/tab_contents.cc | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/content/browser/tab_contents/tab_contents.cc b/content/browser/tab_contents/tab_contents.cc index 6e2a2e3..c760413 100644 --- a/content/browser/tab_contents/tab_contents.cc +++ b/content/browser/tab_contents/tab_contents.cc @@ -10,6 +10,7 @@ #include "base/metrics/histogram.h" #include "base/metrics/stats_counters.h" #include "base/string16.h" +#include "base/string_number_conversions.h" #include "base/string_util.h" #include "base/time.h" #include "base/utf_string_conversions.h" @@ -460,6 +461,13 @@ WebPreferences TabContents::GetWebkitPrefs(RenderViewHost* rvh, prefs.accelerated_2d_canvas_enabled = false; } + int default_device_scale_factor; + base::StringToInt(command_line.GetSwitchValueASCII( + switches::kDefaultDeviceScaleFactor), + &default_device_scale_factor); + + prefs.default_device_scale_factor = default_device_scale_factor; + content::GetContentClient()->browser()->OverrideWebkitPrefs(rvh, &prefs); return prefs; |