<!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>[47643] 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/47643">47643</a></dd>
<dt>Author</dt> <dd>hyatt@apple.com</dd>
<dt>Date</dt> <dd>2009-08-21 15:19:51 -0700 (Fri, 21 Aug 2009)</dd>
</dl>

<h3>Log Message</h3>
<pre>https://bugs.webkit.org/show_bug.cgi?id=28625, focus rings don't respect the non-strict mode
line box shrinking quirk.  Make sure outlines don't extend outside the lineTop and lineBottom
of the root line box.

Reviewed by Simon Fraser.

Covered by existing tests.

* rendering/RenderBlock.cpp:
(WebCore::RenderBlock::addFocusRingRects):
* rendering/RenderInline.cpp:
(WebCore::RenderInline::addFocusRingRects):
(WebCore::RenderInline::paintOutline):</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkWebCoreChangeLog">trunk/WebCore/ChangeLog</a></li>
<li><a href="#trunkWebCorerenderingRenderBlockcpp">trunk/WebCore/rendering/RenderBlock.cpp</a></li>
<li><a href="#trunkWebCorerenderingRenderInlinecpp">trunk/WebCore/rendering/RenderInline.cpp</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/WebCore/ChangeLog (47642 => 47643)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebCore/ChangeLog        2009-08-21 22:08:27 UTC (rev 47642)
+++ trunk/WebCore/ChangeLog        2009-08-21 22:19:51 UTC (rev 47643)
</span><span class="lines">@@ -1,3 +1,19 @@
</span><ins>+2009-08-21  David Hyatt  &lt;hyatt@apple.com&gt;
+
+        Reviewed by Simon Fraser.
+
+        https://bugs.webkit.org/show_bug.cgi?id=28625, focus rings don't respect the non-strict mode
+        line box shrinking quirk.  Make sure outlines don't extend outside the lineTop and lineBottom
+        of the root line box.
+
+        Covered by existing tests.
+
+        * rendering/RenderBlock.cpp:
+        (WebCore::RenderBlock::addFocusRingRects):
+        * rendering/RenderInline.cpp:
+        (WebCore::RenderInline::addFocusRingRects):
+        (WebCore::RenderInline::paintOutline):
+
</ins><span class="cx"> 2009-08-21  Ryosuke Niwa  &lt;rniwa@webkit.org&gt;
</span><span class="cx"> 
</span><span class="cx">         No Review.
</span></span></pre></div>
<a id="trunkWebCorerenderingRenderBlockcpp"></a>
<div class="modfile"><h4>Modified: trunk/WebCore/rendering/RenderBlock.cpp (47642 => 47643)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebCore/rendering/RenderBlock.cpp        2009-08-21 22:08:27 UTC (rev 47642)
+++ trunk/WebCore/rendering/RenderBlock.cpp        2009-08-21 22:19:51 UTC (rev 47643)
</span><span class="lines">@@ -4960,8 +4960,11 @@
</span><span class="cx">         graphicsContext-&gt;addFocusRingRect(IntRect(tx, ty, width(), height()));
</span><span class="cx"> 
</span><span class="cx">     if (!hasOverflowClip() &amp;&amp; !hasControlClip()) {
</span><del>-        for (InlineRunBox* curr = firstLineBox(); curr; curr = curr-&gt;nextLineBox())
-            graphicsContext-&gt;addFocusRingRect(IntRect(tx + curr-&gt;x(), ty + curr-&gt;y(), curr-&gt;width(), curr-&gt;height()));
</del><ins>+        for (RootInlineBox* curr = firstRootBox(); curr; curr = curr-&gt;nextRootBox()) {
+            int top = max(curr-&gt;lineTop(), curr-&gt;y());
+            int bottom = min(curr-&gt;lineBottom(), curr-&gt;y() + curr-&gt;height());
+            graphicsContext-&gt;addFocusRingRect(IntRect(tx + curr-&gt;x(), ty + top, curr-&gt;width(), bottom - top));
+        }
</ins><span class="cx"> 
</span><span class="cx">         for (RenderObject* curr = firstChild(); curr; curr = curr-&gt;nextSibling()) {
</span><span class="cx">             if (!curr-&gt;isText() &amp;&amp; !curr-&gt;isListMarker() &amp;&amp; curr-&gt;isBox()) {
</span></span></pre></div>
<a id="trunkWebCorerenderingRenderInlinecpp"></a>
<div class="modfile"><h4>Modified: trunk/WebCore/rendering/RenderInline.cpp (47642 => 47643)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebCore/rendering/RenderInline.cpp        2009-08-21 22:08:27 UTC (rev 47642)
+++ trunk/WebCore/rendering/RenderInline.cpp        2009-08-21 22:19:51 UTC (rev 47643)
</span><span class="lines">@@ -818,8 +818,12 @@
</span><span class="cx"> 
</span><span class="cx"> void RenderInline::addFocusRingRects(GraphicsContext* graphicsContext, int tx, int ty)
</span><span class="cx"> {
</span><del>-    for (InlineRunBox* curr = firstLineBox(); curr; curr = curr-&gt;nextLineBox())
-        graphicsContext-&gt;addFocusRingRect(IntRect(tx + curr-&gt;x(), ty + curr-&gt;y(), curr-&gt;width(), curr-&gt;height()));
</del><ins>+    for (InlineRunBox* curr = firstLineBox(); curr; curr = curr-&gt;nextLineBox()) {
+        RootInlineBox* root = curr-&gt;root();
+        int top = max(root-&gt;lineTop(), curr-&gt;y());
+        int bottom = min(root-&gt;lineBottom(), curr-&gt;y() + curr-&gt;height());
+        graphicsContext-&gt;addFocusRingRect(IntRect(tx + curr-&gt;x(), ty + top, curr-&gt;width(), bottom - top));
+    }
</ins><span class="cx"> 
</span><span class="cx">     for (RenderObject* curr = firstChild(); curr; curr = curr-&gt;nextSibling()) {
</span><span class="cx">         if (!curr-&gt;isText() &amp;&amp; !curr-&gt;isListMarker()) {
</span><span class="lines">@@ -871,9 +875,12 @@
</span><span class="cx">     Vector&lt;IntRect&gt; rects;
</span><span class="cx"> 
</span><span class="cx">     rects.append(IntRect());
</span><del>-    for (InlineRunBox* curr = firstLineBox(); curr; curr = curr-&gt;nextLineBox())
-        rects.append(IntRect(curr-&gt;x(), curr-&gt;y(), curr-&gt;width(), curr-&gt;height()));
-
</del><ins>+    for (InlineRunBox* curr = firstLineBox(); curr; curr = curr-&gt;nextLineBox()) {
+        RootInlineBox* root = curr-&gt;root();
+        int top = max(root-&gt;lineTop(), curr-&gt;y());
+        int bottom = min(root-&gt;lineBottom(), curr-&gt;y() + curr-&gt;height());
+        rects.append(IntRect(curr-&gt;x(), top, curr-&gt;width(), bottom - top));
+    }
</ins><span class="cx">     rects.append(IntRect());
</span><span class="cx"> 
</span><span class="cx">     for (unsigned i = 1; i &lt; rects.size() - 1; i++)
</span></span></pre>
</div>
</div>

</body>
</html>