Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1002)

Unified Diff: content/shell/renderer/test_runner/EventSender.cpp

Issue 183473002: EventSender: Allow modifiers to be set for wheel events (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/shell/renderer/test_runner/EventSender.cpp
diff --git a/content/shell/renderer/test_runner/EventSender.cpp b/content/shell/renderer/test_runner/EventSender.cpp
index 4d2653e5f737d799bbfd69a81737af2f1a13ebd7..a81b9edff552a887b05f4d648f907eb687f917e6 100644
--- a/content/shell/renderer/test_runner/EventSender.cpp
+++ b/content/shell/renderer/test_runner/EventSender.cpp
@@ -1163,6 +1163,7 @@ void EventSender::initMouseWheelEvent(const CppArgumentList& arguments, CppVaria
int vertical = arguments[1].toInt32();
int paged = false;
int hasPreciseScrollingDeltas = false;
+ int modifiers = 0;
if (arguments.size() > 2 && arguments[2].isBool())
paged = arguments[2].toBoolean();
@@ -1170,7 +1171,10 @@ void EventSender::initMouseWheelEvent(const CppArgumentList& arguments, CppVaria
if (arguments.size() > 3 && arguments[3].isBool())
hasPreciseScrollingDeltas = arguments[3].toBoolean();
- initMouseEvent(WebInputEvent::MouseWheel, pressedButton, lastMousePos, event, getCurrentEventTimeSec(m_delegate), 0);
+ if (arguments.size() > 4 && (arguments[4].isObject() || arguments[4].isString()))
+ modifiers = getKeyModifiers(&(arguments[4]));
+
+ initMouseEvent(WebInputEvent::MouseWheel, pressedButton, lastMousePos, event, getCurrentEventTimeSec(m_delegate), modifiers);
event->wheelTicksX = static_cast<float>(horizontal);
event->wheelTicksY = static_cast<float>(vertical);
event->deltaX = event->wheelTicksX;
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698