Make all gesture scrolls use customization path internally

third_party/WebKit/Source/core/dom/Element.cpp

 /*
  * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
  *           (C) 1999 Antti Koivisto (koivisto@kde.org)
  *           (C) 2001 Peter Kelly (pmk@post.com)
  *           (C) 2001 Dirk Mueller (mueller@kde.org)
  *           (C) 2007 David Smith (catfish.man@gmail.com)
  * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2012, 2013 Apple Inc. All rights reserved.
  *           (C) 2007 Eric Seidel (eric@webkit.org)
  *
  * This library is free software; you can redistribute it and/or
@@ skipping 507 matching lines @@
 
     callApplyScroll(scrollState);
 
     if (deltaX != scrollState.deltaX() || deltaY != scrollState.deltaY())
         scrollState.setCurrentNativeScrollingElement(this);
 }
 
 void Element::callDistributeScroll(ScrollState& scrollState)
 {
     ScrollStateCallback* callback = scrollCustomizationCallbacks().getDistributeScroll(this);
-    if (!callback) {
+
+    // TODO(bokan): Need to add tests before we allow calling custom callbacks
+    // for non-touch modalities. For now, just call into the native callback but
+    // allow the viewport scroll callback so we don't disable overscroll.
+    // crbug.com/623079.
+    bool disableCustomCallbacks = !scrollState.isDirectManipulation()
+        && !document().isViewportScrollCallback(callback);
+
+    if (!callback || disableCustomCallbacks) {
         nativeDistributeScroll(scrollState);
         return;
     }
     if (callback->nativeScrollBehavior() != WebNativeScrollBehavior::PerformAfterNativeScroll)
         callback->handleEvent(&scrollState);
     if (callback->nativeScrollBehavior() != WebNativeScrollBehavior::DisableNativeScroll)
         nativeDistributeScroll(scrollState);
     if (callback->nativeScrollBehavior() == WebNativeScrollBehavior::PerformAfterNativeScroll)
         callback->handleEvent(&scrollState);
 };
 
 void Element::nativeApplyScroll(ScrollState& scrollState)
 {
-    DCHECK(RuntimeEnabledFeatures::scrollCustomizationEnabled());
-
     // All elements in the scroll chain should be boxes.
     DCHECK(!layoutObject() || layoutObject()->isBox());
 
     if (scrollState.fullyConsumed())
         return;
 
     FloatSize delta(scrollState.deltaX(), scrollState.deltaY());
 
     if (delta.isZero())
         return;
 
     // TODO(esprehn): This should use updateStyleAndLayoutIgnorePendingStylesheetsForNode.
     document().updateStyleAndLayoutIgnorePendingStylesheets();
 
     LayoutBox* boxToScroll = nullptr;
 
-    // Handle the scrollingElement separately, as it should scroll the viewport.
-    if (this == document().scrollingElement())
+    // We should only ever scroll the effective root scroller this way when the
+    // page removes the default applyScroll (ViewportScrollCallback).
+    if (document().effectiveRootScroller() == this)
         boxToScroll = document().layoutView();
     else if (layoutObject())
         boxToScroll = toLayoutBox(layoutObject());
 
     if (!boxToScroll)
         return;
 
     ScrollResult result =
         LayoutBoxItem(boxToScroll).enclosingBox().scroll(
-            ScrollByPrecisePixel,
+            ScrollGranularity(static_cast<int>(scrollState.deltaGranularity())),
             delta);
 
     if (!result.didScroll())
         return;
 
     // FIXME: Native scrollers should only consume the scroll they
     // apply. See crbug.com/457765.
     scrollState.consumeDeltaNative(delta.width(), delta.height());
 
     // We need to setCurrentNativeScrollingElement in both the
     // distributeScroll and applyScroll default implementations so
     // that if JS overrides one of these methods, but not the
     // other, this bookkeeping remains accurate.
     scrollState.setCurrentNativeScrollingElement(this);
     if (scrollState.fromUserInput()) {
         if (DocumentLoader* documentLoader = document().loader())
             documentLoader->initialScrollState().wasScrolledByUser = true;
     }
 };
 
 void Element::callApplyScroll(ScrollState& scrollState)
 {
     ScrollStateCallback* callback = scrollCustomizationCallbacks().getApplyScroll(this);
-    if (!callback) {
+
+    // TODO(bokan): Need to add tests before we allow calling custom callbacks
+    // for non-touch modalities. For now, just call into the native callback but
+    // allow the viewport scroll callback so we don't disable overscroll.
+    // crbug.com/623079.
+    bool disableCustomCallbacks = !scrollState.isDirectManipulation()
+        && !document().isViewportScrollCallback(callback);
+
+    if (!callback || disableCustomCallbacks) {
         nativeApplyScroll(scrollState);
         return;
     }
     if (callback->nativeScrollBehavior() != WebNativeScrollBehavior::PerformAfterNativeScroll)
         callback->handleEvent(&scrollState);
     if (callback->nativeScrollBehavior() != WebNativeScrollBehavior::DisableNativeScroll)
         nativeApplyScroll(scrollState);
     if (callback->nativeScrollBehavior() == WebNativeScrollBehavior::PerformAfterNativeScroll)
         callback->handleEvent(&scrollState);
 };
@@ skipping 3117 matching lines @@
 
 DEFINE_TRACE_WRAPPERS(Element)
 {
     if (hasRareData()) {
         visitor->traceWrappers(elementRareData());
     }
     ContainerNode::traceWrappers(visitor);
 }
 
 } // namespace blink