Changeset 74004 in webkit

Timestamp:

Dec 13, 2010 10:51:52 PM (13 years ago)

Author:

tonikitoo@webkit.org

Message:

2010-12-13 Antonio Gomes <​agomes@rim.com>

Reviewed by Daniel Bates.

Spatial Navigation: code clean up (part IV)
​https://bugs.webkit.org/show_bug.cgi?id=50666

Avoid calling canScrollInDirection more than necessary.

No new tests needed.

• page/FocusController.cpp: (WebCore::FocusController::advanceFocusDirectionallyInContainer): Moved the call to canScrollInDirection() to within the scrollInDirection().
• page/SpatialNavigation.cpp: Removed the assertion to canScrollingDirection function. (WebCore::scrollInDirection):

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• page/FocusController.cpp (modified) (1 diff)
• page/SpatialNavigation.cpp (modified) (4 diffs)

trunk/WebCore/ChangeLog

@@ +1 @@
+2010-12-13  Antonio Gomes  <agomes@rim.com>
+
+        Reviewed by Daniel Bates.
+
+        Spatial Navigation: code clean up (part IV)
+        https://bugs.webkit.org/show_bug.cgi?id=50666
+
+        Avoid calling canScrollInDirection more than necessary.
+
+        No new tests needed.
+
+        * page/FocusController.cpp:
+        (WebCore::FocusController::advanceFocusDirectionallyInContainer): Moved the call to canScrollInDirection()
+        to within the scrollInDirection().
+        * page/SpatialNavigation.cpp: Removed the assertion to canScrollingDirection function.
+        (WebCore::scrollInDirection):
+
 2010-12-13  Antonio Gomes  <agomes@rim.com>
 

trunk/WebCore/page/FocusController.cpp

@@ -501 +501 @@
 
     if (focusCandidate.isNull()) {
-        if (canScrollInDirection(direction, container)) {
-            // Nothing to focus, scroll if possible.
-            scrollInDirection(container, direction);
-            return true;
-        }
-        // Return false will cause a re-try, skipping this container.
-        return false;
+        // Nothing to focus, scroll if possible.
+        // NOTE: If no scrolling is performed (i.e. scrollInDirection returns false), the
+        // spatial navigation algorithm will skip this container.
+        return scrollInDirection(container, direction);
     }
 

trunk/WebCore/page/SpatialNavigation.cpp

@@ -335 +335 @@
 bool scrollInDirection(Frame* frame, FocusDirection direction)
 {
-    ASSERT(frame && canScrollInDirection(direction, frame->document()));
+    ASSERT(frame);
 
     if (frame && canScrollInDirection(direction, frame->document())) {
@@ -366 +366 @@
 bool scrollInDirection(Node* container, FocusDirection direction)
 {
+    ASSERT(container);
     if (container->isDocumentNode())
         return scrollInDirection(static_cast<Document*>(container)->frame(), direction);
@@ -372 +373 @@
         return false;
 
-    if (container && canScrollInDirection(direction, container)) {
+    if (canScrollInDirection(direction, container)) {
         int dx = 0;
         int dy = 0;
@@ -398 +399 @@
         return true;
     }
+
     return false;
 }