Revert "Touchpad scroll latching enabled for Mac behind flag."

Revert "Touchpad scroll latching enabled for Mac behind flag."

This reverts commit r414515 on the M54 branch to fix Android scrollbar
fading.

BUG=526463, 649122
NOTRY=true
NOPRESUBMIT=true
CQ_INCLUDE_TRYBOTS=master.tryserver.blink:linux_precise_blink_rel

[aelias_OOO_until_Jul13, 2016-09-21 21:15:28]

Description was changed from

==========
Revert "Touchpad scroll latching enabled for Mac behind flag."

This reverts commit r414515 on the M54 branch to fix Android scrollbar
fading.

BUG=526463,649122
==========

to

==========
Revert "Touchpad scroll latching enabled for Mac behind flag."

This reverts commit r414515 on the M54 branch to fix Android scrollbar
fading.

BUG=526463,649122
CQ_INCLUDE_TRYBOTS=master.tryserver.blink:linux_precise_blink_rel
==========

[aelias_OOO_until_Jul13, 2016-09-21 21:15:49]

aelias@chromium.org changed reviewers:
+ dtapuska@chromium.org

[aelias_OOO_until_Jul13, 2016-09-21 21:16:14]

Hi dtapuska@, this is a revert directly on the branch to fix beta channel while
sahel@ investigates.

[dtapuska, 2016-09-21 21:21:12]

On 2016/09/21 21:16:14, aelias wrote:
> Hi dtapuska@, this is a revert directly on the branch to fix beta channel
while
> sahel@ investigates.

lgtm

[aelias_OOO_until_Jul13, 2016-09-22 21:13:51]

Description was changed from

==========
Revert "Touchpad scroll latching enabled for Mac behind flag."

This reverts commit r414515 on the M54 branch to fix Android scrollbar
fading.

BUG=526463,649122
CQ_INCLUDE_TRYBOTS=master.tryserver.blink:linux_precise_blink_rel
==========

to

==========
Revert "Touchpad scroll latching enabled for Mac behind flag."

This reverts commit r414515 on the M54 branch to fix Android scrollbar
fading.

BUG=526463,649122
NOTRY=true
CQ_INCLUDE_TRYBOTS=master.tryserver.blink:linux_precise_blink_rel
==========

[aelias_OOO_until_Jul13, 2016-09-22 21:13:54]

The CQ bit was checked by aelias@chromium.org

[commit-bot: I haz the power, 2016-09-22 21:14:33]

CQ is trying da patch. Follow status at
 
https://chromium-cq-status.appspot.com/v2/patch-status/codereview.chromium.or...

[commit-bot: I haz the power, 2016-09-22 21:14:34]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2016-09-22 21:14:35]

CLs for remote refs other than refs/pending/heads/master must contain NOTRY=true
and NOPRESUBMIT=true in order for the CQ to process them

[aelias_OOO_until_Jul13, 2016-09-22 21:14:58]

Description was changed from

==========
Revert "Touchpad scroll latching enabled for Mac behind flag."

This reverts commit r414515 on the M54 branch to fix Android scrollbar
fading.

BUG=526463,649122
NOTRY=true
CQ_INCLUDE_TRYBOTS=master.tryserver.blink:linux_precise_blink_rel
==========

to

==========
Revert "Touchpad scroll latching enabled for Mac behind flag."

This reverts commit r414515 on the M54 branch to fix Android scrollbar
fading.

BUG=526463,649122
NOTRY=true
NOPRESUBMIT=true
CQ_INCLUDE_TRYBOTS=master.tryserver.blink:linux_precise_blink_rel
==========

[aelias_OOO_until_Jul13, 2016-09-22 21:15:02]

The CQ bit was checked by aelias@chromium.org

[commit-bot: I haz the power, 2016-09-22 21:15:29]

CQ is trying da patch. Follow status at
 
https://chromium-cq-status.appspot.com/v2/patch-status/codereview.chromium.or...

[commit-bot: I haz the power, 2016-09-22 21:17:29]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2016-09-22 21:17:31]

Failed to apply patch for ui/events/blink/input_handler_proxy.cc:
While running git apply --index -3 -p1;
  error: patch failed: ui/events/blink/input_handler_proxy.cc:496
  Falling back to three-way merge...
  Applied patch to 'ui/events/blink/input_handler_proxy.cc' with conflicts.
  U ui/events/blink/input_handler_proxy.cc

