Refactor Scroll Customization to share cc::ScrollStateData with blink.

third_party/WebKit/Source/core/input/EventHandler.cpp

 /*
  * Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All rights reserved.
  * Copyright (C) 2006 Alexey Proskuryakov (ap@webkit.org)
  * Copyright (C) 2012 Digia Plc. and/or its subsidiary(-ies)
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
@@ skipping 2422 matching lines @@
 }
 
 WebInputEventResult EventHandler::handleGestureScrollEnd(const PlatformGestureEvent& gestureEvent)
 {
     RefPtrWillBeRawPtr<Node> node = m_scrollGestureHandlingNode;
 
     if (node) {
         passScrollGestureEventToWidget(gestureEvent, node->layoutObject());
         if (RuntimeEnabledFeatures::scrollCustomizationEnabled()) {
             RefPtrWillBeRawPtr<ScrollState> scrollState = ScrollState::create(
-                0, 0, 0, 0, 0, gestureEvent.inertial(), /* isBeginning */
-                false, /* isEnding */ true, /* fromUserInput */ true);
+                0 /* deltaX */, 0 /* deltaY */,
+                gestureEvent.position().x(), gestureEvent.position().y(),
+                0 /* velocityX*/, 0 /* velocityY */,
+                false /* isBeginning */, gestureEvent.inertial(), true /* isEnding */,
+                false /* shouldPropagate */, true /* fromUserInput */,
+                true /* isDirectManipulation */, 0 /* deltaGranularity*/,
+                m_deltaConsumedForScrollSequence);
             customizedScroll(*node.get(), *scrollState);
         }
     }
 
     clearGestureScrollState();
     return WebInputEventResult::NotHandled;
 }
 
 WebInputEventResult EventHandler::handleGestureScrollBegin(const PlatformGestureEvent& gestureEvent)
 {
@@ skipping 15 matching lines @@
             m_scrollGestureHandlingNode = m_frame->document()->documentElement();
         else
             return WebInputEventResult::NotHandled;
     }
     ASSERT(m_scrollGestureHandlingNode);
 
     passScrollGestureEventToWidget(gestureEvent, m_scrollGestureHandlingNode->layoutObject());
     if (RuntimeEnabledFeatures::scrollCustomizationEnabled()) {
         m_currentScrollChain.clear();
         RefPtrWillBeRawPtr<ScrollState> scrollState = ScrollState::create(
-            0, 0, 0, 0, 0, /* inInertialPhase */ false, /* isBeginning */
-            true, /* isEnding */ false, /* fromUserInput */ true);
+            0 /* deltaX */, 0 /* deltaY */,
+            gestureEvent.position().x(), gestureEvent.position().y(),
+            0 /* velocityX*/, 0 /* velocityY */,
+            true /* isBeginning */, false /* inertial */, false /* isEnding */,
+            false /* shouldPropagate */, true /* fromUserInput */,
+            true /* isDirectManipulation */, 0 /* deltaGranularity*/,
+            m_deltaConsumedForScrollSequence);
         customizedScroll(*m_scrollGestureHandlingNode.get(), *scrollState);
     } else {
         if (m_frame->isMainFrame())
             m_frame->host()->topControls().scrollBegin();
     }
     return WebInputEventResult::HandledSystem;
 }
 
 void EventHandler::resetOverscroll(bool didScrollX, bool didScrollY)
 {
@@ skipping 58 matching lines @@
             // FIXME: we should allow simultaneous scrolling of nested
             // iframes along perpendicular axes. See crbug.com/466991.
             m_deltaConsumedForScrollSequence = true;
             return result;
         }
 
         bool scrolled = false;
         if (handleScrollCustomization) {
             RefPtrWillBeRawPtr<ScrollState> scrollState = ScrollState::create(
                 gestureEvent.deltaX(), gestureEvent.deltaY(),
-                0, gestureEvent.velocityX(), gestureEvent.velocityY(),
-                gestureEvent.inertial(), /* isBeginning */
-                false, /* isEnding */ false, /* fromUserInput */ true,
-                !gestureEvent.preventPropagation(), m_deltaConsumedForScrollSequence);
+                gestureEvent.position().x(), gestureEvent.position().y(),
+                gestureEvent.velocityX(), gestureEvent.velocityY(),
+                false /* isBeginning */, gestureEvent.inertial(), false /* isEnding */,
+                !gestureEvent.preventPropagation(), true /* fromUserInput */,
+                true /* isDirectManipulation */, 0 /* deltaGranularity*/,
+                m_deltaConsumedForScrollSequence);
             if (m_previousGestureScrolledNode) {
                 // The ScrollState needs to know what the current
                 // native scrolling element is, so that for an
                 // inertial scroll that shouldn't propagate, only the
                 // currently scrolling element responds.
                 ASSERT(m_previousGestureScrolledNode->isElementNode());
                 scrollState->setCurrentNativeScrollingElement(toElement(m_previousGestureScrolledNode.get()));
             }
             customizedScroll(*node, *scrollState);
             m_previousGestureScrolledNode = scrollState->currentNativeScrollingElement();
@@ skipping 1595 matching lines @@
 PlatformEvent::Modifiers EventHandler::accessKeyModifiers()
 {
 #if OS(MACOSX)
     return static_cast<PlatformEvent::Modifiers>(PlatformEvent::CtrlKey | PlatformEvent::AltKey);
 #else
     return PlatformEvent::AltKey;
 #endif
 }
 
 } // namespace blink