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

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

Issue 2478423002: Rename SyntheticPointer to SyntheticPointerDriver (Closed)
Patch Set: rename Created 4 years, 1 month 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/synthetic_smooth_move_gesture.cc
diff --git a/content/browser/renderer_host/input/synthetic_smooth_move_gesture.cc b/content/browser/renderer_host/input/synthetic_smooth_move_gesture.cc
index 6a9264d2f6653edd2308b8ba55fc15913c0e94dd..3cec89f0a41534cb61490d903c96bdd465998904 100644
--- a/content/browser/renderer_host/input/synthetic_smooth_move_gesture.cc
+++ b/content/browser/renderer_host/input/synthetic_smooth_move_gesture.cc
@@ -67,15 +67,15 @@ SyntheticGesture::Result SyntheticSmoothMoveGesture::ForwardInputEvents(
switch (params_.input_type) {
case SyntheticSmoothMoveGestureParams::TOUCH_INPUT:
- if (!synthetic_pointer_)
- synthetic_pointer_ =
- SyntheticPointer::Create(SyntheticGestureParams::TOUCH_INPUT);
+ if (!synthetic_pointer_driver_)
+ synthetic_pointer_driver_ =
+ SyntheticPointerDriver::Create(SyntheticGestureParams::TOUCH_INPUT);
ForwardTouchInputEvents(timestamp, target);
break;
case SyntheticSmoothMoveGestureParams::MOUSE_DRAG_INPUT:
- if (!synthetic_pointer_)
- synthetic_pointer_ =
- SyntheticPointer::Create(SyntheticGestureParams::MOUSE_INPUT);
+ if (!synthetic_pointer_driver_)
+ synthetic_pointer_driver_ =
+ SyntheticPointerDriver::Create(SyntheticGestureParams::MOUSE_INPUT);
ForwardMouseClickInputEvents(timestamp, target);
break;
case SyntheticSmoothMoveGestureParams::MOUSE_WHEEL_INPUT:
@@ -212,7 +212,7 @@ void SyntheticSmoothMoveGesture::ForwardMouseClickInputEvents(
case MOVING: {
base::TimeTicks event_timestamp = ClampTimestamp(timestamp);
gfx::Vector2dF delta = GetPositionDeltaAtTime(event_timestamp);
- MovePoint(target, delta, event_timestamp);
+ MovePoint(target, delta, event_timestamp, -1);
tdresser 2016/11/12 19:50:55 I don't think we should explicitly pass -1 here, w
lanwei 2016/11/14 04:20:54 Done.
if (FinishedCurrentMoveSegment(event_timestamp)) {
if (!IsLastMoveSegment()) {
@@ -220,7 +220,7 @@ void SyntheticSmoothMoveGesture::ForwardMouseClickInputEvents(
params_.distances[current_move_segment_];
ComputeNextMoveSegment();
} else {
- ReleasePoint(target, event_timestamp);
+ ReleasePoint(target, event_timestamp, -1);
state_ = DONE;
}
}
@@ -256,26 +256,25 @@ void SyntheticSmoothMoveGesture::ForwardMouseWheelEvent(
void SyntheticSmoothMoveGesture::PressPoint(SyntheticGestureTarget* target,
const base::TimeTicks& timestamp) {
DCHECK_EQ(current_move_segment_, 0);
- synthetic_pointer_->Press(current_move_segment_start_position_.x(),
- current_move_segment_start_position_.y(), target,
- timestamp);
- synthetic_pointer_->DispatchEvent(target, timestamp);
+ synthetic_pointer_driver_->Press(current_move_segment_start_position_.x(),
+ current_move_segment_start_position_.y());
+ synthetic_pointer_driver_->DispatchEvent(target, timestamp);
}
void SyntheticSmoothMoveGesture::MovePoint(SyntheticGestureTarget* target,
const gfx::Vector2dF& delta,
- const base::TimeTicks& timestamp) {
+ const base::TimeTicks& timestamp,
+ int index) {
DCHECK_GE(current_move_segment_, 0);
DCHECK_LT(current_move_segment_, static_cast<int>(params_.distances.size()));
gfx::PointF new_position = current_move_segment_start_position_ + delta;
- synthetic_pointer_->Move(0, new_position.x(), new_position.y(), target,
- timestamp);
- synthetic_pointer_->DispatchEvent(target, timestamp);
+ synthetic_pointer_driver_->Move(new_position.x(), new_position.y(), index);
+ synthetic_pointer_driver_->DispatchEvent(target, timestamp);
}
-void SyntheticSmoothMoveGesture::ReleasePoint(
- SyntheticGestureTarget* target,
- const base::TimeTicks& timestamp) {
+void SyntheticSmoothMoveGesture::ReleasePoint(SyntheticGestureTarget* target,
+ const base::TimeTicks& timestamp,
+ int index) {
DCHECK_EQ(current_move_segment_,
static_cast<int>(params_.distances.size()) - 1);
gfx::PointF position;
@@ -284,8 +283,8 @@ void SyntheticSmoothMoveGesture::ReleasePoint(
position = current_move_segment_start_position_ +
GetPositionDeltaAtTime(timestamp);
}
- synthetic_pointer_->Release(0, target, timestamp);
- synthetic_pointer_->DispatchEvent(target, timestamp);
+ synthetic_pointer_driver_->Release(index);
+ synthetic_pointer_driver_->DispatchEvent(target, timestamp);
}
void SyntheticSmoothMoveGesture::AddTouchSlopToFirstDistance(

Powered by Google App Engine
This is Rietveld 408576698