Allow zoom-in as alternative to popup when tapping multiple targets.

content/renderer/render_view_impl.cc

 // Copyright (c) 2012 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_impl.h"
 
 #include <algorithm>
 #include <cmath>
 
 #include "base/auto_reset.h"
@@ skipping 6685 matching lines @@
       event.data.tap.width, event.data.tap.height);
   gfx::Rect zoom_rect;
   float new_total_scale =
       DisambiguationPopupHelper::ComputeZoomAreaAndScaleFactor(
           finger_rect, target_rects, GetSize(),
           gfx::Rect(webview()->mainFrame()->visibleContentRect()).size(),
           device_scale_factor_ * webview()->pageScaleFactor(), &zoom_rect);
   if (!new_total_scale)
     return false;
 
-  gfx::Size canvas_size = gfx::ToCeiledSize(gfx::ScaleSize(zoom_rect.size(),
-                                                           new_total_scale));
-  TransportDIB* transport_dib = NULL;
-  {
-    scoped_ptr<skia::PlatformCanvas> canvas(
-        RenderProcess::current()->GetDrawingCanvas(&transport_dib,
-                                                   gfx::Rect(canvas_size)));
-    if (!canvas)
-      return false;
+  DidTapMultipleTargetsStrategy multitarget_strategy =
+    renderer_preferences_.did_tap_multiple_targets_strategy;
+  if (multitarget_strategy == MULTITARGET_ZOOM) {
+      return webview()->zoomToMultipleTargetsRect(zoom_rect);
+  } else if (multitarget_strategy == MULTITARGET_POPUP) {
+      gfx::Size canvas_size =
+          gfx::ToCeiledSize(gfx::ScaleSize(zoom_rect.size(), new_total_scale));
+      TransportDIB* transport_dib = NULL;
+      {
+        scoped_ptr<skia::PlatformCanvas> canvas(
+            RenderProcess::current()->GetDrawingCanvas(&transport_dib,
+                                                       gfx::Rect(canvas_size)));
+        if (!canvas)
+          return false;
 
-    // TODO(trchen): Cleanup the device scale factor mess.
-    // device scale will be applied in WebKit
-    // --> zoom_rect doesn't include device scale,
-    //     but WebKit will still draw on zoom_rect * device_scale_factor_
-    canvas->scale(new_total_scale / device_scale_factor_,
-                  new_total_scale / device_scale_factor_);
-    canvas->translate(-zoom_rect.x() * device_scale_factor_,
-                      -zoom_rect.y() * device_scale_factor_);
+        // TODO(trchen): Cleanup the device scale factor mess.
+        // device scale will be applied in WebKit
+        // --> zoom_rect doesn't include device scale,
+        //     but WebKit will still draw on zoom_rect * device_scale_factor_
+        canvas->scale(new_total_scale / device_scale_factor_,
+                      new_total_scale / device_scale_factor_);
+        canvas->translate(-zoom_rect.x() * device_scale_factor_,
+                          -zoom_rect.y() * device_scale_factor_);
 
-    webwidget_->paint(webkit_glue::ToWebCanvas(canvas.get()), zoom_rect,
-        WebWidget::ForceSoftwareRenderingAndIgnoreGPUResidentContent);
+        webwidget_->paint(webkit_glue::ToWebCanvas(canvas.get()), zoom_rect,
+            WebWidget::ForceSoftwareRenderingAndIgnoreGPUResidentContent);
+      }
+
+      gfx::Rect physical_window_zoom_rect = gfx::ToEnclosingRect(
+          ClientRectToPhysicalWindowRect(gfx::RectF(zoom_rect)));
+      Send(new ViewHostMsg_ShowDisambiguationPopup(routing_id_,
+                                                   physical_window_zoom_rect,
+                                                   canvas_size,
+                                                   transport_dib->id()));
+  } else {
+    return false;
   }
 
-  gfx::Rect physical_window_zoom_rect = gfx::ToEnclosingRect(
-      ClientRectToPhysicalWindowRect(gfx::RectF(zoom_rect)));
-  Send(new ViewHostMsg_ShowDisambiguationPopup(routing_id_,
-                                               physical_window_zoom_rect,
-                                               canvas_size,
-                                               transport_dib->id()));
-
   return true;
 }
 
 skia::RefPtr<SkPicture> RenderViewImpl::CapturePicture() {
   return compositor_ ? compositor_->CapturePicture() :
       skia::RefPtr<SkPicture>();
 }
 #endif
 
 unsigned RenderViewImpl::GetLocalSessionHistoryLengthForTesting() const {
@@ skipping 72 matching lines @@
     WebURL url = icon_urls[i].iconURL();
     if (!url.isEmpty())
       urls.push_back(FaviconURL(url,
                                 ToFaviconType(icon_urls[i].iconType())));
   }
   SendUpdateFaviconURL(urls);
 }
 
 
 }  // namespace content