Explicitly suppress scrolling for wheel events that will trigger zooming

content/shell/renderer/test_runner/event_sender.cc

Index: content/shell/renderer/test_runner/event_sender.cc
diff --git a/content/shell/renderer/test_runner/event_sender.cc b/content/shell/renderer/test_runner/event_sender.cc
index 3265d036385eb38416e5d2da73a9765bc79a976e..9348c5794710dcf2de894831bd288eb6cce6895b 100644
--- a/content/shell/renderer/test_runner/event_sender.cc
+++ b/content/shell/renderer/test_runner/event_sender.cc
@@ -2181,14 +2181,21 @@ void EventSender::InitMouseWheelEvent(gin::Arguments* args,
   bool paged = false;
   bool has_precise_scrolling_deltas = false;
   int modifiers = 0;
-  if (!args->PeekNext().IsEmpty()) {
-    args->GetNext(&paged);
-    if (!args->PeekNext().IsEmpty()) {
-      args->GetNext(&has_precise_scrolling_deltas);
-      if (!args->PeekNext().IsEmpty())
-        modifiers = GetKeyModifiersFromV8(args->PeekNext());
-    }
-  }
+  bool can_scroll = true;
+  if (args->PeekNext().IsEmpty())
+    return;
+  args->GetNext(&paged);
+  if (args->PeekNext().IsEmpty())
+    return;
+  args->GetNext(&has_precise_scrolling_deltas);
+  if (args->PeekNext().IsEmpty())
+    return;
+  v8::Handle<v8::Value> value;
+  args->GetNext(&value);
+  modifiers = GetKeyModifiersFromV8(value);
+  if (args->PeekNext().IsEmpty())
+    return;
+  args->GetNext(&can_scroll);
 
   InitMouseEvent(WebInputEvent::MouseWheel,
                  pressed_button_,
@@ -2203,7 +2210,7 @@ void EventSender::InitMouseWheelEvent(gin::Arguments* args,
   event->deltaY = event->wheelTicksY;
   event->scrollByPage = paged;
   event->hasPreciseScrollingDeltas = has_precise_scrolling_deltas;
-
+  event->canScroll = can_scroll;
   if (continuous) {
     event->wheelTicksX /= kScrollbarPixelsPerTick;
     event->wheelTicksY /= kScrollbarPixelsPerTick;