Explicitly suppress scrolling for wheel events that will trigger zooming

content/common/input/web_input_event_traits.cc

 // Copyright 2013 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/common/input/web_input_event_traits.h"
 
 #include <bitset>
 #include <limits>
 
 #include "base/logging.h"
@@ skipping 40 matching lines @@
                 event.globalY,
                 event.movementX,
                 event.movementY,
                 event.clickCount);
 }
 
 void ApppendEventDetails(const WebMouseWheelEvent& event, std::string* result) {
   StringAppendF(result,
                 "{\n Delta: (%f, %f)\n WheelTicks: (%f, %f)\n Accel: (%f, %f)\n"
                 " ScrollByPage: %d\n HasPreciseScrollingDeltas: %d\n"
-                " Phase: (%d, %d)\n CanRubberband: (%d, %d)\n}",
+                " Phase: (%d, %d)\n CanRubberband: (%d, %d)\n CanScroll: %d\n}",
                 event.deltaX,
                 event.deltaY,
                 event.wheelTicksX,
                 event.wheelTicksY,
                 event.accelerationRatioX,
                 event.accelerationRatioY,
                 event.scrollByPage,
                 event.hasPreciseScrollingDeltas,
                 event.phase,
                 event.momentumPhase,
                 event.canRubberbandLeft,
-                event.canRubberbandRight);
+                event.canRubberbandRight,
+                event.canScroll);
 }
 
 void ApppendEventDetails(const WebGestureEvent& event, std::string* result) {
   StringAppendF(result,
                 "{\n Pos: (%d, %d)\n GlobalPos: (%d, %d)\n SourceDevice: %d\n"
                 " RawData: (%f, %f, %f, %f, %d)\n}",
                 event.x,
                 event.y,
                 event.globalX,
                 event.globalY,
@@ skipping 58 matching lines @@
   event->movementY += y;
 }
 
 bool CanCoalesce(const WebMouseWheelEvent& event_to_coalesce,
                  const WebMouseWheelEvent& event) {
   return event.modifiers == event_to_coalesce.modifiers &&
          event.scrollByPage == event_to_coalesce.scrollByPage &&
          event.phase == event_to_coalesce.phase &&
          event.momentumPhase == event_to_coalesce.momentumPhase &&
          event.hasPreciseScrollingDeltas ==
-             event_to_coalesce.hasPreciseScrollingDeltas;
+             event_to_coalesce.hasPreciseScrollingDeltas &&
+         event.canScroll == event_to_coalesce.canScroll;
 }
 
 float GetUnacceleratedDelta(float accelerated_delta, float acceleration_ratio) {
   return accelerated_delta * acceleration_ratio;
 }
 
 float GetAccelerationRatio(float accelerated_delta, float unaccelerated_delta) {
   if (unaccelerated_delta == 0.f || accelerated_delta == 0.f)
     return 1.f;
   return unaccelerated_delta / accelerated_delta;
@@ skipping 316 matching lines @@
     case WebInputEvent::TouchStart:
     case WebInputEvent::TouchMove:
     case WebInputEvent::TouchEnd:
       return !static_cast<const WebTouchEvent&>(event).cancelable;
     default:
       return false;
   }
 }
 
 }  // namespace content