Changeset 72797 in webkit

Timestamp:

Nov 29, 2010 7:40:24 AM (13 years ago)

Author:

yael.aharon@nokia.com

Message:

Spatial Navigation: Store more information in FocusCandidate
​https://bugs.webkit.org/show_bug.cgi?id=50153

Reviewed by Antonio Gomes.

More information should be stored in FocusCandidate, to avoid
recalculating it when running the spatial navigation algorithm.

No new tests, since this is code refactoring only.

• page/FocusController.cpp:

(WebCore::updateFocusCandidateIfNeeded):
(WebCore::FocusController::findFocusCandidateInContainer):
(WebCore::FocusController::advanceFocusDirectionallyInContainer):

• page/SpatialNavigation.cpp:

(WebCore::FocusCandidate::FocusCandidate):
(WebCore::canBeScrolledIntoView):

• page/SpatialNavigation.h:

(WebCore::FocusCandidate::FocusCandidate):

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• page/FocusController.cpp (modified) (7 diffs)
• page/SpatialNavigation.cpp (modified) (3 diffs)
• page/SpatialNavigation.h (modified) (2 diffs)

trunk/WebCore/ChangeLog

@@ +1 @@
+2010-11-29  Yael Aharon  <yael.aharon@nokia.com>
+
+        Reviewed by Antonio Gomes.
+
+        Spatial Navigation: Store more information in FocusCandidate
+        https://bugs.webkit.org/show_bug.cgi?id=50153
+
+        More information should be stored in FocusCandidate, to avoid
+        recalculating it when running the spatial navigation algorithm.
+
+        No new tests, since this is code refactoring only.
+
+        * page/FocusController.cpp:
+        (WebCore::updateFocusCandidateIfNeeded):
+        (WebCore::FocusController::findFocusCandidateInContainer):
+        (WebCore::FocusController::advanceFocusDirectionallyInContainer):
+        * page/SpatialNavigation.cpp:
+        (WebCore::FocusCandidate::FocusCandidate):
+        (WebCore::canBeScrolledIntoView):
+        * page/SpatialNavigation.h:
+        (WebCore::FocusCandidate::FocusCandidate):
+
 2010-11-29  Dimitri Glazkov  <dglazkov@chromium.org>
 

trunk/WebCore/page/FocusController.cpp

@@ -423 +423 @@
 
     // Ignore off screen child nodes of containers that do not scroll (overflow:hidden)
-    if (hasOffscreenRect(candidate.node) && !canBeScrolledIntoView(direction, candidate))
+    if (candidate.isOffscreen && !canBeScrolledIntoView(direction, candidate))
         return;
 
@@ -432 +432 @@
         return;
 
-    if (hasOffscreenRect(candidate.node, direction) && candidate.alignment < Full)
+    if (candidate.isOffscreenAfterScrolling && candidate.alignment < Full)
         return;
 
@@ -440 +440 @@
     }
 
-    IntRect intersectionRect = intersection(nodeRectInAbsoluteCoordinates(candidate.node, true), nodeRectInAbsoluteCoordinates(closest.node, true));
+    IntRect intersectionRect = intersection(candidate.rect, closest.rect);
     if (!intersectionRect.isEmpty()) {
         // If 2 nodes are intersecting, do hit test to find which node in on top.
@@ -480 +480 @@
             continue;
 
-        FocusCandidate candidate(node);
+        FocusCandidate candidate(node, direction);
         candidate.enclosingScrollableBox = container;
         updateFocusCandidateIfNeeded(direction, startingRect, candidate, closest);
@@ -516 +516 @@
         ASSERT(frameElement->contentFrame());
 
-        if (hasOffscreenRect(focusCandidate.node, direction)) {
+        if (focusCandidate.isOffscreenAfterScrolling) {
             scrollInDirection(focusCandidate.node->document(), direction);
             return true;
@@ -533 +533 @@
     }
     if (canScrollInDirection(direction, focusCandidate.node)) {
-        if (hasOffscreenRect(focusCandidate.node, direction)) {
+        if (focusCandidate.isOffscreenAfterScrolling) {
             scrollInDirection(focusCandidate.node, direction);
             return true;
@@ -544 +544 @@
         return advanceFocusDirectionallyInContainer(focusCandidate.node, startingRect, direction, event);
     }
-    if (hasOffscreenRect(focusCandidate.node, direction)) {
+    if (focusCandidate.isOffscreenAfterScrolling) {
         Node* container = focusCandidate.enclosingScrollableBox;
         scrollInDirection(container, direction);

trunk/WebCore/page/SpatialNavigation.cpp

@@ -52 +52 @@
 
 
-FocusCandidate::FocusCandidate(Node* n)
+FocusCandidate::FocusCandidate(Node* n, FocusDirection direction)
     : node(n)
     , enclosingScrollableBox(0)
@@ -60 +60 @@
     , parentAlignment(None)
     , rect(nodeRectInAbsoluteCoordinates(n, true /* ignore border */))
+    , isOffscreen(hasOffscreenRect(n))
+    , isOffscreenAfterScrolling(hasOffscreenRect(n, direction))
 {
 }
@@ -623 +625 @@
 bool canBeScrolledIntoView(FocusDirection direction, const FocusCandidate& candidate)
 {
-    ASSERT(candidate.node && hasOffscreenRect(candidate.node));
+    ASSERT(candidate.node && candidate.isOffscreen);
     IntRect candidateRect = candidate.rect;
     for (Node* parentNode = candidate.node->parent(); parentNode; parentNode = parentNode->parent()) {

trunk/WebCore/page/SpatialNavigation.h

@@ -106 +106 @@
         , alignment(None)
         , parentAlignment(None)
+        , isOffscreen(true)
+        , isOffscreenAfterScrolling(true)
     {
     }
 
-    FocusCandidate(Node* n);
+    FocusCandidate(Node* n, FocusDirection);
     bool isNull() const { return !node; }
     bool inScrollableContainer() const { return node && enclosingScrollableBox; }
@@ -121 +123 @@
     RectsAlignment parentAlignment;
     IntRect rect;
+    bool isOffscreen;
+    bool isOffscreenAfterScrolling;
 };