Scroll zooming

content/browser/renderer_host/render_widget_host_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/browser/renderer_host/render_widget_host_impl.h"
 
 #include <math.h>
 #include <set>
 #include <utility>
 
@@ skipping 970 matching lines @@
       MouseWheelEventWithLatencyInfo(wheel_event,
                                      CreateRWHLatencyInfoIfNotExist(NULL)));
 }
 
 void RenderWidgetHostImpl::ForwardWheelEventWithLatencyInfo(
     const MouseWheelEventWithLatencyInfo& wheel_event) {
   TRACE_EVENT0("input", "RenderWidgetHostImpl::ForwardWheelEvent");
   if (IgnoreInputEvents())
     return;
 
-  if (delegate_->PreHandleWheelEvent(wheel_event.event))
-    return;
 
   input_router_->SendWheelEvent(wheel_event);
 }
 
 void RenderWidgetHostImpl::ForwardGestureEvent(
     const blink::WebGestureEvent& gesture_event) {
   ForwardGestureEventWithLatencyInfo(gesture_event, ui::LatencyInfo());
 }
 
 void RenderWidgetHostImpl::ForwardGestureEventWithLatencyInfo(
@@ skipping 1033 matching lines @@
   if (!wheel_event.latency.FindLatency(
           ui::INPUT_EVENT_LATENCY_RENDERING_SCHEDULED_COMPONENT, 0, NULL)) {
     // MouseWheelEvent latency ends when it is acked but does not cause any
     // rendering scheduled.
     ui::LatencyInfo latency = wheel_event.latency;
     latency.AddLatencyNumber(
         ui::INPUT_EVENT_LATENCY_TERMINATED_MOUSE_COMPONENT, 0, 0);
   }
 
   const bool processed = (INPUT_EVENT_ACK_STATE_CONSUMED == ack_result);
+  if (!processed) {
+    if (delegate_->PreHandleWheelEvent(wheel_event.event))
+      return;
+  }
   if (!processed && !is_hidden() && view_)
     view_->UnhandledWheelEvent(wheel_event.event);
 }
 
 void RenderWidgetHostImpl::OnGestureEventAck(
     const GestureEventWithLatencyInfo& event,
     InputEventAckState ack_result) {
   if (!event.latency.FindLatency(
           ui::INPUT_EVENT_LATENCY_RENDERING_SCHEDULED_COMPONENT, 0, NULL)) {
     // GestureEvent latency ends when it is acked but does not cause any
@@ skipping 428 matching lines @@
         continue;
       }
       RenderWidgetHostImpl* rwhi = RenderWidgetHostImpl::From(rwh);
       if (rwhi_set.insert(rwhi).second)
         rwhi->FrameSwapped(latency_info);
     }
   }
 }
 
 }  // namespace content