Changeset 56311 in webkit

Timestamp:

Mar 20, 2010 3:20:12 PM (14 years ago)

Author:

tonikitoo@webkit.org

Message:

Spatial Navigation: Code simplification in FocusController.cpp and SpatialNavigation.cpp (part I)
​https://bugs.webkit.org/show_bug.cgi?id=36168

Reviewed by Kenneth Christiansen.
Patch by Antonio Gomes <​tonikitoo@webkit.org>

Make use of isNull and document methods introduced in FocusCandidate class by patch in bug 36167.
No functionalty change.

• page/FocusController.cpp:

(WebCore::updateFocusCandidateIfCloser):

• page/SpatialNavigation.cpp:

(WebCore::distanceInDirection):

Location:

trunk/WebCore

Files:

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

trunk/WebCore/ChangeLog

@@ +1 @@
+2010-03-20  Antonio Gomes  <tonikitoo@webkit.org>
+
+        Reviewed by Kenneth Christiansen.
+        Patch by Antonio Gomes <tonikitoo@webkit.org>
+
+        Spatial Navigation: Code simplification in FocusController.cpp and SpatialNavigation.cpp (part I)
+        https://bugs.webkit.org/show_bug.cgi?id=36168
+
+        Make use of isNull and document methods introduced in FocusCandidate class by patch in bug 36167.
+        No functionalty change.
+
+        * page/FocusController.cpp:
+        (WebCore::updateFocusCandidateIfCloser):
+        * page/SpatialNavigation.cpp:
+        (WebCore::distanceInDirection):
+
 2010-03-20  Kevin Ollivier  <kevino@theolliviers.com>
 

trunk/WebCore/page/FocusController.cpp

@@ -362 +362 @@
         // |focusedNode|.
         if (!((isInRootDocument(candidate) && !isInRootDocument(focusedNode))
-            && closestFocusCandidate.node
-            && focusedNode->document() == closestFocusCandidate.node->document())) {
+            && focusedNode->document() == closestFocusCandidate.document())) {
             closestFocusCandidate.node = candidate;
             closestFocusCandidate.distance = distance;

trunk/WebCore/page/SpatialNavigation.cpp

@@ -77 +77 @@
     RectsAlignment alignment = alignmentForRects(direction, curRect, targetRect);
 
-    bool sameDocument = candidate.node && dest->document() == candidate.node->document();
+    bool sameDocument = dest->document() == candidate.document();
     if (sameDocument) {
         if (candidate.alignment > alignment || (candidate.parentAlignment && alignment > candidate.parentAlignment))
@@ -86 +86 @@
     // FIXME_tonikitoo: simplify the logic here !
     if (alignment != None
-        || (candidate.node && candidate.parentAlignment >= alignment
-        && (candidate.node->document() == dest->document())
-        && alignment > None)) {
+        || (!candidate.isNull() && candidate.parentAlignment >= alignment
+        && candidate.document() == dest->document())) {
 
         // If we are now in an higher precedent case, lets reset the current |candidate|'s