<!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>[168437] trunk/Source/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/168437">168437</a></dd>
<dt>Author</dt> <dd>dino@apple.com</dd>
<dt>Date</dt> <dd>2014-05-07 13:03:13 -0700 (Wed, 07 May 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Clean up the difference between painting focus rings and adding PDF annotations
https://bugs.webkit.org/show_bug.cgi?id=132638
Follow-up comments from Darin Adler.
* rendering/RenderInline.cpp:
(WebCore::RenderInline::paintOutline): Move "else if" to a separate "if" for clarity.
* rendering/RenderObject.cpp:
(WebCore::RenderObject::paintFocusRing): Don't guard against outlineIsAuto(). ASSERT instead.
(WebCore::RenderObject::addPDFURLRect): Give "rect" variable a better name.
(WebCore::RenderObject::paintOutline): Move "else if" to a separate "if" for clarity.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderInlinecpp">trunk/Source/WebCore/rendering/RenderInline.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderObjectcpp">trunk/Source/WebCore/rendering/RenderObject.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (168436 => 168437)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-05-07 19:59:16 UTC (rev 168436)
+++ trunk/Source/WebCore/ChangeLog 2014-05-07 20:03:13 UTC (rev 168437)
</span><span class="lines">@@ -1,3 +1,17 @@
</span><ins>+2014-05-07 Dean Jackson <dino@apple.com>
+
+ Clean up the difference between painting focus rings and adding PDF annotations
+ https://bugs.webkit.org/show_bug.cgi?id=132638
+
+ Follow-up comments from Darin Adler.
+
+ * rendering/RenderInline.cpp:
+ (WebCore::RenderInline::paintOutline): Move "else if" to a separate "if" for clarity.
+ * rendering/RenderObject.cpp:
+ (WebCore::RenderObject::paintFocusRing): Don't guard against outlineIsAuto(). ASSERT instead.
+ (WebCore::RenderObject::addPDFURLRect): Give "rect" variable a better name.
+ (WebCore::RenderObject::paintOutline): Move "else if" to a separate "if" for clarity.
+
</ins><span class="cx"> 2014-05-07 Alexey Proskuryakov <ap@apple.com>
</span><span class="cx">
</span><span class="cx"> Make blob size computation lazy
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderInlinecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderInline.cpp (168436 => 168437)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderInline.cpp 2014-05-07 19:59:16 UTC (rev 168436)
+++ trunk/Source/WebCore/rendering/RenderInline.cpp 2014-05-07 20:03:13 UTC (rev 168437)
</span><span class="lines">@@ -1490,12 +1490,13 @@
</span><span class="cx"> {
</span><span class="cx"> if (!hasOutline())
</span><span class="cx"> return;
</span><del>-
</del><ins>+
</ins><span class="cx"> RenderStyle& styleToUse = style();
</span><span class="cx"> // Only paint the focus ring by hand if the theme isn't able to draw it.
</span><span class="cx"> if (styleToUse.outlineStyleIsAuto() && !theme().supportsFocusRing(&styleToUse))
</span><span class="cx"> paintFocusRing(paintInfo, paintOffset, &styleToUse);
</span><del>- else if (hasOutlineAnnotation() && !theme().supportsFocusRing(&styleToUse))
</del><ins>+
+ if (hasOutlineAnnotation() && !styleToUse.outlineStyleIsAuto() && !theme().supportsFocusRing(&styleToUse))
</ins><span class="cx"> addPDFURLRect(paintInfo, paintOffset);
</span><span class="cx">
</span><span class="cx"> GraphicsContext* graphicsContext = paintInfo.context;
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderObjectcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderObject.cpp (168436 => 168437)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderObject.cpp 2014-05-07 19:59:16 UTC (rev 168436)
+++ trunk/Source/WebCore/rendering/RenderObject.cpp 2014-05-07 20:03:13 UTC (rev 168437)
</span><span class="lines">@@ -999,27 +999,27 @@
</span><span class="cx">
</span><span class="cx"> void RenderObject::paintFocusRing(PaintInfo& paintInfo, const LayoutPoint& paintOffset, RenderStyle* style)
</span><span class="cx"> {
</span><del>- if (style->outlineStyleIsAuto()) {
- Vector<IntRect> focusRingRects;
- addFocusRingRects(focusRingRects, paintOffset, paintInfo.paintContainer);
</del><ins>+ ASSERT(style->outlineStyleIsAuto());
+
+ Vector<IntRect> focusRingRects;
+ addFocusRingRects(focusRingRects, paintOffset, paintInfo.paintContainer);
</ins><span class="cx"> #if PLATFORM(MAC)
</span><del>- bool needsRepaint;
- paintInfo.context->drawFocusRing(focusRingRects, style->outlineWidth(), style->outlineOffset(), document().page()->focusController().timeSinceFocusWasSet(), needsRepaint);
- if (needsRepaint)
- document().page()->focusController().setFocusedElementNeedsRepaint();
</del><ins>+ bool needsRepaint;
+ paintInfo.context->drawFocusRing(focusRingRects, style->outlineWidth(), style->outlineOffset(), document().page()->focusController().timeSinceFocusWasSet(), needsRepaint);
+ if (needsRepaint)
+ document().page()->focusController().setFocusedElementNeedsRepaint();
</ins><span class="cx"> #else
</span><del>- paintInfo.context->drawFocusRing(focusRingRects, style->outlineWidth(), style->outlineOffset(), style->visitedDependentColor(CSSPropertyOutlineColor));
</del><ins>+ paintInfo.context->drawFocusRing(focusRingRects, style->outlineWidth(), style->outlineOffset(), style->visitedDependentColor(CSSPropertyOutlineColor));
</ins><span class="cx"> #endif
</span><del>- }
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void RenderObject::addPDFURLRect(PaintInfo& paintInfo, const LayoutPoint& paintOffset)
</span><span class="cx"> {
</span><span class="cx"> Vector<IntRect> focusRingRects;
</span><span class="cx"> addFocusRingRects(focusRingRects, paintOffset, paintInfo.paintContainer);
</span><del>- IntRect rect = unionRect(focusRingRects);
</del><ins>+ IntRect urlRect = unionRect(focusRingRects);
</ins><span class="cx">
</span><del>- if (rect.isEmpty())
</del><ins>+ if (urlRect.isEmpty())
</ins><span class="cx"> return;
</span><span class="cx"> Node* n = node();
</span><span class="cx"> if (!n || !n->isLink() || !n->isElementNode())
</span><span class="lines">@@ -1027,7 +1027,7 @@
</span><span class="cx"> const AtomicString& href = toElement(n)->getAttribute(hrefAttr);
</span><span class="cx"> if (href.isNull())
</span><span class="cx"> return;
</span><del>- paintInfo.context->setURLForRect(n->document().completeURL(href), pixelSnappedIntRect(rect));
</del><ins>+ paintInfo.context->setURLForRect(n->document().completeURL(href), pixelSnappedIntRect(urlRect));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void RenderObject::paintOutline(PaintInfo& paintInfo, const LayoutRect& paintRect)
</span><span class="lines">@@ -1043,7 +1043,8 @@
</span><span class="cx"> // Only paint the focus ring by hand if the theme isn't able to draw it.
</span><span class="cx"> if (styleToUse.outlineStyleIsAuto() && !theme().supportsFocusRing(&styleToUse))
</span><span class="cx"> paintFocusRing(paintInfo, paintRect.location(), &styleToUse);
</span><del>- else if (hasOutlineAnnotation() && !theme().supportsFocusRing(&styleToUse))
</del><ins>+
+ if (hasOutlineAnnotation() && !styleToUse.outlineStyleIsAuto() && !theme().supportsFocusRing(&styleToUse))
</ins><span class="cx"> addPDFURLRect(paintInfo, paintRect.location());
</span><span class="cx">
</span><span class="cx"> if (styleToUse.outlineStyleIsAuto() || styleToUse.outlineStyle() == BNONE)
</span></span></pre>
</div>
</div>
</body>
</html>