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

[tdresser, 2014/12/02 15:37:38]

Invert each of these conditions (including the ones you didn't write.)

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);

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

Done.

Thanks for the suggestion, looks much clearer right now.

     if (!args->PeekNext().IsEmpty()) {
       args->GetNext(&has_precise_scrolling_deltas);
-      if (!args->PeekNext().IsEmpty())
-        modifiers = GetKeyModifiersFromV8(args->PeekNext());
+      if (!args->PeekNext().IsEmpty()) {
+        v8::Handle<v8::Value> value;
+        args->GetNext(&value);
+        modifiers = GetKeyModifiersFromV8(value);
+        if (!args->PeekNext().IsEmpty())
+          args->GetNext(&can_scroll);
+      }
     }
   }
 
@@ -2203,7 +2209,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;