<!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" /><style type="text/css"><!--
#msg dl { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer { 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, #msg p { overflow: auto; background: #ffc; border: 1px #fc0 solid; padding: 6px; }
#msg ul { overflow: auto; }
#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>
<title>[28890] trunk/WebCore</title>
</head>
<body>

<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/28890">28890</a></dd>
<dt>Author</dt> <dd>sullivan@apple.com</dd>
<dt>Date</dt> <dd>2007-12-20 10:49:23 -0800 (Thu, 20 Dec 2007)</dd>
</dl>

<h3>Log Message</h3>
<pre>        Reviewed by Oliver and Geoff
        
        - fix &lt;rdar://problem/5536858&gt; Yellow highlight for find results is sometimes shorter 
          than white &quot;hole&quot; behind it

        * rendering/RenderText.cpp:
        (WebCore::RenderText::addLineBoxRects):
        respect useSelectionHeight in all cases; we were only respecting it in one of the two cases</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkWebCoreChangeLog">trunk/WebCore/ChangeLog</a></li>
<li><a href="#trunkWebCorerenderingRenderTextcpp">trunk/WebCore/rendering/RenderText.cpp</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/WebCore/ChangeLog (28889 => 28890)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebCore/ChangeLog        2007-12-20 18:28:50 UTC (rev 28889)
+++ trunk/WebCore/ChangeLog        2007-12-20 18:49:23 UTC (rev 28890)
</span><span class="lines">@@ -1,3 +1,14 @@
</span><ins>+2007-12-20  John Sullivan  &lt;sullivan@apple.com&gt;
+
+        Reviewed by Oliver and Geoff
+        
+        - fix &lt;rdar://problem/5536858&gt; Yellow highlight for find results is sometimes shorter 
+          than white &quot;hole&quot; behind it
+
+        * rendering/RenderText.cpp:
+        (WebCore::RenderText::addLineBoxRects):
+        respect useSelectionHeight in all cases; we were only respecting it in one of the two cases
+
</ins><span class="cx"> 2007-12-20  Dan Bernstein  &lt;mitz@apple.com&gt;
</span><span class="cx"> 
</span><span class="cx">         Reviewed by Darin Adler.
</span></span></pre></div>
<a id="trunkWebCorerenderingRenderTextcpp"></a>
<div class="modfile"><h4>Modified: trunk/WebCore/rendering/RenderText.cpp (28889 => 28890)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebCore/rendering/RenderText.cpp        2007-12-20 18:28:50 UTC (rev 28889)
+++ trunk/WebCore/rendering/RenderText.cpp        2007-12-20 18:49:23 UTC (rev 28890)
</span><span class="lines">@@ -197,13 +197,29 @@
</span><span class="cx"> 
</span><span class="cx"> void RenderText::addLineBoxRects(Vector&lt;IntRect&gt;&amp; rects, unsigned start, unsigned end, bool useSelectionHeight)
</span><span class="cx"> {
</span><ins>+    // Work around signed/unsigned issues. This function takes unsigneds, and is often passed UINT_MAX
+    // to mean &quot;all the way to the end&quot;. InlineTextBox coordinates are unsigneds, so changing this 
+    // function to take ints causes various internal mismatches. But selectionRect takes ints, and 
+    // passing UINT_MAX to it causes trouble. Ideally we'd change selectionRect to take unsigneds, but 
+    // that would cause many ripple effects, so for now we'll just clamp our unsigned parameters to INT_MAX.
+    ASSERT(end == UINT_MAX || end &lt;= INT_MAX);
+    ASSERT(start &lt;= INT_MAX);
+    start = min(start, static_cast&lt;unsigned&gt;(INT_MAX));
+    end = min(end, static_cast&lt;unsigned&gt;(INT_MAX));
+    
</ins><span class="cx">     int x, y;
</span><span class="cx">     absolutePositionForContent(x, y);
</span><span class="cx"> 
</span><span class="cx">     for (InlineTextBox* box = firstTextBox(); box; box = box-&gt;nextTextBox()) {
</span><del>-        if (start &lt;= box-&gt;start() &amp;&amp; box-&gt;end() &lt;= end)
-            rects.append(IntRect(x + box-&gt;xPos(), y + box-&gt;yPos(), box-&gt;width(), box-&gt;height()));
-        else {
</del><ins>+        if (start &lt;= box-&gt;start() &amp;&amp; box-&gt;end() &lt;= end) {
+            IntRect r = IntRect(x + box-&gt;xPos(), y + box-&gt;yPos(), box-&gt;width(), box-&gt;height());
+            if (useSelectionHeight) {
+                IntRect selectionRect = box-&gt;selectionRect(x, y, start, end);
+                r.setHeight(selectionRect.height());
+                r.setY(selectionRect.y());
+            }
+            rects.append(r);
+        } else {
</ins><span class="cx">             unsigned realEnd = min(box-&gt;end() + 1, end); // box-&gt;end() points at the last char, not after it
</span><span class="cx">             IntRect r = box-&gt;selectionRect(x, y, start, realEnd);
</span><span class="cx">             if (!r.isEmpty()) {
</span></span></pre>
</div>
</div>

</body>
</html>