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

7 files changed, 3 insertions, 65 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);
diff --git a/chrome/browser/tab_contents/tab_contents.cc b/chrome/browser/tab_contents/tab_contents.cc
index 693532e..731de0e 100644
--- a/chrome/browser/tab_contents/tab_contents.cc
+++ b/chrome/browser/tab_contents/tab_contents.cc
@@ -379,15 +379,10 @@ TabContents::TabContents(Profile* profile,
       opener_dom_ui_type_(DOMUIFactory::kNoDOMUI),
       language_state_(&controller_),
       closed_by_user_gesture_(false),
-#ifdef ZOOM_LEVEL_IS_DOUBLE
       minimum_zoom_percent_(
           static_cast<int>(WebKit::WebView::minTextSizeMultiplier * 100)),
       maximum_zoom_percent_(
           static_cast<int>(WebKit::WebView::maxTextSizeMultiplier * 100)),
-#else
-      minimum_zoom_percent_(50),
-      maximum_zoom_percent_(300),
-#endif
       temporary_zoom_settings_(false) {
   renderer_preferences_util::UpdateFromSystemSettings(
       &renderer_preferences_, profile);
@@ -1511,13 +1506,8 @@ int TabContents::GetZoomPercent(bool* enable_increment,
     zoom_level = zoom_map->GetZoomLevel(GetURL());
   }
 
-#ifdef ZOOM_LEVEL_IS_DOUBLE
   int percent = static_cast<int>(
       WebKit::WebView::zoomLevelToZoomFactor(zoom_level) * 100);
-#else
-  int percent = static_cast<int>(std::pow(1.2, zoom_level) * 100);
-#endif
-
   *enable_decrement = percent > minimum_zoom_percent_;
   *enable_increment = percent < maximum_zoom_percent_;
   return percent;
diff --git a/chrome/renderer/pepper_plugin_delegate_impl.cc b/chrome/renderer/pepper_plugin_delegate_impl.cc
index 426c15a..c3b9f9b 100644
--- a/chrome/renderer/pepper_plugin_delegate_impl.cc
+++ b/chrome/renderer/pepper_plugin_delegate_impl.cc
@@ -742,9 +742,7 @@ std::string PepperPluginDelegateImpl::GetDefaultEncoding() {
 
 void PepperPluginDelegateImpl::ZoomLimitsChanged(double minimum_factor,
                                                  double maximum_factor) {
-#ifdef ZOOM_LEVEL_IS_DOUBLE
   double minimum_level = WebView::zoomFactorToZoomLevel(minimum_factor);
   double maximum_level = WebView::zoomFactorToZoomLevel(maximum_factor);
   render_view_->webview()->zoomLimitsChanged(minimum_level, maximum_level);
-#endif
 }
diff --git a/chrome/renderer/render_thread.cc b/chrome/renderer/render_thread.cc
index ba98a4a..bef96f9 100644
--- a/chrome/renderer/render_thread.cc
+++ b/chrome/renderer/render_thread.cc
@@ -203,11 +203,7 @@ class RenderViewZoomer : public RenderViewVisitor {
       return true;
 
     if (net::GetHostOrSpecFromURL(GURL(webview->mainFrame()->url())) == host_)
-#ifdef ZOOM_LEVEL_IS_DOUBLE
       webview->setZoomLevel(false, zoom_level_);
-#else
-      webview->setZoomLevel(false, static_cast<int>(zoom_level_));
-#endif
     return true;
   }
 
diff --git a/chrome/renderer/render_view.cc b/chrome/renderer/render_view.cc
index ae4b476..3e71d6f 100644
--- a/chrome/renderer/render_view.cc
+++ b/chrome/renderer/render_view.cc
@@ -1392,16 +1392,10 @@ void RenderView::UpdateURL(WebFrame* frame) {
         host_zoom_levels_.find(GURL(request.url()));
     if (webview()->mainFrame()->document().isPluginDocument()) {
       // Reset the zoom levels for plugins.
-#ifdef ZOOM_LEVEL_IS_DOUBLE
       webview()->setZoomLevel(false, 0);
-#endif
     } else {
       if (host_zoom != host_zoom_levels_.end())
-#ifdef ZOOM_LEVEL_IS_DOUBLE
         webview()->setZoomLevel(false, host_zoom->second);
-#else
-        webview()->setZoomLevel(false, static_cast<int>(host_zoom->second));
-#endif
     }
 
     if (host_zoom != host_zoom_levels_.end()) {
@@ -1414,11 +1408,9 @@ void RenderView::UpdateURL(WebFrame* frame) {
     // Reset the zoom limits in case a plugin had changed them previously. This
     // will also call us back which will cause us to send a message to
     // update TabContents.
-#ifdef ZOOM_LEVEL_IS_DOUBLE
     webview()->zoomLimitsChanged(
         WebView::zoomFactorToZoomLevel(WebView::minTextSizeMultiplier),
         WebView::zoomFactorToZoomLevel(WebView::maxTextSizeMultiplier));
-#endif
 
     // Update contents MIME type for main frame.
     params.contents_mime_type = ds->response().mimeType().utf8();
@@ -4080,7 +4072,6 @@ void RenderView::OnZoom(PageZoom::Function function) {
 
   webview()->hidePopups();
 
-#ifdef ZOOM_LEVEL_IS_DOUBLE
   double old_zoom_level = webview()->zoomLevel();
   double zoom_level;
   if (function == PageZoom::RESET) {
@@ -4104,12 +4095,6 @@ void RenderView::OnZoom(PageZoom::Function function) {
 
   webview()->setZoomLevel(false, zoom_level);
   zoomLevelChanged();
-#else
-  int zoom_level = webview()->zoomLevel();
-  webview()->setZoomLevel(false,
-      (function == PageZoom::RESET) ? 0 : (zoom_level + function));
-  zoomLevelChanged();
-#endif
 }
 
 void RenderView::OnSetContentSettingsForLoadingURL(
@@ -5868,15 +5853,10 @@ void RenderView::zoomLimitsChanged(double minimum_level, double maximum_level) {
   // different).
   bool remember = !webview()->mainFrame()->document().isPluginDocument();
 
-#ifdef ZOOM_LEVEL_IS_DOUBLE
   int minimum_percent = static_cast<int>(
       WebView::zoomLevelToZoomFactor(minimum_level) * 100);
   int maximum_percent = static_cast<int>(
       WebView::zoomLevelToZoomFactor(maximum_level) * 100);
-#else
-  int minimum_percent = static_cast<int>(std::pow(1.2, minimum_level) * 100);
-  int maximum_percent = static_cast<int>(std::pow(1.2, minimum_level) * 100);
-#endif
 
   Send(new ViewHostMsg_UpdateZoomLimits(
       routing_id_, minimum_percent, maximum_percent, remember));
@@ -5885,18 +5865,11 @@ void RenderView::zoomLimitsChanged(double minimum_level, double maximum_level) {
 void RenderView::zoomLevelChanged() {
   bool remember = !webview()->mainFrame()->document().isPluginDocument();
 
-  double zoom_level = webview()->zoomLevel();
-#ifndef ZOOM_LEVEL_IS_DOUBLE
-  // Clamp down since we just got an integer.
-  double minimum_level = log(0.5) / log(1.2);
-  double maximum_level = log(3.0) / log(1.2);
-  zoom_level = std::max(std::min(zoom_level, maximum_level), minimum_level);
-#endif
-
   // Tell the browser which url got zoomed so it can update the menu and the
   // saved values if necessary
   Send(new ViewHostMsg_DidZoomURL(
-      routing_id_, zoom_level, remember, GURL(webview()->mainFrame()->url())));
+      routing_id_, webview()->zoomLevel(), remember,
+      GURL(webview()->mainFrame()->url())));
 }
 
 bool RenderView::IsNonLocalTopLevelNavigation(
diff --git a/webkit/glue/plugins/pepper_plugin_instance.cc b/webkit/glue/plugins/pepper_plugin_instance.cc
index b59539d..dd399f3 100644
--- a/webkit/glue/plugins/pepper_plugin_instance.cc
+++ b/webkit/glue/plugins/pepper_plugin_instance.cc
@@ -232,13 +232,11 @@ const PPB_Fullscreen_Dev ppb_fullscreen = {
 };
 
 void ZoomChanged(PP_Instance instance_id, double factor) {
-#ifdef ZOOM_LEVEL_IS_DOUBLE
   PluginInstance* instance = PluginInstance::FromPPInstance(instance_id);
   if (!instance)
     return;
   double zoom_level = WebView::zoomFactorToZoomLevel(factor);
   instance->container()->zoomLevelChanged(zoom_level);
-#endif
 }
 
 void ZoomLimitsChanged(PP_Instance instance_id,
@@ -249,12 +247,10 @@ void ZoomLimitsChanged(PP_Instance instance_id,
     return;
   }
 
-#ifdef ZOOM_LEVEL_IS_DOUBLE
   PluginInstance* instance = PluginInstance::FromPPInstance(instance_id);
   if (!instance)
     return;
   instance->delegate()->ZoomLimitsChanged(minimum_factor, maximium_factor);
-#endif
 }
 
 const PPB_Zoom_Dev ppb_zoom = {
diff --git a/webkit/glue/plugins/pepper_webplugin_impl.cc b/webkit/glue/plugins/pepper_webplugin_impl.cc
index 0cea7219..86fcd83 100644
--- a/webkit/glue/plugins/pepper_webplugin_impl.cc
+++ b/webkit/glue/plugins/pepper_webplugin_impl.cc
@@ -170,13 +170,7 @@ WebKit::WebString WebPluginImpl::selectionAsMarkup() const {
 }
 
 void WebPluginImpl::setZoomLevel(double level, bool text_only) {
-#ifdef ZOOM_LEVEL_IS_DOUBLE
-  double factor = WebView::zoomLevelToZoomFactor(level);
-#else
-  double factor = std::pow(1.2, level);
-#endif
-
-  instance_->Zoom(factor, text_only);
+  instance_->Zoom(WebView::zoomLevelToZoomFactor(level), text_only);
 }
 
 bool WebPluginImpl::startFind(const WebKit::WebString& search_text,