Changeset 61298 in webkit

Timestamp:

Jun 16, 2010 5:57:15 PM (14 years ago)

Author:

tonikitoo@webkit.org

Message:

Spatial Navigation: refactor scrollInDirection to work with scrollable content
​https://bugs.webkit.org/show_bug.cgi?id=39195

Reviewed by Simon Fraser.
Patch by Antonio Gomes <​tonikitoo@webkit.org>

WebCore:

scrollInDirection now receives as parameter the node that the Spatial Navigation
found as the more appropriated to move focus to. If it is in a scrollable container
(e.g. <div> with clipped overflow content), it scrolls recursively starting from
the container, not the current focused node.

Test: fast/events/spatial-navigation/snav-only-clipped-overflow-content.html

• page/FocusController.cpp:

(WebCore::FocusController::advanceFocusDirectionally):

• page/SpatialNavigation.cpp:

(WebCore::scrollInDirection):

• page/SpatialNavigation.h:

LayoutTests:

• fast/events/spatial-navigation/snav-only-clipped-overflow-content-expected.txt: Added.
• fast/events/spatial-navigation/snav-only-clipped-overflow-content.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/events/spatial-navigation/snav-only-clipped-overflow-content-expected.txt (added)
• LayoutTests/fast/events/spatial-navigation/snav-only-clipped-overflow-content.html (added)
• WebCore/ChangeLog (modified) (1 diff)
• WebCore/page/FocusController.cpp (modified) (1 diff)
• WebCore/page/SpatialNavigation.cpp (modified) (2 diffs)
• WebCore/page/SpatialNavigation.h (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2010-06-16  Antonio Gomes  <tonikitoo@webkit.org>
+
+        Reviewed by Simon Fraser.
+
+        Spatial Navigation: refactor scrollInDirection to work with scrollable content
+        https://bugs.webkit.org/show_bug.cgi?id=39195
+
+        * fast/events/spatial-navigation/snav-only-clipped-overflow-content-expected.txt: Added.
+        * fast/events/spatial-navigation/snav-only-clipped-overflow-content.html: Added.
+
 2010-06-16  Dimitri Glazkov  <dglazkov@chromium.org>
 

trunk/WebCore/ChangeLog

@@ +1 @@
+2010-06-16  Antonio Gomes  <tonikitoo@webkit.org>
+
+        Reviewed by Simon Fraser.
+
+        Spatial Navigation: refactor scrollInDirection to work with scrollable content
+        https://bugs.webkit.org/show_bug.cgi?id=39195
+
+        scrollInDirection now receives as parameter the node that the Spatial Navigation
+        found as the more appropriated to move focus to. If it is in a scrollable container
+        (e.g. <div> with clipped overflow content), it scrolls recursively starting from
+        the container, not the current focused node.
+
+        Test: fast/events/spatial-navigation/snav-only-clipped-overflow-content.html
+
+        * page/FocusController.cpp:
+        (WebCore::FocusController::advanceFocusDirectionally):
+        * page/SpatialNavigation.cpp:
+        (WebCore::scrollInDirection):
+        * page/SpatialNavigation.h:
+
 2010-06-16  Brady Eidson  <beidson@apple.com>
 

trunk/WebCore/page/FocusController.cpp

@@ -320 +320 @@
     if (hasOffscreenRect(node)) {
         Frame* frame = node->document()->view()->frame();
-        scrollInDirection(frame, direction);
+        scrollInDirection(frame, direction, focusCandidate);
         return true;
     }

trunk/WebCore/page/SpatialNavigation.cpp

@@ -449 +449 @@
 // In a bottom-up way, this method tries to scroll |frame| in a given direction
 // |direction|, going up in the frame tree hierarchy in case it does not succeed.
-bool scrollInDirection(Frame* frame, FocusDirection direction)
+bool scrollInDirection(Frame* frame, FocusDirection direction, const FocusCandidate& candidate)
 {
     if (!frame)
@@ -472 +472 @@
         return false;
     }
+
+    if (!candidate.isNull() && isScrollableContainerNode(candidate.enclosingScrollableBox))
+        return frame->eventHandler()->scrollRecursively(scrollDirection, ScrollByLine, candidate.enclosingScrollableBox);
 
     return frame->eventHandler()->scrollRecursively(scrollDirection, ScrollByLine);

trunk/WebCore/page/SpatialNavigation.h

@@ -129 +129 @@
 
 void distanceDataForNode(FocusDirection direction, Node* start, FocusCandidate& candidate);
-bool scrollInDirection(Frame*, FocusDirection);
+bool scrollInDirection(Frame*, FocusDirection, const FocusCandidate& candidate = FocusCandidate());
 void scrollIntoView(Element*);
 bool hasOffscreenRect(Node*);