Changeset 60159 in webkit

Timestamp:

May 25, 2010 6:14:33 AM (14 years ago)

Author:

tonikitoo@webkit.org

Message:

Add an optional "starting node' parameter to scrollRecursively and scrollOverflow of EventHandler
​https://bugs.webkit.org/show_bug.cgi?id=39217

Reviewed by Darin Adler.
Patch by Antonio Gomes <​tonikitoo@webkit.org>

It would be usefull if scrollOverflow and scrollRecursively methods of EventHandler
could receive a parameter to specify where to start scrolling from. Currently they
start scrolling from either the current focused node or the node where mouse last
pressed on. Patch proposes an aditional starting point as an optional parameter.
Since it is optional, all call sites can remain as are, and if a Null node is passed
in, both methods work as previously.

• page/EventHandler.cpp:

(WebCore::EventHandler::scrollOverflow):
(WebCore::EventHandler::scrollRecursively):

• page/EventHandler.h:

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• page/EventHandler.cpp (modified) (2 diffs)
• page/EventHandler.h (modified) (1 diff)

trunk/WebCore/ChangeLog

@@ +1 @@
+2010-05-17  Antonio Gomes  <tonikitoo@webkit.org>
+
+        Reviewed by Darin Adler.
+
+        Add an optional "starting node' parameter to scrollRecursively and scrollOverflow of EventHandler
+        https://bugs.webkit.org/show_bug.cgi?id=39217
+
+        It would be usefull if scrollOverflow and scrollRecursively methods of EventHandler
+        could receive a parameter to specify where to start scrolling from. Currently they
+        start scrolling from either the current focused node or the node where mouse last
+        pressed on. Patch proposes an aditional starting point as an optional parameter.
+        Since it is optional, all call sites can remain as are, and if a Null node is passed
+        in, both methods work as previously.
+
+        * page/EventHandler.cpp:
+        (WebCore::EventHandler::scrollOverflow):
+        (WebCore::EventHandler::scrollRecursively):
+        * page/EventHandler.h:
+
 2010-05-25  Adam Barth  <abarth@webkit.org>
 

trunk/WebCore/page/EventHandler.cpp

@@ -972 +972 @@
 }
 
-bool EventHandler::scrollOverflow(ScrollDirection direction, ScrollGranularity granularity)
-{
-    Node* node = m_frame->document()->focusedNode();
+bool EventHandler::scrollOverflow(ScrollDirection direction, ScrollGranularity granularity, Node* startingNode)
+{
+    Node* node = startingNode;
+
+    if (!node)
+        node = m_frame->document()->focusedNode();
+
     if (!node)
         node = m_mousePressNode.get();
@@ -989 +993 @@
 }
 
-bool EventHandler::scrollRecursively(ScrollDirection direction, ScrollGranularity granularity)
-{
-    bool handled = scrollOverflow(direction, granularity);
+bool EventHandler::scrollRecursively(ScrollDirection direction, ScrollGranularity granularity, Node* startingNode)
+{
+    bool handled = scrollOverflow(direction, granularity, startingNode);
     if (!handled) {
         Frame* frame = m_frame;

trunk/WebCore/page/EventHandler.h

@@ -131 +131 @@
     static Frame* subframeForTargetNode(Node*);
 
-    bool scrollOverflow(ScrollDirection, ScrollGranularity);
-
-    bool scrollRecursively(ScrollDirection, ScrollGranularity);
+    bool scrollOverflow(ScrollDirection, ScrollGranularity, Node* startingNode = 0);
+
+    bool scrollRecursively(ScrollDirection, ScrollGranularity, Node* startingNode = 0);
 
 #if ENABLE(DRAG_SUPPORT)