<!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>[188577] trunk</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/188577">188577</a></dd>
<dt>Author</dt> <dd>zalan@apple.com</dd>
<dt>Date</dt> <dd>2015-08-17 23:03:51 -0700 (Mon, 17 Aug 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Outline with auto style leaves bits behind when the the box is moved.
https://bugs.webkit.org/show_bug.cgi?id=148100
Reviewed by Simon Fraser.
Source/WebCore:
We paint the focus ring when 'outline-style: auto' is present, however
we don't take the focus ring width into account when the repaint rect
is computed.
Tests: fast/repaint/outline-with1px-auto-repaint-rect.html
fast/repaint/outline-with2px-auto-repaint-rect.html
fast/repaint/outline-with3px-auto-repaint-rect.html
* rendering/RenderObject.cpp:
(WebCore::RenderObject::adjustRectForOutlineAndShadow):
* rendering/RenderThemeMac.h:
* rendering/RenderThemeMac.mm:
(WebCore::RenderThemeMac::platformFocusRingMaxWidth): Deleted. : 0 as focus ring width is incorrect.
The reason why <a href="http://trac.webkit.org/projects/webkit/changeset/169699">r169699</a> fixed the failing cases was because they all had outline width < 3 (but no auto outline style).
The correct fix is to check if the style requires focus ring painting and use the RenderTheme::platformFocusRingMaxWidth
accordingly.
LayoutTests:
Due to RenderView::maximalOutlineSize() each outline width need to be tested separately.
* fast/repaint/outline-with1px-auto-repaint-rect-expected.txt: Added.
* fast/repaint/outline-with1px-auto-repaint-rect.html: Added.
* fast/repaint/outline-with2px-auto-repaint-rect-expected.txt: Added.
* fast/repaint/outline-with2px-auto-repaint-rect.html: Added.
* fast/repaint/outline-with3px-auto-repaint-rect-expected.txt: Added.
* fast/repaint/outline-with3px-auto-repaint-rect.html: Added.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderElementcpp">trunk/Source/WebCore/rendering/RenderElement.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderElementh">trunk/Source/WebCore/rendering/RenderElement.h</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderObjectcpp">trunk/Source/WebCore/rendering/RenderObject.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderThemeMach">trunk/Source/WebCore/rendering/RenderThemeMac.h</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderThemeMacmm">trunk/Source/WebCore/rendering/RenderThemeMac.mm</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsfastrepaintoutlinewith1pxautorepaintrectexpectedtxt">trunk/LayoutTests/fast/repaint/outline-with1px-auto-repaint-rect-expected.txt</a></li>
<li><a href="#trunkLayoutTestsfastrepaintoutlinewith1pxautorepaintrecthtml">trunk/LayoutTests/fast/repaint/outline-with1px-auto-repaint-rect.html</a></li>
<li><a href="#trunkLayoutTestsfastrepaintoutlinewith2pxautorepaintrectexpectedtxt">trunk/LayoutTests/fast/repaint/outline-with2px-auto-repaint-rect-expected.txt</a></li>
<li><a href="#trunkLayoutTestsfastrepaintoutlinewith2pxautorepaintrecthtml">trunk/LayoutTests/fast/repaint/outline-with2px-auto-repaint-rect.html</a></li>
<li><a href="#trunkLayoutTestsfastrepaintoutlinewith3pxautorepaintrectexpectedtxt">trunk/LayoutTests/fast/repaint/outline-with3px-auto-repaint-rect-expected.txt</a></li>
<li><a href="#trunkLayoutTestsfastrepaintoutlinewith3pxautorepaintrecthtml">trunk/LayoutTests/fast/repaint/outline-with3px-auto-repaint-rect.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (188576 => 188577)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2015-08-18 05:55:36 UTC (rev 188576)
+++ trunk/LayoutTests/ChangeLog 2015-08-18 06:03:51 UTC (rev 188577)
</span><span class="lines">@@ -1,3 +1,19 @@
</span><ins>+2015-08-17 Zalan Bujtas <zalan@apple.com>
+
+ Outline with auto style leaves bits behind when the the box is moved.
+ https://bugs.webkit.org/show_bug.cgi?id=148100
+
+ Reviewed by Simon Fraser.
+
+ Due to RenderView::maximalOutlineSize() each outline width need to be tested separately.
+
+ * fast/repaint/outline-with1px-auto-repaint-rect-expected.txt: Added.
+ * fast/repaint/outline-with1px-auto-repaint-rect.html: Added.
+ * fast/repaint/outline-with2px-auto-repaint-rect-expected.txt: Added.
+ * fast/repaint/outline-with2px-auto-repaint-rect.html: Added.
+ * fast/repaint/outline-with3px-auto-repaint-rect-expected.txt: Added.
+ * fast/repaint/outline-with3px-auto-repaint-rect.html: Added.
+
</ins><span class="cx"> 2015-08-17 Myles C. Maxfield <mmaxfield@apple.com>
</span><span class="cx">
</span><span class="cx"> [OS X] Remove support for composite fonts
</span></span></pre></div>
<a id="trunkLayoutTestsfastrepaintoutlinewith1pxautorepaintrectexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/repaint/outline-with1px-auto-repaint-rect-expected.txt (0 => 188577)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/repaint/outline-with1px-auto-repaint-rect-expected.txt (rev 0)
+++ trunk/LayoutTests/fast/repaint/outline-with1px-auto-repaint-rect-expected.txt 2015-08-18 06:03:51 UTC (rev 188577)
</span><span class="lines">@@ -0,0 +1,6 @@
</span><ins>+PASS window.internals.repaintRectsAsText().indexOf('5 7') is not -1
+PASS window.internals.repaintRectsAsText().indexOf('5 47') is not -1
+PASS successfullyParsed is true
+
+TEST COMPLETE
+
</ins></span></pre></div>
<a id="trunkLayoutTestsfastrepaintoutlinewith1pxautorepaintrecthtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/repaint/outline-with1px-auto-repaint-rect.html (0 => 188577)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/repaint/outline-with1px-auto-repaint-rect.html (rev 0)
+++ trunk/LayoutTests/fast/repaint/outline-with1px-auto-repaint-rect.html 2015-08-18 06:03:51 UTC (rev 188577)
</span><span class="lines">@@ -0,0 +1,36 @@
</span><ins>+<html>
+<script>jsTestIsAsync = true;</script>
+<script src="../../resources/js-test-pre.js"></script>
+<head>
+<title>This tests that outline repaint rect for focus ring is correct.</title>
+<style>
+div {
+ position: absolute;
+ top: 10px;
+ height: 0px;
+ width: 10px;
+ outline: auto 1px;
+}
+</style>
+</head>
+<body>
+<div id=foo></div>
+</body>
+<script>
+setTimeout(
+ function() {
+ if (window.internals)
+ internals.startTrackingRepaints();
+ document.getElementById("foo").style.top = "50px";
+ document.body.offsetWidth;
+
+ if (window.internals) {
+ shouldNotBe("window.internals.repaintRectsAsText().indexOf('5 7')", "-1");
+ shouldNotBe("window.internals.repaintRectsAsText().indexOf('5 47')", "-1");
+ internals.stopTrackingRepaints();
+ }
+ finishJSTest();
+ }, 0);
+</script>
+<script src="../../resources/js-test-post.js"></script>
+</html>
</ins></span></pre></div>
<a id="trunkLayoutTestsfastrepaintoutlinewith2pxautorepaintrectexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/repaint/outline-with2px-auto-repaint-rect-expected.txt (0 => 188577)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/repaint/outline-with2px-auto-repaint-rect-expected.txt (rev 0)
+++ trunk/LayoutTests/fast/repaint/outline-with2px-auto-repaint-rect-expected.txt 2015-08-18 06:03:51 UTC (rev 188577)
</span><span class="lines">@@ -0,0 +1,6 @@
</span><ins>+PASS window.internals.repaintRectsAsText().indexOf('5 7') is not -1
+PASS window.internals.repaintRectsAsText().indexOf('5 47') is not -1
+PASS successfullyParsed is true
+
+TEST COMPLETE
+
</ins></span></pre></div>
<a id="trunkLayoutTestsfastrepaintoutlinewith2pxautorepaintrecthtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/repaint/outline-with2px-auto-repaint-rect.html (0 => 188577)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/repaint/outline-with2px-auto-repaint-rect.html (rev 0)
+++ trunk/LayoutTests/fast/repaint/outline-with2px-auto-repaint-rect.html 2015-08-18 06:03:51 UTC (rev 188577)
</span><span class="lines">@@ -0,0 +1,36 @@
</span><ins>+<html>
+<script>jsTestIsAsync = true;</script>
+<script src="../../resources/js-test-pre.js"></script>
+<head>
+<title>This tests that outline repaint rect for focus ring is correct.</title>
+<style>
+div {
+ position: absolute;
+ top: 10px;
+ height: 0px;
+ width: 10px;
+ outline: auto 2px;
+}
+</style>
+</head>
+<body>
+<div id=foo></div>
+</body>
+<script>
+setTimeout(
+ function() {
+ if (window.internals)
+ internals.startTrackingRepaints();
+ document.getElementById("foo").style.top = "50px";
+ document.body.offsetWidth;
+
+ if (window.internals) {
+ shouldNotBe("window.internals.repaintRectsAsText().indexOf('5 7')", "-1");
+ shouldNotBe("window.internals.repaintRectsAsText().indexOf('5 47')", "-1");
+ internals.stopTrackingRepaints();
+ }
+ finishJSTest();
+ }, 0);
+</script>
+<script src="../../resources/js-test-post.js"></script>
+</html>
</ins></span></pre></div>
<a id="trunkLayoutTestsfastrepaintoutlinewith3pxautorepaintrectexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/repaint/outline-with3px-auto-repaint-rect-expected.txt (0 => 188577)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/repaint/outline-with3px-auto-repaint-rect-expected.txt (rev 0)
+++ trunk/LayoutTests/fast/repaint/outline-with3px-auto-repaint-rect-expected.txt 2015-08-18 06:03:51 UTC (rev 188577)
</span><span class="lines">@@ -0,0 +1,6 @@
</span><ins>+PASS window.internals.repaintRectsAsText().indexOf('5 7') is not -1
+PASS window.internals.repaintRectsAsText().indexOf('5 47') is not -1
+PASS successfullyParsed is true
+
+TEST COMPLETE
+
</ins></span></pre></div>
<a id="trunkLayoutTestsfastrepaintoutlinewith3pxautorepaintrecthtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/repaint/outline-with3px-auto-repaint-rect.html (0 => 188577)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/repaint/outline-with3px-auto-repaint-rect.html (rev 0)
+++ trunk/LayoutTests/fast/repaint/outline-with3px-auto-repaint-rect.html 2015-08-18 06:03:51 UTC (rev 188577)
</span><span class="lines">@@ -0,0 +1,36 @@
</span><ins>+<html>
+<script>jsTestIsAsync = true;</script>
+<script src="../../resources/js-test-pre.js"></script>
+<head>
+<title>This tests that outline repaint rect for focus ring is correct.</title>
+<style>
+div {
+ position: absolute;
+ top: 10px;
+ height: 0px;
+ width: 10px;
+ outline: auto 3px;
+}
+</style>
+</head>
+<body>
+<div id=foo></div>
+</body>
+<script>
+setTimeout(
+ function() {
+ if (window.internals)
+ internals.startTrackingRepaints();
+ document.getElementById("foo").style.top = "50px";
+ document.body.offsetWidth;
+
+ if (window.internals) {
+ shouldNotBe("window.internals.repaintRectsAsText().indexOf('5 7')", "-1");
+ shouldNotBe("window.internals.repaintRectsAsText().indexOf('5 47')", "-1");
+ internals.stopTrackingRepaints();
+ }
+ finishJSTest();
+ }, 0);
+</script>
+<script src="../../resources/js-test-post.js"></script>
+</html>
</ins></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (188576 => 188577)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-08-18 05:55:36 UTC (rev 188576)
+++ trunk/Source/WebCore/ChangeLog 2015-08-18 06:03:51 UTC (rev 188577)
</span><span class="lines">@@ -1,3 +1,27 @@
</span><ins>+2015-08-17 Zalan Bujtas <zalan@apple.com>
+
+ Outline with auto style leaves bits behind when the the box is moved.
+ https://bugs.webkit.org/show_bug.cgi?id=148100
+
+ Reviewed by Simon Fraser.
+
+ We paint the focus ring when 'outline-style: auto' is present, however
+ we don't take the focus ring width into account when the repaint rect
+ is computed.
+
+ Tests: fast/repaint/outline-with1px-auto-repaint-rect.html
+ fast/repaint/outline-with2px-auto-repaint-rect.html
+ fast/repaint/outline-with3px-auto-repaint-rect.html
+
+ * rendering/RenderObject.cpp:
+ (WebCore::RenderObject::adjustRectForOutlineAndShadow):
+ * rendering/RenderThemeMac.h:
+ * rendering/RenderThemeMac.mm:
+ (WebCore::RenderThemeMac::platformFocusRingMaxWidth): Deleted. : 0 as focus ring width is incorrect.
+ The reason why r169699 fixed the failing cases was because they all had outline width < 3 (but no auto outline style).
+ The correct fix is to check if the style requires focus ring painting and use the RenderTheme::platformFocusRingMaxWidth
+ accordingly.
+
</ins><span class="cx"> 2015-08-17 Myles C. Maxfield <mmaxfield@apple.com>
</span><span class="cx">
</span><span class="cx"> [Cocoa] Address post-commit review
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderElement.cpp (188576 => 188577)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderElement.cpp 2015-08-18 05:55:36 UTC (rev 188576)
+++ trunk/Source/WebCore/rendering/RenderElement.cpp 2015-08-18 06:03:51 UTC (rev 188577)
</span><span class="lines">@@ -364,6 +364,22 @@
</span><span class="cx"> }
</span><span class="cx"> #endif
</span><span class="cx">
</span><ins>+void RenderElement::computeMaxOutlineSize() const
+{
+ // We need to ensure that view->maximalOutlineSize() is valid for any repaints that happen
+ // during styleDidChange (it's used by clippedOverflowRectForRepaint()).
+ if (!m_style->outlineWidth())
+ return;
+ int maxOutlineSize = m_style->outlineSize();
+ if (m_style->outlineStyleIsAuto())
+ maxOutlineSize = std::max(theme().platformFocusRingMaxWidth(), maxOutlineSize);
+
+ if (maxOutlineSize < maximalOutlineSize(PaintPhaseOutline))
+ return;
+
+ view().setMaximalOutlineSize(maxOutlineSize);
+}
+
</ins><span class="cx"> void RenderElement::initializeStyle()
</span><span class="cx"> {
</span><span class="cx"> styleWillChange(StyleDifferenceNewStyle, style());
</span><span class="lines">@@ -380,11 +396,8 @@
</span><span class="cx"> updateShapeImage(nullptr, m_style->shapeOutside());
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>- // We need to ensure that view->maximalOutlineSize() is valid for any repaints that happen
- // during styleDidChange (it's used by clippedOverflowRectForRepaint()).
- if (m_style->outlineWidth() > 0 && m_style->outlineSize() > maximalOutlineSize(PaintPhaseOutline))
- view().setMaximalOutlineSize(std::max(theme().platformFocusRingMaxWidth(), static_cast<int>(m_style->outlineSize())));
-
</del><ins>+ computeMaxOutlineSize();
+
</ins><span class="cx"> styleDidChange(StyleDifferenceNewStyle, nullptr);
</span><span class="cx">
</span><span class="cx"> // We shouldn't have any text children that would need styleDidChange at this point.
</span><span class="lines">@@ -434,10 +447,7 @@
</span><span class="cx"> updateShapeImage(oldStyle.get().shapeOutside(), m_style->shapeOutside());
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>- // We need to ensure that view->maximalOutlineSize() is valid for any repaints that happen
- // during styleDidChange (it's used by clippedOverflowRectForRepaint()).
- if (m_style->outlineWidth() > 0 && m_style->outlineSize() > maximalOutlineSize(PaintPhaseOutline))
- view().setMaximalOutlineSize(std::max(theme().platformFocusRingMaxWidth(), static_cast<int>(m_style->outlineSize())));
</del><ins>+ computeMaxOutlineSize();
</ins><span class="cx">
</span><span class="cx"> bool doesNotNeedLayout = !parent();
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderElementh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderElement.h (188576 => 188577)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderElement.h 2015-08-18 05:55:36 UTC (rev 188576)
+++ trunk/Source/WebCore/rendering/RenderElement.h 2015-08-18 06:03:51 UTC (rev 188577)
</span><span class="lines">@@ -311,6 +311,8 @@
</span><span class="cx">
</span><span class="cx"> bool shouldWillChangeCreateStackingContext() const;
</span><span class="cx">
</span><ins>+ void computeMaxOutlineSize() const;
+
</ins><span class="cx"> unsigned m_baseTypeFlags : 6;
</span><span class="cx"> unsigned m_ancestorLineBoxDirty : 1;
</span><span class="cx"> unsigned m_hasInitializedStyle : 1;
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderObjectcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderObject.cpp (188576 => 188577)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderObject.cpp 2015-08-18 05:55:36 UTC (rev 188576)
+++ trunk/Source/WebCore/rendering/RenderObject.cpp 2015-08-18 06:03:51 UTC (rev 188577)
</span><span class="lines">@@ -1917,11 +1917,12 @@
</span><span class="cx"> void RenderObject::adjustRectForOutlineAndShadow(LayoutRect& rect) const
</span><span class="cx"> {
</span><span class="cx"> int outlineSize = outlineStyleForRepaint().outlineSize();
</span><ins>+ if (outlineStyleForRepaint().outlineStyleIsAuto())
+ outlineSize = std::max(theme().platformFocusRingMaxWidth(), outlineSize);
</ins><span class="cx"> if (const ShadowData* boxShadow = style().boxShadow()) {
</span><span class="cx"> boxShadow->adjustRectForShadow(rect, outlineSize);
</span><span class="cx"> return;
</span><span class="cx"> }
</span><del>-
</del><span class="cx"> rect.inflate(outlineSize);
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderThemeMach"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderThemeMac.h (188576 => 188577)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderThemeMac.h 2015-08-18 05:55:36 UTC (rev 188576)
+++ trunk/Source/WebCore/rendering/RenderThemeMac.h 2015-08-18 06:03:51 UTC (rev 188577)
</span><span class="lines">@@ -61,7 +61,6 @@
</span><span class="cx"> virtual Color platformInactiveListBoxSelectionBackgroundColor() const override;
</span><span class="cx"> virtual Color platformInactiveListBoxSelectionForegroundColor() const override;
</span><span class="cx"> virtual Color platformFocusRingColor() const override;
</span><del>- virtual int platformFocusRingMaxWidth() const override;
</del><span class="cx">
</span><span class="cx"> virtual ScrollbarControlSize scrollbarControlSizeForPart(ControlPart) override { return SmallScrollbar; }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderThemeMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderThemeMac.mm (188576 => 188577)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderThemeMac.mm 2015-08-18 05:55:36 UTC (rev 188576)
+++ trunk/Source/WebCore/rendering/RenderThemeMac.mm 2015-08-18 06:03:51 UTC (rev 188577)
</span><span class="lines">@@ -306,13 +306,6 @@
</span><span class="cx"> return systemColor(CSSValueWebkitFocusRingColor);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-int RenderThemeMac::platformFocusRingMaxWidth() const
-{
- // FIXME: Shouldn't this function be named platformFocusRingMinWidth? But also, I'm not sure if this function is needed - looks like
- // all platforms just used 0 for this before <http://trac.webkit.org/changeset/168397>.
- return 0;
-}
-
</del><span class="cx"> Color RenderThemeMac::platformInactiveListBoxSelectionBackgroundColor() const
</span><span class="cx"> {
</span><span class="cx"> return platformInactiveSelectionBackgroundColor();
</span></span></pre>
</div>
</div>
</body>
</html>