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

Unified Diff: content/browser/renderer_host/input/input_router_impl_perftest.cc

Issue 2569273002: Add constructors to WebInputEvents and setters so we can work at cleaning up these public structs. (Closed)
Patch Set: Rebase Created 3 years, 12 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
Index: content/browser/renderer_host/input/input_router_impl_perftest.cc
diff --git a/content/browser/renderer_host/input/input_router_impl_perftest.cc b/content/browser/renderer_host/input/input_router_impl_perftest.cc
index 4511d65b23bf7c48ad1ae55a61fd61847e57301d..4249df274eb90fb53dd75a2d96b469e27c4662c1 100644
--- a/content/browser/renderer_host/input/input_router_impl_perftest.cc
+++ b/content/browser/renderer_host/input/input_router_impl_perftest.cc
@@ -17,6 +17,7 @@
#include "ipc/ipc_sender.h"
#include "testing/gtest/include/gtest/gtest.h"
#include "testing/perf/perf_test.h"
+#include "ui/events/base_event_utils.h"
#include "ui/events/blink/web_input_event_traits.h"
#include "ui/gfx/geometry/vector2d_f.h"
@@ -125,13 +126,14 @@ Gestures BuildScrollSequence(size_t steps,
Gestures gestures;
const gfx::Vector2dF delta = ScaleVector2d(distance, 1.f / steps);
- WebGestureEvent gesture;
- gesture.type = WebInputEvent::GestureScrollBegin;
+ WebGestureEvent gesture(WebInputEvent::GestureScrollBegin,
+ WebInputEvent::NoModifiers,
+ ui::EventTimeStampToSeconds(ui::EventTimeForNow()));
gesture.x = origin.x();
gesture.y = origin.y();
gestures.push_back(gesture);
- gesture.type = WebInputEvent::GestureScrollUpdate;
+ gesture.setType(WebInputEvent::GestureScrollUpdate);
gesture.data.scrollUpdate.deltaX = delta.x();
gesture.data.scrollUpdate.deltaY = delta.y();
for (size_t i = 0; i < steps; ++i) {
@@ -140,7 +142,7 @@ Gestures BuildScrollSequence(size_t steps,
gestures.push_back(gesture);
}
- gesture.type = WebInputEvent::GestureScrollEnd;
+ gesture.setType(WebInputEvent::GestureScrollEnd);
gestures.push_back(gesture);
return gestures;
}
@@ -152,9 +154,9 @@ Touches BuildTouchSequence(size_t steps,
Touches touches;
const gfx::Vector2dF delta = ScaleVector2d(distance, 1.f / steps);
- WebTouchEvent touch;
+ WebTouchEvent touch(WebInputEvent::TouchStart, WebInputEvent::NoModifiers,
+ ui::EventTimeStampToSeconds(ui::EventTimeForNow()));
touch.touchesLength = 1;
- touch.type = WebInputEvent::TouchStart;
touch.touches[0].id = 0;
touch.touches[0].state = WebTouchPoint::StatePressed;
touch.touches[0].position.x = origin.x();
@@ -163,7 +165,7 @@ Touches BuildTouchSequence(size_t steps,
touch.touches[0].screenPosition.y = origin.y();
touches.push_back(touch);
- touch.type = WebInputEvent::TouchMove;
+ touch.setType(WebInputEvent::TouchMove);
touch.touches[0].state = WebTouchPoint::StateMoved;
for (size_t i = 0; i < steps; ++i) {
touch.touches[0].position.x += delta.x();
@@ -173,7 +175,7 @@ Touches BuildTouchSequence(size_t steps,
touches.push_back(touch);
}
- touch.type = WebInputEvent::TouchEnd;
+ touch.setType(WebInputEvent::TouchEnd);
touch.touches[0].state = WebTouchPoint::StateReleased;
touches.push_back(touch);
return touches;

Powered by Google App Engine
This is Rietveld 408576698