Changeset 73627 in webkit

Timestamp:

Dec 9, 2010 10:53:47 AM (13 years ago)

Author:

tonikitoo@webkit.org

Message:

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

Reviewed by Daniel Bates.

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

Patch unifies two FocusCandidate constructors, making caller sites
simpler. Now the special handling HTMLAreaElement gets is done within
the non default constructor (i.e. FocusCanditate(Node*, FocusDirection)).

No new tests needed.

• page/FocusController.cpp: (WebCore::FocusController::findFocusCandidateInContainer):
• page/SpatialNavigation.cpp: (WebCore::FocusCandidate::FocusCandidate):

Location:

trunk/WebCore

Files:

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

trunk/WebCore/ChangeLog

@@ +1 @@
+2010-12-07  Antonio Gomes  <agomes@rim.com>
+
+        Reviewed by Daniel Bates.
+
+        Spatial Navigation: code clean up
+        https://bugs.webkit.org/show_bug.cgi?id=50666
+
+        Patch unifies two FocusCandidate constructors, making caller sites
+        simpler. Now the special handling HTMLAreaElement gets is done within
+        the non default constructor (i.e. FocusCanditate(Node*, FocusDirection)).
+
+        No new tests needed.
+
+        * page/FocusController.cpp:
+        (WebCore::FocusController::findFocusCandidateInContainer):
+        * page/SpatialNavigation.cpp:
+        (WebCore::FocusCandidate::FocusCandidate):
+
 2010-12-09  Philippe Normand  <pnormand@igalia.com>
 

trunk/WebCore/page/FocusController.cpp

@@ -479 +479 @@
             continue;
 
-        if (node->hasTagName(areaTag)) {
-            HTMLAreaElement* area = static_cast<HTMLAreaElement*>(node);
-            FocusCandidate candidate(area, direction);
-            if (candidate.isNull())
-                continue;
-
-            candidate.enclosingScrollableBox = container;
-            updateFocusCandidateIfNeeded(direction, startingRect, candidate, closest);
+        FocusCandidate candidate = FocusCandidate(node, direction);
+        if (candidate.isNull())
             continue;
-        }
-
-        if (!node->renderer())
-            continue;
-
-        FocusCandidate candidate(node, direction);
+
         candidate.enclosingScrollableBox = container;
         updateFocusCandidateIfNeeded(direction, startingRect, candidate, closest);

trunk/WebCore/page/SpatialNavigation.cpp

@@ -37 +37 @@
 #include "HTMLImageElement.h"
 #include "HTMLMapElement.h"
+#include "HTMLNames.h"
 #include "IntRect.h"
 #include "Node.h"
@@ -56 +57 @@
 
 FocusCandidate::FocusCandidate(Node* n, FocusDirection direction)
-    : visibleNode(n)
-    , focusableNode(n)
-    , enclosingScrollableBox(0)
-    , distance(maxDistance())
-    , parentDistance(maxDistance())
-    , alignment(None)
-    , parentAlignment(None)
-    , rect(nodeRectInAbsoluteCoordinates(n, true /* ignore border */))
-    , isOffscreen(hasOffscreenRect(n))
-    , isOffscreenAfterScrolling(hasOffscreenRect(n, direction))
-{
-}
-
-FocusCandidate::FocusCandidate(HTMLAreaElement* area, FocusDirection direction)
     : visibleNode(0)
     , focusableNode(0)
@@ -80 +67 @@
     , isOffscreenAfterScrolling(true)
 {
-    HTMLImageElement* image = area->imageElement();
-    if (!image)
-        return;
-
-    focusableNode = area;
-    visibleNode = image;
-    rect = virtualRectForAreaElementAndDirection(direction, area);
-    isOffscreen = hasOffscreenRect(image);
-    isOffscreenAfterScrolling = hasOffscreenRect(image, direction);
+    if (n->hasTagName(HTMLNames::areaTag)) {
+        HTMLAreaElement* area = static_cast<HTMLAreaElement*>(n);
+        HTMLImageElement* image = area->imageElement();
+        if (!image || !image->renderer())
+            return;
+
+        visibleNode = image;
+        rect = virtualRectForAreaElementAndDirection(direction, area);
+    } else {
+        if (!n->renderer())
+            return;
+
+        visibleNode = n;
+        rect = nodeRectInAbsoluteCoordinates(n, true /* ignore border */);
+    }
+
+    focusableNode = n;
+    isOffscreen = hasOffscreenRect(visibleNode);
+    isOffscreenAfterScrolling = hasOffscreenRect(visibleNode, direction);
 }