VR: Sending the fling event to the right target

chrome/browser/android/vr_shell/vr_shell_gl.cc

Index: chrome/browser/android/vr_shell/vr_shell_gl.cc
diff --git a/chrome/browser/android/vr_shell/vr_shell_gl.cc b/chrome/browser/android/vr_shell/vr_shell_gl.cc
index 2f6ca1858794f98ba5b079eec8914441c31f2b4f..bd73b109b0bcf60417e0691ff689a181de76af9c 100644
--- a/chrome/browser/android/vr_shell/vr_shell_gl.cc
+++ b/chrome/browser/android/vr_shell/vr_shell_gl.cc
@@ -653,22 +653,21 @@ void VrShellGl::SendEventsToTarget(InputTarget input_target,
       // Once the user starts scrolling send all the scroll events to this
       // element until the scrolling stops.
       case WebInputEvent::GestureScrollBegin:
-        current_scroll_target = input_target;
-        if (current_scroll_target != InputTarget::NONE) {
-          SendGesture(current_scroll_target, std::move(movableGesture));
+        current_scroll_target_ = input_target;
+        if (current_scroll_target_ != InputTarget::NONE) {
+          SendGesture(current_scroll_target_, std::move(movableGesture));
         }
         break;
       case WebInputEvent::GestureScrollEnd:
-        if (current_scroll_target != InputTarget::NONE) {
-          SendGesture(current_scroll_target, std::move(movableGesture));
+        if (current_scroll_target_ != InputTarget::NONE) {
+          SendGesture(current_scroll_target_, std::move(movableGesture));
         }
-        current_scroll_target = InputTarget::NONE;

[mthiesse, 2017/04/10 15:54:17]

Don't we know have confusing state where we have a scroll target but the scroll
has ended?

Can we add a fling_target_ member instead, and set that here?

[mthiesse, 2017/04/10 15:54:35]

s/know/now

[asimjour1, 2017/04/12 17:35:01]

current_fling_target_ is added.

         break;
       case WebInputEvent::GestureScrollUpdate:
       case WebInputEvent::GestureFlingCancel:
       case WebInputEvent::GestureFlingStart:
-        if (current_scroll_target != InputTarget::NONE) {
-          SendGesture(current_scroll_target, std::move(movableGesture));
+        if (current_scroll_target_ != InputTarget::NONE) {
+          SendGesture(current_scroll_target_, std::move(movableGesture));
         }
         break;
       case WebInputEvent::GestureTapDown: