Changeset 106720 in webkit

Timestamp:

Feb 3, 2012 5:33:46 PM (12 years ago)

Author:

andersca@apple.com

Message:

The scrolling tree should be able to handle wheel events
​https://bugs.webkit.org/show_bug.cgi?id=77794

Reviewed by Andreas Kling.

• page/scrolling/ScrollingTree.cpp:

(WebCore::ScrollingTree::tryToHandleWheelEvent):
New function. Currently this always returns that it was able to handle the wheel event,
but this will change in the future.

(WebCore::ScrollingTree::handleWheelEvent):
Ask the root node to handle the wheel event.

• page/scrolling/ScrollingTreeNode.h:

Add a handleWheelEvent pure virtual member function.

• page/scrolling/mac/ScrollingTreeNodeMac.mm:

(WebCore::ScrollingTreeNodeMac::handleWheelEvent):
Call scrollBy for now. Eventually this should use a scroll elasticity controller to handle
things like rubber-banding.

(WebCore::ScrollingTreeNodeMac::scrollPosition):
(WebCore::ScrollingTreeNodeMac::setScrollPosition):
Add getters and setters for the scroll position.

(WebCore::ScrollingTreeNodeMac::scrollBy):
Update the scroll position given the offset.

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• page/scrolling/ScrollingTree.cpp (modified) (2 diffs)
• page/scrolling/ScrollingTree.h (modified) (2 diffs)
• page/scrolling/ScrollingTreeNode.h (modified) (2 diffs)
• page/scrolling/mac/ScrollingTreeNodeMac.h (modified) (1 diff)
• page/scrolling/mac/ScrollingTreeNodeMac.mm (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-02-03  Anders Carlsson  <andersca@apple.com>
+
+        The scrolling tree should be able to handle wheel events
+        https://bugs.webkit.org/show_bug.cgi?id=77794
+
+        Reviewed by Andreas Kling.
+
+        * page/scrolling/ScrollingTree.cpp:
+        (WebCore::ScrollingTree::tryToHandleWheelEvent):
+        New function. Currently this always returns that it was able to handle the wheel event,
+        but this will change in the future.
+
+        (WebCore::ScrollingTree::handleWheelEvent):
+        Ask the root node to handle the wheel event.
+
+        * page/scrolling/ScrollingTreeNode.h:
+        Add a handleWheelEvent pure virtual member function.
+
+        * page/scrolling/mac/ScrollingTreeNodeMac.mm:
+        (WebCore::ScrollingTreeNodeMac::handleWheelEvent):
+        Call scrollBy for now. Eventually this should use a scroll elasticity controller to handle
+        things like rubber-banding.
+
+        (WebCore::ScrollingTreeNodeMac::scrollPosition):
+        (WebCore::ScrollingTreeNodeMac::setScrollPosition):
+        Add getters and setters for the scroll position.
+
+        (WebCore::ScrollingTreeNodeMac::scrollBy):
+        Update the scroll position given the offset.
+
 2012-02-03  Ryosuke Niwa  <rniwa@webkit.org>
 

trunk/Source/WebCore/page/scrolling/ScrollingTree.cpp

@@ -29 +29 @@
 #if ENABLE(THREADED_SCROLLING)
 
+#include "PlatformWheelEvent.h"
 #include "ScrollingCoordinator.h"
 #include "ScrollingThread.h"
@@ -52 +53 @@
 }
 
+bool ScrollingTree::tryToHandleWheelEvent(const PlatformWheelEvent& wheelEvent)
+{
+    // FIXME: Check for wheel event handlers.
+    // FIXME: Check if we're over a subframe or overflow div.
+
+    ScrollingThread::dispatch(bind(&ScrollingTree::handleWheelEvent, this, wheelEvent));
+    return true;
+}
+
+void ScrollingTree::handleWheelEvent(const PlatformWheelEvent& wheelEvent)
+{
+    ASSERT(ScrollingThread::isCurrentThread());
+
+    m_rootNode->handleWheelEvent(wheelEvent);
+}
+
 void ScrollingTree::invalidate()
 {

trunk/Source/WebCore/page/scrolling/ScrollingTree.h

@@ -37 +37 @@
 namespace WebCore {
 
+class PlatformWheelEvent;
 class ScrollingCoordinator;
 class ScrollingTreeNode;
@@ -49 +50 @@
     static PassRefPtr<ScrollingTree> create(ScrollingCoordinator*);
     ~ScrollingTree();
+
+    // Can be called from any thread. Will try to handle the wheel event on the scrolling thread.
+    // Returns true if the wheel event can be handled on the scrolling thread and false if the
+    // event must be sent again to the WebCore event handler.
+    bool tryToHandleWheelEvent(const PlatformWheelEvent&);
+
+    // Must be called from the scrolling thread. Handles the wheel event.
+    void handleWheelEvent(const PlatformWheelEvent&);
 
     void invalidate();

trunk/Source/WebCore/page/scrolling/ScrollingTreeNode.h

@@ -34 +34 @@
 namespace WebCore {
 
+class PlatformWheelEvent;
 class ScrollingTree;
 class ScrollingTreeState;
@@ -43 +44 @@
 
     virtual void update(ScrollingTreeState*);
+    virtual void handleWheelEvent(const PlatformWheelEvent&) = 0;
 
 protected:

trunk/Source/WebCore/page/scrolling/mac/ScrollingTreeNodeMac.h

@@ -42 +42 @@
 private:
     virtual void update(ScrollingTreeState*) OVERRIDE;
+    virtual void handleWheelEvent(const PlatformWheelEvent&) OVERRIDE;
+
+    IntPoint scrollPosition() const;
+    void setScrollPosition(const IntPoint&);
+
+    void scrollBy(const IntSize&);
 
     RetainPtr<CALayer> m_scrollLayer;

trunk/Source/WebCore/page/scrolling/mac/ScrollingTreeNodeMac.mm

@@ -29 +29 @@
 #if ENABLE(THREADED_SCROLLING)
 
+#include "PlatformWheelEvent.h"
 #include "ScrollingTreeState.h"
 
@@ -51 +52 @@
 }
 
+void ScrollingTreeNodeMac::handleWheelEvent(const PlatformWheelEvent& wheelEvent)
+{
+    // FXIME: This needs to handle rubberbanding.
+    scrollBy(IntSize(-wheelEvent.deltaX(), -wheelEvent.deltaY()));
+}
+
+IntPoint ScrollingTreeNodeMac::scrollPosition() const
+{
+    CGPoint scrollLayerPosition = m_scrollLayer.get().position;
+    return IntPoint(-scrollLayerPosition.x, -scrollLayerPosition.y);
+}
+
+void ScrollingTreeNodeMac::setScrollPosition(const IntPoint& position)
+{
+    m_scrollLayer.get().position = CGPointMake(-position.x(), -position.y());
+}
+
+void ScrollingTreeNodeMac::scrollBy(const IntSize &offset)
+{
+    setScrollPosition(scrollPosition() + offset);
+
+    // FIXME: Tell the scrolling coordinator that our position changed.
+}
+
 } // namespace WebCore