Slop region check for multi-finger scroll

content/browser/renderer_host/input/stylus_text_selector.cc

 // Copyright 2014 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 "content/browser/renderer_host/input/stylus_text_selector.h"
 
 #include "ui/events/event_constants.h"
 #include "ui/events/gesture_detection/gesture_detector.h"
 #include "ui/events/gesture_detection/gesture_provider_config_helper.h"
 #include "ui/events/gesture_detection/motion_event.h"
@@ skipping 92 matching lines @@
   return true;
 }
 
 bool StylusTextSelector::OnSingleTapUp(const MotionEvent& e, int tap_count) {
   DCHECK(text_selection_triggered_);
   DCHECK(!dragging_);
   client_->OnStylusSelectTap(e.GetEventTime(), e.GetX(), e.GetY());
   return true;
 }
 
-bool StylusTextSelector::OnScroll(const MotionEvent& e1,
-                                  const MotionEvent& e2,
-                                  float distance_x,
-                                  float distance_y) {
+bool StylusTextSelector::OnScroll(const MotionEvent& e1, const MotionEvent& e2,
+      const MotionEvent& secondary_pointer_down_event, float distance_x,

[tdresser, 2016/06/28 15:24:18]

Remove _event.

[sahel, 2016/06/29 16:26:18]

Done.

+      float distance_y) {
   DCHECK(text_selection_triggered_);
 
   // Return if Stylus button is not pressed.
   if (!secondary_button_pressed_)
     return true;
 
   if (!dragging_) {
     dragging_ = true;
     dragged_ = true;
     client_->OnStylusSelectBegin(anchor_x_, anchor_y_, e2.GetX(), e2.GetY());
   } else {
     client_->OnStylusSelectUpdate(e2.GetX(), e2.GetY());
   }
 
   return true;
 }
 
 // static
 bool StylusTextSelector::ShouldStartTextSelection(const MotionEvent& event) {
   DCHECK_GT(event.GetPointerCount(), 0u);
   // Currently we are supporting stylus-only cases.
   const bool is_stylus = event.GetToolType(0) == MotionEvent::TOOL_TYPE_STYLUS;
   const bool is_only_secondary_button_pressed =
       event.GetButtonState() == MotionEvent::BUTTON_SECONDARY;
   return is_stylus && is_only_secondary_button_pressed;
 }
 
 }  // namespace content