commit f3990fd7b7dad87b1b8c9b9f3dba97f64d06051b
author yutak <yutak@chromium.org> Tue Dec 23 03:52:38 2014
committer Commit bot <commit-bot@chromium.org> Tue Dec 23 03:53:32 2014
tree f9dfe6b81c5a4622b24af242789a0da49c708de1
parent 6cda144fdd3b4ba9f901155a10fc87a78deec204

Revert of Explicitly suppress scrolling for wheel events that will trigger zooming (patchset #10 id:360001 of https://codereview.chromium.org/739013008/)

Reason for revert:
Broke layout tests that use wheel events:
http://build.chromium.org/p/chromium.webkit/builders/WebKit%20XP/builds/15918

Original issue's description:
> Explicitly suppress scrolling for wheel events that will trigger zooming
>
> We added a flag in Blink to decide if Ctrl-wheel-scroll should scroll or zoom, and now we use this flag in chromium code.
>
> This patch is part of a series:
>
> patch #1: https://codereview.chromium.org/759073002
> patch #2: This CL
> patch #3: https://codereview.chromium.org/768443002
>
> BUG=397027, 378755
>
> Committed: https://crrev.com/b3361bcdd3766a67c702c19781154c895fee75ca
> Cr-Commit-Position: refs/heads/master@{#309472}

TBR=rbyers@chromium.org,tdresser@chromium.org,jdduke@chromium.org,sievers@chromium.org,lanwei@chromium.org
NOTREECHECKS=true
NOTRY=true
BUG=397027, 378755

Review URL: https://codereview.chromium.org/819993002

Cr-Commit-Position: refs/heads/master@{#309531}

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 8971ab6..b22fe72 100644
--- a/content/shell/renderer/test_runner/event_sender.cc
+++ b/content/shell/renderer/test_runner/event_sender.cc
@@ -2207,21 +2207,14 @@
   bool paged = false;
   bool has_precise_scrolling_deltas = false;
   int modifiers = 0;
-  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);
+  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());
+    }
+  }
 
   InitMouseEvent(WebInputEvent::MouseWheel,
                  pressed_button_,
@@ -2236,7 +2229,7 @@
   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;