Patch:       ui/events/blink/input_handler_proxy.cc
Index: ui/events/blink/input_handler_proxy.cc
diff --git a/ui/events/blink/input_handler_proxy.cc
b/ui/events/blink/input_handler_proxy.cc
index
377f6bddcbf73ce8b50cd054d5c9dc40524408dc..1d4a119420bbfc7103437d70a83da022085c87af
100644
--- a/ui/events/blink/input_handler_proxy.cc
+++ b/ui/events/blink/input_handler_proxy.cc
@@ -132,12 +132,6 @@ cc::ScrollState CreateScrollStateForGesture(const
WebGestureEvent& event) {
       scroll_state_data.position_x = event.x;
       scroll_state_data.position_y = event.y;
       scroll_state_data.is_beginning = true;
-      // On Mac, a GestureScrollBegin in the inertial phase indicates a fling
-      // start.
-      if (event.data.scrollBegin.inertialPhase ==
-          WebGestureEvent::MomentumPhase) {
-        scroll_state_data.is_in_inertial_phase = true;
-      }
       break;
     case WebInputEvent::GestureFlingStart:
       scroll_state_data.velocity_x = event.data.flingStart.velocityX;
@@ -496,8 +490,27 @@ InputHandlerProxy::EventDisposition
InputHandlerProxy::ScrollByMouseWheel(
         blink::WebGestureDeviceTouchpad,
         cc::MainThreadScrollingReason::kPageBasedScrolling);
 
+  } else if (ShouldAnimate(wheel_event.hasPreciseScrollingDeltas)) {
+    cc::InputHandler::ScrollStatus scroll_status =
+        input_handler_->ScrollAnimated(gfx::Point(wheel_event.x,
wheel_event.y),
+                                       scroll_delta);
+
+    RecordMainThreadScrollingReasons(
+        blink::WebGestureDeviceTouchpad,
+        scroll_status.main_thread_scrolling_reasons);
+
+    switch (scroll_status.thread) {
+      case cc::InputHandler::SCROLL_ON_IMPL_THREAD:
+        result = DID_HANDLE;
+        break;
+      case cc::InputHandler::SCROLL_IGNORED:
+        result = DROP_EVENT;
+        break;
+      default:
+        result = DID_NOT_HANDLE;
+        break;
+    }
   } else {
-    DCHECK(!ShouldAnimate(wheel_event.hasPreciseScrollingDeltas));
     cc::ScrollStateData scroll_state_begin_data;
     scroll_state_begin_data.position_x = wheel_event.x;
     scroll_state_begin_data.position_y = wheel_event.y;
@@ -626,7 +639,6 @@ InputHandlerProxy::HandleGestureScrollUpdate(
 
   if (ShouldAnimate(gesture_event.data.scrollUpdate.deltaUnits !=
                     blink::WebGestureEvent::ScrollUnits::Pixels)) {
-    DCHECK(!scroll_state.is_in_inertial_phase());
     switch (input_handler_->ScrollAnimated(scroll_point, scroll_delta).thread)
{
       case cc::InputHandler::SCROLL_ON_IMPL_THREAD:
         return DID_HANDLE;

[sahel, 2016-09-22 21:36:37]

On 2016/09/21 21:21:12, dtapuska wrote:
> On 2016/09/21 21:16:14, aelias wrote:
> > Hi dtapuska@, this is a revert directly on the branch to fix beta channel
> while
> > sahel@ investigates.
> 
> lgtm

This patch should also get reverted, because it was a fix for the reverted
patch.

currentlyscrollinglayer cleared in scrollAnimatedBegin
https://chromium.googlesource.com/chromium/src.git/+/ebcfc3309fba892b25d84f94...

[dtapuska, 2016-09-22 21:38:48]

On 2016/09/22 21:36:37, sahel wrote:
> On 2016/09/21 21:21:12, dtapuska wrote:
> > On 2016/09/21 21:16:14, aelias wrote:
> > > Hi dtapuska@, this is a revert directly on the branch to fix beta channel
> > while
> > > sahel@ investigates.
> > 
> > lgtm
> 
> This patch should also get reverted, because it was a fix for the reverted
> patch.
> 
> currentlyscrollinglayer cleared in scrollAnimatedBegin
>
https://chromium.googlesource.com/chromium/src.git/+/ebcfc3309fba892b25d84f94...

that one isn't in m54. it's failing to patch because I pulled a later change
into the branch that was after your change. I manually resolved the conflict and
now we need to pull the revert in. either way we would have had conflicts.