<!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>[189242] 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/189242">189242</a></dd>
<dt>Author</dt> <dd>zalan@apple.com</dd>
<dt>Date</dt> <dd>2015-09-01 18:56:59 -0700 (Tue, 01 Sep 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Recompute maximum outline size only when outline changes.
https://bugs.webkit.org/show_bug.cgi?id=148576
Reviewed by Andreas Kling.
We should only recompute the cached maximum outline size when
either the outline size (offset/width) or the style (from or to
auto) changes.
Setting 'outline-style: auto' can change the final outline width as 'auto' triggers
the focus ring mode. In this mode, we ignore outline-width and use the platform default value instead.
Covered by existing test cases.
* rendering/RenderElement.cpp:
(WebCore::RenderElement::computeMaxOutlineSize):
(WebCore::RenderElement::styleWillChange):
(WebCore::RenderElement::initializeStyle): Deleted.
(WebCore::RenderElement::setStyle): Deleted.
* rendering/RenderElement.h:</pre>
<h3>Modified Paths</h3>
<ul>
<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>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (189241 => 189242)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog        2015-09-02 01:55:49 UTC (rev 189241)
+++ trunk/Source/WebCore/ChangeLog        2015-09-02 01:56:59 UTC (rev 189242)
</span><span class="lines">@@ -1,3 +1,25 @@
</span><ins>+2015-09-01 Zalan Bujtas <zalan@apple.com>
+
+ Recompute maximum outline size only when outline changes.
+ https://bugs.webkit.org/show_bug.cgi?id=148576
+
+ Reviewed by Andreas Kling.
+
+ We should only recompute the cached maximum outline size when
+ either the outline size (offset/width) or the style (from or to
+ auto) changes.
+ Setting 'outline-style: auto' can change the final outline width as 'auto' triggers
+ the focus ring mode. In this mode, we ignore outline-width and use the platform default value instead.
+
+ Covered by existing test cases.
+
+ * rendering/RenderElement.cpp:
+ (WebCore::RenderElement::computeMaxOutlineSize):
+ (WebCore::RenderElement::styleWillChange):
+ (WebCore::RenderElement::initializeStyle): Deleted.
+ (WebCore::RenderElement::setStyle): Deleted.
+ * rendering/RenderElement.h:
+
</ins><span class="cx"> 2015-09-01 Chris Dumez <cdumez@apple.com>
</span><span class="cx">
</span><span class="cx"> Range API should throw a TypeError for null Node parameters
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderElement.cpp (189241 => 189242)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderElement.cpp        2015-09-02 01:55:49 UTC (rev 189241)
+++ trunk/Source/WebCore/rendering/RenderElement.cpp        2015-09-02 01:56:59 UTC (rev 189242)
</span><span class="lines">@@ -364,15 +364,15 @@
</span><span class="cx"> }
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-void RenderElement::computeMaxOutlineSize() const
</del><ins>+void RenderElement::computeMaxOutlineSize(const RenderStyle& style) const
</ins><span class="cx"> {
</span><span class="cx"> // We need to ensure that view->maximalOutlineSize() is valid for any repaints that happen
</span><span class="cx"> // during styleDidChange (it's used by clippedOverflowRectForRepaint()).
</span><del>- if (!m_style->outlineWidth())
</del><ins>+ if (!style.outlineWidth())
</ins><span class="cx"> return;
</span><del>- int maxOutlineSize = m_style->outlineSize();
- if (m_style->outlineStyleIsAuto())
- maxOutlineSize = std::max(theme().platformFocusRingWidth() + m_style->outlineOffset(), maxOutlineSize);
</del><ins>+ int maxOutlineSize = style.outlineSize();
+ if (style.outlineStyleIsAuto())
+ maxOutlineSize = std::max(theme().platformFocusRingWidth() + style.outlineOffset(), maxOutlineSize);
</ins><span class="cx">
</span><span class="cx"> if (maxOutlineSize < view().maximalOutlineSize())
</span><span class="cx"> return;
</span><span class="lines">@@ -396,8 +396,6 @@
</span><span class="cx"> updateShapeImage(nullptr, m_style->shapeOutside());
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>- computeMaxOutlineSize();
-
</del><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">@@ -447,8 +445,6 @@
</span><span class="cx"> updateShapeImage(oldStyle.get().shapeOutside(), m_style->shapeOutside());
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>- computeMaxOutlineSize();
-
</del><span class="cx"> bool doesNotNeedLayout = !parent();
</span><span class="cx">
</span><span class="cx"> styleDidChange(diff, oldStyle.ptr());
</span><span class="lines">@@ -916,6 +912,11 @@
</span><span class="cx">
</span><span class="cx"> if (isRoot() || isBody())
</span><span class="cx"> view().frameView().updateExtendBackgroundIfNecessary();
</span><ins>+
+ if (!oldStyle || (oldStyle->outlineSize() != newStyle.outlineSize()
+ || (oldStyle->outlineStyleIsAuto() && !newStyle.outlineStyleIsAuto())
+ || (!oldStyle->outlineStyleIsAuto() && newStyle.outlineStyleIsAuto())))
+ computeMaxOutlineSize(newStyle);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void RenderElement::handleDynamicFloatPositionChange()
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderElementh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderElement.h (189241 => 189242)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderElement.h        2015-09-02 01:55:49 UTC (rev 189241)
+++ trunk/Source/WebCore/rendering/RenderElement.h        2015-09-02 01:56:59 UTC (rev 189242)
</span><span class="lines">@@ -307,7 +307,7 @@
</span><span class="cx">
</span><span class="cx"> bool shouldWillChangeCreateStackingContext() const;
</span><span class="cx">
</span><del>- void computeMaxOutlineSize() const;
</del><ins>+ void computeMaxOutlineSize(const RenderStyle&) const;
</ins><span class="cx">
</span><span class="cx"> unsigned m_baseTypeFlags : 6;
</span><span class="cx"> unsigned m_ancestorLineBoxDirty : 1;
</span></span></pre>
</div>
</div>
</body>
</html>