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..8821b27b8af34f4790786cda64ce217f268b2713 100644
--- a/content/shell/renderer/test_runner/event_sender.cc
+++ b/content/shell/renderer/test_runner/event_sender.cc
@@ -2181,12 +2181,17 @@ void EventSender::InitMouseWheelEvent(gin::Arguments* args,
   bool paged = false;
   bool has_precise_scrolling_deltas = false;
   int modifiers = 0;
+  bool suppress_scroll = false;
   if (!args->PeekNext().IsEmpty()) {
     args->GetNext(&paged);
     if (!args->PeekNext().IsEmpty()) {
       args->GetNext(&has_precise_scrolling_deltas);
-      if (!args->PeekNext().IsEmpty())
+      if (!args->PeekNext().IsEmpty()) {
         modifiers = GetKeyModifiersFromV8(args->PeekNext());
+        args->Skip();

[tdresser, 2014/11/27 15:06:08]

Can't you replace 
args->PeekNext(); args->Skip();
with
args->GetNext();
?

[lanwei, 2014/12/02 06:28:54]

Done.

+        if (!args->PeekNext().IsEmpty())
+          args->GetNext(&suppress_scroll);
+      }
     }
   }
 
@@ -2203,7 +2208,7 @@ void EventSender::InitMouseWheelEvent(gin::Arguments* args,
   event->deltaY = event->wheelTicksY;
   event->scrollByPage = paged;
   event->hasPreciseScrollingDeltas = has_precise_scrolling_deltas;
-
+  event->suppressScroll = suppress_scroll;
   if (continuous) {
     event->wheelTicksX /= kScrollbarPixelsPerTick;
     event->wheelTicksY /= kScrollbarPixelsPerTick;