Scroll zooming

content/browser/web_contents/web_contents_view_gtk.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/browser/web_contents/web_contents_view_gtk.h"
 
 #include <gdk/gdk.h>
 #include <gdk/gdkkeysyms.h>
 #include <gtk/gtk.h>
 
@@ skipping 35 matching lines @@
 
 // Called when the mouse moves within the widget. We notify our delegate.
 gboolean OnMouseMove(GtkWidget* widget, GdkEventMotion* event,
                      WebContentsImpl* web_contents) {
   if (web_contents->GetDelegate())
     web_contents->GetDelegate()->ContentsMouseEvent(
         web_contents, gfx::Point(event->x_root, event->y_root), true);
   return FALSE;
 }
 
-// See tab_contents_view_views.cc for discussion of mouse scroll zooming.
-gboolean OnMouseScroll(GtkWidget* widget, GdkEventScroll* event,
-                       WebContentsImpl* web_contents) {
-  if ((event->state & gtk_accelerator_get_default_mod_mask()) !=
-      GDK_CONTROL_MASK) {
-    return FALSE;
-  }
-
-  WebContentsDelegate* delegate = web_contents->GetDelegate();
-  if (!delegate)
-    return FALSE;
-
-  if (!(event->direction == GDK_SCROLL_DOWN ||
-        event->direction == GDK_SCROLL_UP)) {
-    return FALSE;
-  }
-
-  delegate->ContentsZoomChange(event->direction == GDK_SCROLL_UP);
-  return TRUE;
-}
-
 }  // namespace
 
 WebContentsViewPort* CreateWebContentsView(
     WebContentsImpl* web_contents,
     WebContentsViewDelegate* delegate,
     RenderViewHostDelegateView** render_view_host_delegate_view) {
   WebContentsViewGtk* rv = new WebContentsViewGtk(web_contents, delegate);
   *render_view_host_delegate_view = rv;
   return rv;
 }
@@ skipping 125 matching lines @@
 
   RenderWidgetHostView* view =
       RenderWidgetHostView::CreateViewForWidget(render_widget_host);
   view->InitAsChild(NULL);
   gfx::NativeView content_view = view->GetNativeView();
   g_signal_connect(content_view, "focus", G_CALLBACK(OnFocusThunk), this);
   g_signal_connect(content_view, "leave-notify-event",
                    G_CALLBACK(OnLeaveNotify), web_contents_);
   g_signal_connect(content_view, "motion-notify-event",
                    G_CALLBACK(OnMouseMove), web_contents_);
-  g_signal_connect(content_view, "scroll-event",
-                   G_CALLBACK(OnMouseScroll), web_contents_);
   gtk_widget_add_events(content_view, GDK_LEAVE_NOTIFY_MASK |
                         GDK_POINTER_MOTION_MASK);
   InsertIntoContentArea(content_view);
 
   if (render_widget_host->IsRenderView()) {
     RenderViewHost* rvh = RenderViewHost::From(render_widget_host);
     // If |rvh| is already the current render view host for the web contents, we
     // need to initialize |drag_dest_| for drags to be properly handled.
     // Otherwise, |drag_dest_| will be updated in RenderViewSwappedIn. The
     // reason we can't simply check that this isn't a swapped-out view is
@@ skipping 188 matching lines @@
   // We manually tell our RWHV to resize the renderer content.  This avoids
   // spurious resizes from GTK+.
   RenderWidgetHostView* rwhv = web_contents_->GetRenderWidgetHostView();
   if (rwhv)
     rwhv->SetSize(size);
   if (web_contents_->GetInterstitialPage())
     web_contents_->GetInterstitialPage()->SetSize(size);
 }
 
 }  // namespace content