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

Unified Diff: content/common/input/synthetic_web_input_event_builders.cc

Issue 304793003: use enum to specify deviceSource for fling animation. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: removed desired #include Created 6 years, 7 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/common/input/synthetic_web_input_event_builders.cc
diff --git a/content/common/input/synthetic_web_input_event_builders.cc b/content/common/input/synthetic_web_input_event_builders.cc
index 2fcca34afb73bc9878c14511225ca545da3b58ef..0da80b470e7cd4f058c963bfc8efa3c5ba5ce645 100644
--- a/content/common/input/synthetic_web_input_event_builders.cc
+++ b/content/common/input/synthetic_web_input_event_builders.cc
@@ -82,7 +82,7 @@ WebKeyboardEvent SyntheticWebKeyboardEventBuilder::Build(
WebGestureEvent SyntheticWebGestureEventBuilder::Build(
WebInputEvent::Type type,
- WebGestureEvent::SourceDevice source_device) {
+ blink::WebGestureDevice source_device) {
DCHECK(WebInputEvent::isGestureEventType(type));
WebGestureEvent result;
result.type = type;
@@ -100,8 +100,8 @@ WebGestureEvent SyntheticWebGestureEventBuilder::Build(
WebGestureEvent SyntheticWebGestureEventBuilder::BuildScrollBegin(
float dx_hint,
float dy_hint) {
- WebGestureEvent result = Build(WebInputEvent::GestureScrollBegin,
- WebGestureEvent::Touchscreen);
+ WebGestureEvent result =
+ Build(WebInputEvent::GestureScrollBegin, blink::WebGestureDeviceTouchpad);
result.data.scrollBegin.deltaXHint = dx_hint;
result.data.scrollBegin.deltaYHint = dy_hint;
return result;
@@ -112,7 +112,7 @@ WebGestureEvent SyntheticWebGestureEventBuilder::BuildScrollUpdate(
float dy,
int modifiers) {
WebGestureEvent result = Build(WebInputEvent::GestureScrollUpdate,
- WebGestureEvent::Touchscreen);
+ blink::WebGestureDeviceTouchpad);
result.data.scrollUpdate.deltaX = dx;
result.data.scrollUpdate.deltaY = dy;
result.modifiers = modifiers;
@@ -124,7 +124,7 @@ WebGestureEvent SyntheticWebGestureEventBuilder::BuildPinchUpdate(
float anchor_x,
float anchor_y,
int modifiers,
- WebGestureEvent::SourceDevice source_device) {
+ blink::WebGestureDevice source_device) {
WebGestureEvent result =
Build(WebInputEvent::GesturePinchUpdate, source_device);
result.data.pinchUpdate.scale = scale;
@@ -139,7 +139,7 @@ WebGestureEvent SyntheticWebGestureEventBuilder::BuildPinchUpdate(
WebGestureEvent SyntheticWebGestureEventBuilder::BuildFling(
float velocity_x,
float velocity_y,
- WebGestureEvent::SourceDevice source_device) {
+ blink::WebGestureDevice source_device) {
WebGestureEvent result = Build(WebInputEvent::GestureFlingStart,
source_device);
result.data.flingStart.velocityX = velocity_x;

Powered by Google App Engine
This is Rietveld 408576698