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

Unified Diff: components/exo/pointer.cc

Issue 2458853002: exo: Replace fling cancel with generic zero distance scroll
Patch Set: Created 4 years, 2 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
« components/exo/pointer.h ('K') | « components/exo/pointer.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: components/exo/pointer.cc
diff --git a/components/exo/pointer.cc b/components/exo/pointer.cc
index 46fbcb109b8397317b0599b9f6c6e5d28149da82..4d5c64fc02b43975cff15ae6370b547b2a88d5d9 100644
--- a/components/exo/pointer.cc
+++ b/components/exo/pointer.cc
@@ -247,8 +247,11 @@ void Pointer::OnMouseEvent(ui::MouseEvent* event) {
}
break;
case ui::ET_SCROLL_FLING_CANCEL:
- if (focus_) {
- delegate_->OnPointerScrollCancel(event->time_stamp());
reveman 2016/10/31 02:25:12 can we remove OnPointerScrollCancel from the deleg
denniskempin 2016/10/31 17:33:48 Done.
+ if (focus_ && last_event_type_ == ui::ET_SCROLL_FLING_START) {
+ delegate_->OnPointerScroll(event->time_stamp(), gfx::Vector2dF(),
+ false);
+ delegate_->OnPointerFrame();
+ delegate_->OnPointerScrollStop(event->time_stamp());
delegate_->OnPointerFrame();
}
break;
@@ -286,6 +289,9 @@ void Pointer::OnMouseEvent(ui::MouseEvent* event) {
if (widget_ && widget_->IsVisible())
widget_->Hide();
}
+
+ if ((event->flags() & ui::EF_IS_SYNTHESIZED) == 0)
reveman 2016/10/31 02:25:12 can we merge this with the "event->flags() & ui::E
denniskempin 2016/10/31 17:33:49 Done.
+ last_event_type_ = event->type();
}
void Pointer::OnScrollEvent(ui::ScrollEvent* event) {
« components/exo/pointer.h ('K') | « components/exo/pointer.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698