Revert 96694 - Enabled scaling zoom for TOUCH_UI due to Linux Touch build breakage.

content/renderer/render_view.cc

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/renderer/render_view.h"
 
 #include <algorithm>
 #include <cmath>
 #include <string>
 #include <vector>
@@ skipping 245 matching lines @@
 // content state is modified and not sent to session restore, but this is
 // better than having to wake up all renderers during shutdown.
 static const int kDelaySecondsForContentStateSyncHidden = 5;
 static const int kDelaySecondsForContentStateSync = 1;
 
 // The maximum number of popups that can be spawned from one page.
 static const int kMaximumNumberOfUnacknowledgedPopups = 25;
 
 static const char kBackForwardNavigationScheme[] = "history";
 
-static const float kScalingIncrement = 0.1f;
-
 static void GetRedirectChain(WebDataSource* ds, std::vector<GURL>* result) {
   WebVector<WebURL> urls;
   ds->redirectChain(urls);
   result->reserve(urls.size());
   for (size_t i = 0; i < urls.size(); ++i)
     result->push_back(urls[i]);
 }
 
 static bool WebAccessibilityNotificationToViewHostMsg(
     WebAccessibilityNotification notification,
@@ skipping 3094 matching lines @@
     const std::string& mime_type) {
   return new webkit::npapi::WebPluginImpl(
       frame, params, path, mime_type, AsWeakPtr());
 }
 
 void RenderView::OnZoom(PageZoom::Function function) {
   if (!webview())  // Not sure if this can happen, but no harm in being safe.
     return;
 
   webview()->hidePopups();
-#if !defined(TOUCH_UI)
+
   double old_zoom_level = webview()->zoomLevel();
   double zoom_level;
   if (function == PageZoom::RESET) {
     zoom_level = 0;
   } else if (static_cast<int>(old_zoom_level) == old_zoom_level) {
     // Previous zoom level is a whole number, so just increment/decrement.
     zoom_level = old_zoom_level + function;
   } else {
     // Either the user hit the zoom factor limit and thus the zoom level is now
     // not a whole number, or a plugin changed it to a custom value.  We want
     // to go to the next whole number so that the user can always get back to
     // 100% with the keyboard/menu.
     if ((old_zoom_level > 1 && function > 0) ||
         (old_zoom_level < 1 && function < 0)) {
       zoom_level = static_cast<int>(old_zoom_level + function);
     } else {
       // We're going towards 100%, so first go to the next whole number.
       zoom_level = static_cast<int>(old_zoom_level);
     }
   }
+
   webview()->setZoomLevel(false, zoom_level);
-#else
-  double old_page_scale_factor = webview()->pageScaleFactor();
-  double page_scale_factor;
-  if (function == PageZoom::RESET) {
-    page_scale_factor = 1.0;
-  } else {
-    page_scale_factor = old_page_scale_factor +
-        (function > 0 ? kScalingIncrement : -kScalingIncrement);
-  }
-  webview()->scalePage(page_scale_factor, WebPoint(0, 0));
-#endif
   zoomLevelChanged();
 }
 
 void RenderView::OnSetZoomLevel(double zoom_level) {
   // Don't set zoom level for full-page plugin since they don't use the same
   // zoom settings.
   if (webview()->mainFrame()->document().isPluginDocument())
     return;
 
   webview()->hidePopups();
@@ skipping 1126 matching lines @@
 }
 #endif
 
 void RenderView::OnContextMenuClosed(
     const webkit_glue::CustomContextMenuContext& custom_context) {
   if (custom_context.is_pepper_menu)
     pepper_delegate_.OnContextMenuClosed(custom_context);
   else
     context_menu_node_.reset();
 }