<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[56311] trunk/WebCore</title>
</head>
<body>

<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt;  }
#msg dl a { font-weight: bold}
#msg dl a:link    { color:#fc3; }
#msg dl a:active  { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff  {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/56311">56311</a></dd>
<dt>Author</dt> <dd>tonikitoo@webkit.org</dd>
<dt>Date</dt> <dd>2010-03-20 15:20:12 -0700 (Sat, 20 Mar 2010)</dd>
</dl>

<h3>Log Message</h3>
<pre>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 &lt;tonikitoo@webkit.org&gt;

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):</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkWebCoreChangeLog">trunk/WebCore/ChangeLog</a></li>
<li><a href="#trunkWebCorepageFocusControllercpp">trunk/WebCore/page/FocusController.cpp</a></li>
<li><a href="#trunkWebCorepageSpatialNavigationcpp">trunk/WebCore/page/SpatialNavigation.cpp</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/WebCore/ChangeLog (56310 => 56311)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebCore/ChangeLog        2010-03-20 21:00:55 UTC (rev 56310)
+++ trunk/WebCore/ChangeLog        2010-03-20 22:20:12 UTC (rev 56311)
</span><span class="lines">@@ -1,3 +1,19 @@
</span><ins>+2010-03-20  Antonio Gomes  &lt;tonikitoo@webkit.org&gt;
+
+        Reviewed by Kenneth Christiansen.
+        Patch by Antonio Gomes &lt;tonikitoo@webkit.org&gt;
+
+        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):
+
</ins><span class="cx"> 2010-03-20  Kevin Ollivier  &lt;kevino@theolliviers.com&gt;
</span><span class="cx"> 
</span><span class="cx">         [wx] Build fixes after recent changes.
</span></span></pre></div>
<a id="trunkWebCorepageFocusControllercpp"></a>
<div class="modfile"><h4>Modified: trunk/WebCore/page/FocusController.cpp (56310 => 56311)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebCore/page/FocusController.cpp        2010-03-20 21:00:55 UTC (rev 56310)
+++ trunk/WebCore/page/FocusController.cpp        2010-03-20 22:20:12 UTC (rev 56311)
</span><span class="lines">@@ -361,8 +361,7 @@
</span><span class="cx">         // not another already good focusable candidate in the same document as
</span><span class="cx">         // |focusedNode|.
</span><span class="cx">         if (!((isInRootDocument(candidate) &amp;&amp; !isInRootDocument(focusedNode))
</span><del>-            &amp;&amp; closestFocusCandidate.node
-            &amp;&amp; focusedNode-&gt;document() == closestFocusCandidate.node-&gt;document())) {
</del><ins>+            &amp;&amp; focusedNode-&gt;document() == closestFocusCandidate.document())) {
</ins><span class="cx">             closestFocusCandidate.node = candidate;
</span><span class="cx">             closestFocusCandidate.distance = distance;
</span><span class="cx">         }
</span></span></pre></div>
<a id="trunkWebCorepageSpatialNavigationcpp"></a>
<div class="modfile"><h4>Modified: trunk/WebCore/page/SpatialNavigation.cpp (56310 => 56311)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebCore/page/SpatialNavigation.cpp        2010-03-20 21:00:55 UTC (rev 56310)
+++ trunk/WebCore/page/SpatialNavigation.cpp        2010-03-20 22:20:12 UTC (rev 56311)
</span><span class="lines">@@ -76,7 +76,7 @@
</span><span class="cx">     // considered in order to make the algorithm to behavior in a more intuitive way.
</span><span class="cx">     RectsAlignment alignment = alignmentForRects(direction, curRect, targetRect);
</span><span class="cx"> 
</span><del>-    bool sameDocument = candidate.node &amp;&amp; dest-&gt;document() == candidate.node-&gt;document();
</del><ins>+    bool sameDocument = dest-&gt;document() == candidate.document();
</ins><span class="cx">     if (sameDocument) {
</span><span class="cx">         if (candidate.alignment &gt; alignment || (candidate.parentAlignment &amp;&amp; alignment &gt; candidate.parentAlignment))
</span><span class="cx">             return maxDistance();
</span><span class="lines">@@ -85,9 +85,8 @@
</span><span class="cx"> 
</span><span class="cx">     // FIXME_tonikitoo: simplify the logic here !
</span><span class="cx">     if (alignment != None
</span><del>-        || (candidate.node &amp;&amp; candidate.parentAlignment &gt;= alignment
-        &amp;&amp; (candidate.node-&gt;document() == dest-&gt;document())
-        &amp;&amp; alignment &gt; None)) {
</del><ins>+        || (!candidate.isNull() &amp;&amp; candidate.parentAlignment &gt;= alignment
+        &amp;&amp; candidate.document() == dest-&gt;document())) {
</ins><span class="cx"> 
</span><span class="cx">         // If we are now in an higher precedent case, lets reset the current |candidate|'s
</span><span class="cx">         // |distance| so we force it to be bigger than the result we will get from
</span></span></pre>
</div>
</div>

</body>
</html>