Changeset 167634 in webkit

Timestamp:

Apr 21, 2014 5:05:02 PM (10 years ago)

Author:

Brent Fulgham

Message:

[Mac] Difficulty gesture scrolling vertically with trackpad after scrolling horizontally
​https://bugs.webkit.org/show_bug.cgi?id=131959
<rdar://problem/16654523>

Reviewed by Simon Fraser.

• page/mac/EventHandlerMac.mm:

(WebCore::deltaIsPredominantlyVertical): Added.
(WebCore::scrolledToEdgeInDominantDirection): Only consider current mouse wheel event. We don't care about
overall history when deciding if we are bumping against the edge of a scrollable region. Short-circuit if
the element style indicates that overflow is hidden, since this means there is no scroll possible in that
direction.
(WebCore::EventHandler::platformPrepareForWheelEvents): Update for new signature.

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• page/mac/EventHandlerMac.mm (modified) (3 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2014-04-21  Brent Fulgham  <bfulgham@apple.com>
+
+        [Mac] Difficulty gesture scrolling vertically with trackpad after scrolling horizontally 
+        https://bugs.webkit.org/show_bug.cgi?id=131959
+        <rdar://problem/16654523>
+
+        Reviewed by Simon Fraser.
+
+        * page/mac/EventHandlerMac.mm:
+        (WebCore::deltaIsPredominantlyVertical): Added.
+        (WebCore::scrolledToEdgeInDominantDirection): Only consider current mouse wheel event. We don't care about
+        overall history when deciding if we are bumping against the edge of a scrollable region. Short-circuit if
+        the element style indicates that overflow is hidden, since this means there is no scroll possible in that
+        direction.
+        (WebCore::EventHandler::platformPrepareForWheelEvents): Update for new signature.
+
 2014-04-21  Eric Carlson  <eric.carlson@apple.com>
 

trunk/Source/WebCore/page/mac/EventHandlerMac.mm

@@ -753 +753 @@
 }
 
-static bool scrolledToEdgeInDominantDirection(const ScrollableArea& area, DominantScrollGestureDirection direction, float deltaX, float deltaY)
-{
-    if (DominantScrollGestureDirection::Horizontal == direction && deltaX) {
+static bool deltaIsPredominantlyVertical(float deltaX, float deltaY)
+{
+    return std::abs(deltaY) > std::abs(deltaX);
+}
+    
+static bool scrolledToEdgeInDominantDirection(const ContainerNode& container, const ScrollableArea& area, float deltaX, float deltaY)
+{
+    if (!container.renderer())
+        return true;
+
+    const RenderStyle& style = container.renderer()->style();
+
+    if (!deltaIsPredominantlyVertical(deltaX, deltaY) && deltaX) {
+        if (style.overflowX() == OHIDDEN)
+            return true;
+
         if (deltaX < 0)
             return area.scrolledToRight();
@@ -761 +774 @@
         return area.scrolledToLeft();
     }
-    
+
+    if (style.overflowY() == OHIDDEN)
+        return true;
+
     if (deltaY < 0)
         return area.scrolledToBottom();
@@ -791 +807 @@
     if (wheelEvent.shouldConsiderLatching()) {
         if (scrollableArea)
-            m_startedGestureAtScrollLimit = scrolledToEdgeInDominantDirection(*scrollableArea, m_recentWheelEventDeltaTracker->dominantScrollGestureDirection(), wheelEvent.deltaX(), wheelEvent.deltaY());
+            m_startedGestureAtScrollLimit = scrolledToEdgeInDominantDirection(*scrollableContainer, *scrollableArea, wheelEvent.deltaX(), wheelEvent.deltaY());
         else
             m_startedGestureAtScrollLimit = false;