Enable scrolling of UI elements.

chrome/browser/android/vr_shell/vr_shell_gl.cc

 // Copyright 2016 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/android/vr_shell/vr_shell_gl.h"
 
 #include <utility>
 
 #include "base/android/jni_android.h"
 #include "base/callback_helpers.h"
@@ skipping 510 matching lines @@
         pixel_rect = {0, 0, content_tex_css_width_, content_tex_css_height_};
       } else {
         pixel_rect = {plane->copy_rect.x, plane->copy_rect.y,
                       plane->copy_rect.width, plane->copy_rect.height};
       }
       pixel_x = pixel_rect.width * x + pixel_rect.x;
       pixel_y = pixel_rect.height * y + pixel_rect.y;
 
       target_point_ = plane_intersection_point;
       target_element_ = plane.get();
-      input_target = (plane->fill == Fill::CONTENT) ? InputTarget::CONTENT
-                                                    : InputTarget::UI;
+      // For now treat UI elements, which do not show web content, as NONE input
+      // targets since they cannot make use of the input anyway.
+      switch (plane->fill) {
+        case Fill::CONTENT:
+          input_target = InputTarget::CONTENT;
+          break;
+        case Fill::SPRITE:
+          input_target = InputTarget::UI;
+          break;
+        default:
+          input_target = InputTarget::NONE;
+          break;
+      }
     }
   }
   SendEventsToTarget(input_target, pixel_x, pixel_y);
 }
 
 void VrShellGl::SendEventsToTarget(InputTarget input_target,
                                    int pixel_x,
                                    int pixel_y) {
   std::vector<std::unique_ptr<WebGestureEvent>> gesture_list =
       controller_->DetectGestures();
   double timestamp = gesture_list.front()->timeStampSeconds();
 
   if (touch_pending_) {
     touch_pending_ = false;
     std::unique_ptr<WebGestureEvent> event(new WebGestureEvent(
         WebInputEvent::GestureTapDown, WebInputEvent::NoModifiers, timestamp));
     event->sourceDevice = blink::WebGestureDeviceTouchpad;
     event->x = pixel_x;
     event->y = pixel_y;
     gesture_list.push_back(std::move(event));
   }
 
+  // Make sure the user can switch to another input target while scrolling. To
+  // make this switch work we have to send an artificial scroll end event to the
+  // previous target and an artificial scroll begin event to the new target.
+  // Otherwise we will crash.

[cjgrant, 2017/02/13 15:54:51]

No need for the last line here, it's implied.

[tiborg, 2017/02/13 22:15:26]

I reset this due to changes in the scrolling behavior. See asimjour1's comment.

+  if (is_scrolling_ && current_input_target_ != input_target) {
+    if (current_input_target_ != InputTarget::NONE) {
+      // End the scrolling on the previous target.

[mthiesse, 2017/02/13 15:47:08]

Can you merge these two blocks with the "// Hover support" blocks?

[cjgrant, 2017/02/13 15:54:51]

+1. Anything that makes switching input target from one element to another ought
to be centralized.

[tiborg, 2017/02/13 22:15:26]

I reset this due to changes in the scrolling behavior. See asimjour1's comment.

+      std::unique_ptr<WebGestureEvent> scrollEndEvent(
+          new WebGestureEvent(WebInputEvent::GestureScrollEnd,
+                              WebInputEvent::NoModifiers, timestamp));
+      scrollEndEvent->sourceDevice = blink::WebGestureDeviceTouchpad;
+      SendGesture(current_input_target_, std::move(scrollEndEvent));
+    }
+    if (input_target != InputTarget::NONE) {
+      // Start scrolling on the new target.
+      std::unique_ptr<WebGestureEvent> scrollBeginEvent(
+          new WebGestureEvent(WebInputEvent::GestureScrollBegin,
+                              WebInputEvent::NoModifiers, timestamp));
+      scrollBeginEvent->sourceDevice = blink::WebGestureDeviceTouchpad;
+      scrollBeginEvent->x = pixel_x;
+      scrollBeginEvent->y = pixel_y;
+      SendGesture(input_target, std::move(scrollBeginEvent));
+    }
+  }
+
   for (const auto& gesture : gesture_list) {
+    gesture->x = pixel_x;
+    gesture->y = pixel_y;
+    auto movableGesture = base::WrapUnique(new WebGestureEvent(*gesture));
+
     switch (gesture->type()) {
       case WebInputEvent::GestureScrollBegin:
+        is_scrolling_ = true;
+        if (input_target != InputTarget::NONE) {
+          SendGesture(input_target, std::move(movableGesture));
+        }
+        break;
       case WebInputEvent::GestureScrollUpdate:
+        if (input_target != InputTarget::NONE) {
+          SendGesture(input_target, std::move(movableGesture));
+        }
+        break;
       case WebInputEvent::GestureScrollEnd:
+        if (input_target != InputTarget::NONE) {
+          SendGesture(input_target, std::move(movableGesture));
+        }
+        is_scrolling_ = false;
+        break;
       case WebInputEvent::GestureFlingCancel:
       case WebInputEvent::GestureFlingStart:
-        SendGesture(InputTarget::CONTENT,
-                    base::WrapUnique(new WebGestureEvent(*gesture)));
+        if (input_target != InputTarget::NONE) {
+          SendGesture(input_target, std::move(movableGesture));
+        }
         break;
       case WebInputEvent::GestureTapDown:
-        gesture->x = pixel_x;
-        gesture->y = pixel_y;
-        if (input_target != InputTarget::NONE)
-          SendGesture(input_target,
-                      base::WrapUnique(new WebGestureEvent(*gesture)));
+        if (input_target != InputTarget::NONE) {
+          SendGesture(input_target, std::move(movableGesture));
+        }
         break;
       case WebInputEvent::Undefined:
         break;
       default:
         NOTREACHED();
     }
   }
 
   // Hover support
   bool new_target = input_target != current_input_target_;
@@ skipping 502 matching lines @@
     const base::Callback<void(device::mojom::VRDisplayInfoPtr)>& callback,
     uint32_t device_id) {
   device::mojom::VRDisplayInfoPtr info = VrShell::CreateVRDisplayInfo(
       gvr_api_.get(), content_tex_physical_size_, device_id);
   main_thread_task_runner_->PostTask(
       FROM_HERE,
       base::Bind(&RunVRDisplayInfoCallback, callback, base::Passed(&info)));
 }
 
 }  // namespace vr_shell