diff options
author | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-10-01 22:38:41 +0000 |
---|---|---|
committer | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-10-01 22:38:41 +0000 |
commit | 1cc58eb6c60596263644daebd0a9c923ba7db2f4 (patch) | |
tree | 0b0fb5e193d5b597b2699537b02336bd42c2c373 /chrome/browser/host_zoom_map.cc | |
parent | 41cc711b8db94684e5cfc8c300f1a66714396c88 (diff) | |
download | chromium_src-1cc58eb6c60596263644daebd0a9c923ba7db2f4.zip chromium_src-1cc58eb6c60596263644daebd0a9c923ba7db2f4.tar.gz chromium_src-1cc58eb6c60596263644daebd0a9c923ba7db2f4.tar.bz2 |
Get rid of ZOOM_LEVEL_IS_DOUBLE code since WebKit is rolled.
Review URL: http://codereview.chromium.org/3575009
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@61244 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/host_zoom_map.cc')
-rw-r--r-- | chrome/browser/host_zoom_map.cc | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/chrome/browser/host_zoom_map.cc b/chrome/browser/host_zoom_map.cc index 61f5827..5aa8336 100644 --- a/chrome/browser/host_zoom_map.cc +++ b/chrome/browser/host_zoom_map.cc @@ -69,7 +69,6 @@ void HostZoomMap::Load() { if (success) { zoom_level = static_cast<double>(int_zoom_level); // Since the values were once stored as non-clamped, clamp now. -#ifdef ZOOM_LEVEL_IS_DOUBLE double zoom_factor = WebView::zoomLevelToZoomFactor(zoom_level); if (zoom_factor < WebView::minTextSizeMultiplier) { zoom_level = @@ -78,14 +77,6 @@ void HostZoomMap::Load() { zoom_level = WebView::zoomFactorToZoomLevel(WebView::maxTextSizeMultiplier); } -#else - double zoom_factor = std::pow(1.2, zoom_level); - if (zoom_factor < 0.5) { - zoom_level = log(0.5) / log(1.2); - } else if (zoom_factor > 3.0) { - zoom_level = log(3.0) / log(1.2); - } -#endif } } DCHECK(success); |