From 1cc58eb6c60596263644daebd0a9c923ba7db2f4 Mon Sep 17 00:00:00 2001 From: "jam@chromium.org" Date: Fri, 1 Oct 2010 22:38:41 +0000 Subject: 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 --- chrome/browser/host_zoom_map.cc | 9 --------- 1 file changed, 9 deletions(-) (limited to 'chrome/browser/host_zoom_map.cc') 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(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); -- cgit v1.1