<!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>[188652] 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/188652">188652</a></dd>
<dt>Author</dt> <dd>zalan@apple.com</dd>
<dt>Date</dt> <dd>2015-08-19 15:09:27 -0700 (Wed, 19 Aug 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Cleanup outline-style: auto painting.
https://bugs.webkit.org/show_bug.cgi?id=148159
Reviewed by Simon Fraser.
Old platform style required the focus ring to be painted with an offset. (https://trac.webkit.org/<a href="http://trac.webkit.org/projects/webkit/changeset/5358">r5358</a>)
(and it has the side effect of growing outline-width adds further, unwanted offset)
Default css for :focus is adjusted to remove this offset by setting the outline-width to 5px
and the outline-offset to -2px. (https://trac.webkit.org/<a href="http://trac.webkit.org/projects/webkit/changeset/13639">r13639</a>)
This patch removes both the old logic and the workaround for getting rid of the unwanted offset.
Source/WebCore:
Test: fast/repaint/outline-auto-with-default-width-and-offset-repaint.html
* css/html.css:
(:focus):
(input:focus, textarea:focus, isindex:focus, keygen:focus, select:focus): Deleted.
* platform/graphics/mac/GraphicsContextMac.mm:
(WebCore::GraphicsContext::drawFocusRing):
* rendering/RenderElement.cpp:
(WebCore::RenderElement::computeMaxOutlineSize):
(WebCore::RenderElement::paintFocusRing):
(WebCore::RenderElement::paintOutline): Short circuit painting outline when painting is disabled. It
only change behaviour for non-auto outlines -which are anyway not supposed to be painted when painting is disabled.
* rendering/RenderObject.cpp:
(WebCore::RenderObject::adjustRectForOutlineAndShadow):
* rendering/RenderTheme.h:
(WebCore::RenderTheme::platformFocusRingWidth):
(WebCore::RenderTheme::platformFocusRingMaxWidth): Deleted.
LayoutTests:
* fast/repaint/outline-auto-with-default-width-and-offset-repaint-expected.txt: Added.
* fast/repaint/outline-auto-with-default-width-and-offset-repaint.html: Copied from LayoutTests/fast/repaint/outline-with2px-auto-repaint-rect.html.
* fast/repaint/outline-with1px-auto-repaint-rect.html:
* fast/repaint/outline-with2px-auto-repaint-rect.html:
* fast/repaint/outline-with3px-auto-repaint-rect.html:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsfastrepaintoutlinewith1pxautorepaintrecthtml">trunk/LayoutTests/fast/repaint/outline-with1px-auto-repaint-rect.html</a></li>
<li><a href="#trunkLayoutTestsfastrepaintoutlinewith2pxautorepaintrecthtml">trunk/LayoutTests/fast/repaint/outline-with2px-auto-repaint-rect.html</a></li>
<li><a href="#trunkLayoutTestsfastrepaintoutlinewith3pxautorepaintrecthtml">trunk/LayoutTests/fast/repaint/outline-with3px-auto-repaint-rect.html</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorecsshtmlcss">trunk/Source/WebCore/css/html.css</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsmacGraphicsContextMacmm">trunk/Source/WebCore/platform/graphics/mac/GraphicsContextMac.mm</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderElementcpp">trunk/Source/WebCore/rendering/RenderElement.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderObjectcpp">trunk/Source/WebCore/rendering/RenderObject.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderThemeh">trunk/Source/WebCore/rendering/RenderTheme.h</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsfastrepaintoutlineautowithdefaultwidthandoffsetrepaintexpectedtxt">trunk/LayoutTests/fast/repaint/outline-auto-with-default-width-and-offset-repaint-expected.txt</a></li>
<li><a href="#trunkLayoutTestsfastrepaintoutlineautowithdefaultwidthandoffsetrepainthtml">trunk/LayoutTests/fast/repaint/outline-auto-with-default-width-and-offset-repaint.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (188651 => 188652)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2015-08-19 21:31:30 UTC (rev 188651)
+++ trunk/LayoutTests/ChangeLog 2015-08-19 22:09:27 UTC (rev 188652)
</span><span class="lines">@@ -1,3 +1,22 @@
</span><ins>+2015-08-19 Zalan Bujtas <zalan@apple.com>
+
+ Cleanup outline-style: auto painting.
+ https://bugs.webkit.org/show_bug.cgi?id=148159
+
+ Reviewed by Simon Fraser.
+
+ Old platform style required the focus ring to be painted with an offset. (https://trac.webkit.org/r5358)
+ (and it has the side effect of growing outline-width adds further, unwanted offset)
+ Default css for :focus is adjusted to remove this offset by setting the outline-width to 5px
+ and the outline-offset to -2px. (https://trac.webkit.org/r13639)
+ This patch removes both the old logic and the workaround for getting rid of the unwanted offset.
+
+ * fast/repaint/outline-auto-with-default-width-and-offset-repaint-expected.txt: Added.
+ * fast/repaint/outline-auto-with-default-width-and-offset-repaint.html: Copied from LayoutTests/fast/repaint/outline-with2px-auto-repaint-rect.html.
+ * fast/repaint/outline-with1px-auto-repaint-rect.html:
+ * fast/repaint/outline-with2px-auto-repaint-rect.html:
+ * fast/repaint/outline-with3px-auto-repaint-rect.html:
+
</ins><span class="cx"> 2015-08-18 Dean Jackson <dino@apple.com>
</span><span class="cx">
</span><span class="cx"> Support CSS filters without webkit prefix
</span></span></pre></div>
<a id="trunkLayoutTestsfastrepaintoutlineautowithdefaultwidthandoffsetrepaintexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/repaint/outline-auto-with-default-width-and-offset-repaint-expected.txt (0 => 188652)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/repaint/outline-auto-with-default-width-and-offset-repaint-expected.txt (rev 0)
+++ trunk/LayoutTests/fast/repaint/outline-auto-with-default-width-and-offset-repaint-expected.txt 2015-08-19 22:09:27 UTC (rev 188652)
</span><span class="lines">@@ -0,0 +1,6 @@
</span><ins>+PASS window.internals.repaintRectsAsText().indexOf('4 6') is not -1
+PASS window.internals.repaintRectsAsText().indexOf('4 46') is not -1
+PASS successfullyParsed is true
+
+TEST COMPLETE
+
</ins></span></pre></div>
<a id="trunkLayoutTestsfastrepaintoutlineautowithdefaultwidthandoffsetrepainthtmlfromrev188651trunkLayoutTestsfastrepaintoutlinewith1pxautorepaintrecthtml"></a>
<div class="copfile"><h4>Copied: trunk/LayoutTests/fast/repaint/outline-auto-with-default-width-and-offset-repaint.html (from rev 188651, trunk/LayoutTests/fast/repaint/outline-with1px-auto-repaint-rect.html) (0 => 188652)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/repaint/outline-auto-with-default-width-and-offset-repaint.html (rev 0)
+++ trunk/LayoutTests/fast/repaint/outline-auto-with-default-width-and-offset-repaint.html 2015-08-19 22:09:27 UTC (rev 188652)
</span><span class="lines">@@ -0,0 +1,37 @@
</span><ins>+<html>
+<script>jsTestIsAsync = true;</script>
+<script src="../../resources/js-test-pre.js"></script>
+<head>
+<title>This tests that outline-style auto repaint rect is correct with default outline-width and outline-offset.</title>
+<style>
+div {
+ position: absolute;
+ top: 10px;
+ height: 10px;
+ width: 10px;
+ outline: auto;
+ outline-offset: 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('4 6')", "-1");
+ shouldNotBe("window.internals.repaintRectsAsText().indexOf('4 46')", "-1");
+ internals.stopTrackingRepaints();
+ }
+ finishJSTest();
+ }, 0);
+</script>
+<script src="../../resources/js-test-post.js"></script>
+</html>
</ins></span></pre></div>
<a id="trunkLayoutTestsfastrepaintoutlinewith1pxautorepaintrecthtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/repaint/outline-with1px-auto-repaint-rect.html (188651 => 188652)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/repaint/outline-with1px-auto-repaint-rect.html 2015-08-19 21:31:30 UTC (rev 188651)
+++ trunk/LayoutTests/fast/repaint/outline-with1px-auto-repaint-rect.html 2015-08-19 22:09:27 UTC (rev 188652)
</span><span class="lines">@@ -7,7 +7,7 @@
</span><span class="cx"> div {
</span><span class="cx"> position: absolute;
</span><span class="cx"> top: 10px;
</span><del>- height: 0px;
</del><ins>+ height: 10px;
</ins><span class="cx"> width: 10px;
</span><span class="cx"> outline: auto 1px;
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkLayoutTestsfastrepaintoutlinewith2pxautorepaintrecthtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/repaint/outline-with2px-auto-repaint-rect.html (188651 => 188652)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/repaint/outline-with2px-auto-repaint-rect.html 2015-08-19 21:31:30 UTC (rev 188651)
+++ trunk/LayoutTests/fast/repaint/outline-with2px-auto-repaint-rect.html 2015-08-19 22:09:27 UTC (rev 188652)
</span><span class="lines">@@ -7,7 +7,7 @@
</span><span class="cx"> div {
</span><span class="cx"> position: absolute;
</span><span class="cx"> top: 10px;
</span><del>- height: 0px;
</del><ins>+ height: 10px;
</ins><span class="cx"> width: 10px;
</span><span class="cx"> outline: auto 2px;
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkLayoutTestsfastrepaintoutlinewith3pxautorepaintrecthtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/repaint/outline-with3px-auto-repaint-rect.html (188651 => 188652)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/repaint/outline-with3px-auto-repaint-rect.html 2015-08-19 21:31:30 UTC (rev 188651)
+++ trunk/LayoutTests/fast/repaint/outline-with3px-auto-repaint-rect.html 2015-08-19 22:09:27 UTC (rev 188652)
</span><span class="lines">@@ -7,7 +7,7 @@
</span><span class="cx"> div {
</span><span class="cx"> position: absolute;
</span><span class="cx"> top: 10px;
</span><del>- height: 0px;
</del><ins>+ height: 10px;
</ins><span class="cx"> width: 10px;
</span><span class="cx"> outline: auto 3px;
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (188651 => 188652)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-08-19 21:31:30 UTC (rev 188651)
+++ trunk/Source/WebCore/ChangeLog 2015-08-19 22:09:27 UTC (rev 188652)
</span><span class="lines">@@ -1,3 +1,34 @@
</span><ins>+2015-08-19 Zalan Bujtas <zalan@apple.com>
+
+ Cleanup outline-style: auto painting.
+ https://bugs.webkit.org/show_bug.cgi?id=148159
+
+ Reviewed by Simon Fraser.
+
+ Old platform style required the focus ring to be painted with an offset. (https://trac.webkit.org/r5358)
+ (and it has the side effect of growing outline-width adds further, unwanted offset)
+ Default css for :focus is adjusted to remove this offset by setting the outline-width to 5px
+ and the outline-offset to -2px. (https://trac.webkit.org/r13639)
+ This patch removes both the old logic and the workaround for getting rid of the unwanted offset.
+
+ Test: fast/repaint/outline-auto-with-default-width-and-offset-repaint.html
+
+ * css/html.css:
+ (:focus):
+ (input:focus, textarea:focus, isindex:focus, keygen:focus, select:focus): Deleted.
+ * platform/graphics/mac/GraphicsContextMac.mm:
+ (WebCore::GraphicsContext::drawFocusRing):
+ * rendering/RenderElement.cpp:
+ (WebCore::RenderElement::computeMaxOutlineSize):
+ (WebCore::RenderElement::paintFocusRing):
+ (WebCore::RenderElement::paintOutline): Short circuit painting outline when painting is disabled. It
+ only change behaviour for non-auto outlines -which are anyway not supposed to be painted when painting is disabled.
+ * rendering/RenderObject.cpp:
+ (WebCore::RenderObject::adjustRectForOutlineAndShadow):
+ * rendering/RenderTheme.h:
+ (WebCore::RenderTheme::platformFocusRingWidth):
+ (WebCore::RenderTheme::platformFocusRingMaxWidth): Deleted.
+
</ins><span class="cx"> 2015-08-18 Dean Jackson <dino@apple.com>
</span><span class="cx">
</span><span class="cx"> Support CSS filters without webkit prefix
</span></span></pre></div>
<a id="trunkSourceWebCorecsshtmlcss"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/html.css (188651 => 188652)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/html.css 2015-08-19 21:31:30 UTC (rev 188651)
+++ trunk/Source/WebCore/css/html.css 2015-08-19 22:09:27 UTC (rev 188652)
</span><span class="lines">@@ -1107,7 +1107,7 @@
</span><span class="cx"> /* states */
</span><span class="cx">
</span><span class="cx"> :focus {
</span><del>- outline: auto 5px -webkit-focus-ring-color
</del><ins>+ outline: auto;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /* Read-only text fields do not show a focus ring but do still receive focus */
</span><span class="lines">@@ -1118,10 +1118,6 @@
</span><span class="cx"> applet:focus, embed:focus, iframe:focus, object:focus {
</span><span class="cx"> outline: none
</span><span class="cx"> }
</span><del>-
-input:focus, textarea:focus, isindex:focus, keygen:focus, select:focus {
- outline-offset: -2px
-}
</del><span class="cx">
</span><span class="cx"> input:matches([type="button"], [type="checkbox"], [type="file"], [type="hidden"], [type="image"], [type="radio"], [type="reset"], [type="search"], [type="submit"]):focus,
</span><span class="cx"> input[type="file"]:focus::-webkit-file-upload-button {
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsmacGraphicsContextMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/mac/GraphicsContextMac.mm (188651 => 188652)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/mac/GraphicsContextMac.mm 2015-08-19 21:31:30 UTC (rev 188651)
+++ trunk/Source/WebCore/platform/graphics/mac/GraphicsContextMac.mm 2015-08-19 22:09:27 UTC (rev 188652)
</span><span class="lines">@@ -85,13 +85,11 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #if PLATFORM(MAC)
</span><del>-void GraphicsContext::drawFocusRing(const Vector<IntRect>& rects, int width, int offset, double timeOffset, bool& needsRedraw)
</del><ins>+void GraphicsContext::drawFocusRing(const Vector<IntRect>& rects, int, int offset, double timeOffset, bool& needsRedraw)
</ins><span class="cx"> {
</span><span class="cx"> if (paintingDisabled())
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- offset += (width - 1) / 2;
-
</del><span class="cx"> RetainPtr<CGMutablePathRef> focusRingPath = adoptCF(CGPathCreateMutable());
</span><span class="cx"> for (auto& rect : rects)
</span><span class="cx"> CGPathAddRect(focusRingPath.get(), 0, CGRectInset(rect, -offset, -offset));
</span><span class="lines">@@ -100,14 +98,12 @@
</span><span class="cx"> }
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-void GraphicsContext::drawFocusRing(const Vector<IntRect>& rects, int width, int offset, const Color&)
</del><ins>+void GraphicsContext::drawFocusRing(const Vector<IntRect>& rects, int, int offset, const Color&)
</ins><span class="cx"> {
</span><span class="cx"> #if !PLATFORM(IOS)
</span><span class="cx"> if (paintingDisabled())
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- offset += (width - 1) / 2;
-
</del><span class="cx"> RetainPtr<CGMutablePathRef> focusRingPath = adoptCF(CGPathCreateMutable());
</span><span class="cx"> for (auto& rect : rects)
</span><span class="cx"> CGPathAddRect(focusRingPath.get(), 0, CGRectInset(rect, -offset, -offset));
</span><span class="lines">@@ -115,7 +111,6 @@
</span><span class="cx"> drawFocusRingToContext(platformContext(), focusRingPath.get());
</span><span class="cx"> #else
</span><span class="cx"> UNUSED_PARAM(rects);
</span><del>- UNUSED_PARAM(width);
</del><span class="cx"> UNUSED_PARAM(offset);
</span><span class="cx"> #endif
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderElement.cpp (188651 => 188652)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderElement.cpp 2015-08-19 21:31:30 UTC (rev 188651)
+++ trunk/Source/WebCore/rendering/RenderElement.cpp 2015-08-19 22:09:27 UTC (rev 188652)
</span><span class="lines">@@ -372,7 +372,7 @@
</span><span class="cx"> return;
</span><span class="cx"> int maxOutlineSize = m_style->outlineSize();
</span><span class="cx"> if (m_style->outlineStyleIsAuto())
</span><del>- maxOutlineSize = std::max(theme().platformFocusRingMaxWidth(), maxOutlineSize);
</del><ins>+ maxOutlineSize = std::max(theme().platformFocusRingWidth(), maxOutlineSize);
</ins><span class="cx">
</span><span class="cx"> if (maxOutlineSize < maximalOutlineSize(PaintPhaseOutline))
</span><span class="cx"> return;
</span><span class="lines">@@ -2041,7 +2041,7 @@
</span><span class="cx"> addFocusRingRects(focusRingRects, paintOffset, paintInfo.paintContainer);
</span><span class="cx"> #if PLATFORM(MAC)
</span><span class="cx"> bool needsRepaint;
</span><del>- paintInfo.context->drawFocusRing(focusRingRects, style.outlineWidth(), style.outlineOffset(), document().page()->focusController().timeSinceFocusWasSet(), needsRepaint);
</del><ins>+ paintInfo.context->drawFocusRing(focusRingRects, theme().platformFocusRingWidth(), style.outlineOffset(), document().page()->focusController().timeSinceFocusWasSet(), needsRepaint);
</ins><span class="cx"> if (needsRepaint)
</span><span class="cx"> document().page()->focusController().setFocusedElementNeedsRepaint();
</span><span class="cx"> #else
</span><span class="lines">@@ -2051,6 +2051,10 @@
</span><span class="cx">
</span><span class="cx"> void RenderElement::paintOutline(PaintInfo& paintInfo, const LayoutRect& paintRect)
</span><span class="cx"> {
</span><ins>+ GraphicsContext& graphicsContext = *paintInfo.context;
+ if (graphicsContext.paintingDisabled())
+ return;
+
</ins><span class="cx"> if (!hasOutline())
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="lines">@@ -2082,7 +2086,6 @@
</span><span class="cx"> EBorderStyle outlineStyle = styleToUse.outlineStyle();
</span><span class="cx"> Color outlineColor = styleToUse.visitedDependentColor(CSSPropertyOutlineColor);
</span><span class="cx">
</span><del>- GraphicsContext& graphicsContext = *paintInfo.context;
</del><span class="cx"> bool useTransparencyLayer = outlineColor.hasAlpha();
</span><span class="cx"> if (useTransparencyLayer) {
</span><span class="cx"> if (outlineStyle == SOLID) {
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderObjectcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderObject.cpp (188651 => 188652)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderObject.cpp 2015-08-19 21:31:30 UTC (rev 188651)
+++ trunk/Source/WebCore/rendering/RenderObject.cpp 2015-08-19 22:09:27 UTC (rev 188652)
</span><span class="lines">@@ -1918,7 +1918,7 @@
</span><span class="cx"> {
</span><span class="cx"> int outlineSize = outlineStyleForRepaint().outlineSize();
</span><span class="cx"> if (outlineStyleForRepaint().outlineStyleIsAuto())
</span><del>- outlineSize = std::max(theme().platformFocusRingMaxWidth(), outlineSize);
</del><ins>+ outlineSize = std::max(theme().platformFocusRingWidth(), 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></pre></div>
<a id="trunkSourceWebCorerenderingRenderThemeh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderTheme.h (188651 => 188652)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderTheme.h 2015-08-19 21:31:30 UTC (rev 188651)
+++ trunk/Source/WebCore/rendering/RenderTheme.h 2015-08-19 22:09:27 UTC (rev 188652)
</span><span class="lines">@@ -163,7 +163,7 @@
</span><span class="cx"> static Color focusRingColor();
</span><span class="cx"> virtual Color platformFocusRingColor() const { return Color(0, 0, 0); }
</span><span class="cx"> static void setCustomFocusRingColor(const Color&);
</span><del>- virtual int platformFocusRingMaxWidth() const { return 3; }
</del><ins>+ virtual int platformFocusRingWidth() const { return 3; }
</ins><span class="cx"> #if ENABLE(TOUCH_EVENTS)
</span><span class="cx"> static Color tapHighlightColor();
</span><span class="cx"> virtual Color platformTapHighlightColor() const { return RenderTheme::defaultTapHighlightColor; }
</span></span></pre>
</div>
</div>
</body>
</html>