<!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>[208571] 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/208571">208571</a></dd>
<dt>Author</dt> <dd>zalan@apple.com</dd>
<dt>Date</dt> <dd>2016-11-10 16:26:53 -0800 (Thu, 10 Nov 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Move update image calls to RenderElement::styleDidChange.
https://bugs.webkit.org/show_bug.cgi?id=164623
Reviewed by Simon Fraser.
There should be no dependency on the image update between ::styleWillChange and ::styleDidChange.
Covered by existing tests.
* rendering/RenderElement.cpp:
(WebCore::RenderElement::initializeStyle):
(WebCore::RenderElement::setStyle):
(WebCore::RenderElement::styleDidChange):</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>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (208570 => 208571)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-11-11 00:01:14 UTC (rev 208570)
+++ trunk/Source/WebCore/ChangeLog 2016-11-11 00:26:53 UTC (rev 208571)
</span><span class="lines">@@ -1,3 +1,19 @@
</span><ins>+2016-11-10 Zalan Bujtas <zalan@apple.com>
+
+ Move update image calls to RenderElement::styleDidChange.
+ https://bugs.webkit.org/show_bug.cgi?id=164623
+
+ Reviewed by Simon Fraser.
+
+ There should be no dependency on the image update between ::styleWillChange and ::styleDidChange.
+
+ Covered by existing tests.
+
+ * rendering/RenderElement.cpp:
+ (WebCore::RenderElement::initializeStyle):
+ (WebCore::RenderElement::setStyle):
+ (WebCore::RenderElement::styleDidChange):
+
</ins><span class="cx"> 2016-11-10 Joseph Pecoraro <pecoraro@apple.com>
</span><span class="cx">
</span><span class="cx"> After r207459 ASSERT in CachedResourceLoader under InspectorPageAgent::cachedResource
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderElement.cpp (208570 => 208571)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderElement.cpp 2016-11-11 00:01:14 UTC (rev 208570)
+++ trunk/Source/WebCore/rendering/RenderElement.cpp 2016-11-11 00:26:53 UTC (rev 208571)
</span><span class="lines">@@ -376,16 +376,7 @@
</span><span class="cx"> Style::loadPendingResources(m_style, document(), element());
</span><span class="cx">
</span><span class="cx"> styleWillChange(StyleDifferenceNewStyle, style());
</span><del>-
</del><span class="cx"> m_hasInitializedStyle = true;
</span><del>-
- updateFillImages(nullptr, m_style.backgroundLayers());
- updateFillImages(nullptr, m_style.maskLayers());
-
- updateImage(nullptr, m_style.borderImage().image());
- updateImage(nullptr, m_style.maskBoxImage().image());
- updateShapeImage(nullptr, m_style.shapeOutside());
-
</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">@@ -414,19 +405,9 @@
</span><span class="cx"> Style::loadPendingResources(style, document(), element());
</span><span class="cx">
</span><span class="cx"> styleWillChange(diff, style);
</span><del>-
</del><span class="cx"> auto oldStyle = WTFMove(m_style);
</span><span class="cx"> m_style = WTFMove(style);
</span><del>-
- updateFillImages(oldStyle.backgroundLayers(), m_style.backgroundLayers());
- updateFillImages(oldStyle.maskLayers(), m_style.maskLayers());
-
- updateImage(oldStyle.borderImage().image(), m_style.borderImage().image());
- updateImage(oldStyle.maskBoxImage().image(), m_style.maskBoxImage().image());
- updateShapeImage(oldStyle.shapeOutside(), m_style.shapeOutside());
-
- bool doesNotNeedLayout = !parent();
-
</del><ins>+ bool detachedFromParent = !parent();
</ins><span class="cx"> styleDidChange(diff, &oldStyle);
</span><span class="cx">
</span><span class="cx"> // Text renderers use their parent style. Notify them about the change.
</span><span class="lines">@@ -435,9 +416,9 @@
</span><span class="cx">
</span><span class="cx"> // FIXME: |this| might be destroyed here. This can currently happen for a RenderTextFragment when
</span><span class="cx"> // its first-letter block gets an update in RenderTextFragment::styleDidChange. For RenderTextFragment(s),
</span><del>- // we will safely bail out with the doesNotNeedLayout flag. We might want to broaden this condition
</del><ins>+ // we will safely bail out with the detachedFromParent flag. We might want to broaden this condition
</ins><span class="cx"> // in the future as we move renderer changes out of layout and into style changes.
</span><del>- if (doesNotNeedLayout)
</del><ins>+ if (detachedFromParent)
</ins><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> // Now that the layer (if any) has been updated, we need to adjust the diff again,
</span><span class="lines">@@ -990,6 +971,12 @@
</span><span class="cx">
</span><span class="cx"> void RenderElement::styleDidChange(StyleDifference diff, const RenderStyle* oldStyle)
</span><span class="cx"> {
</span><ins>+ updateFillImages(oldStyle ? oldStyle->backgroundLayers() : nullptr, m_style.backgroundLayers());
+ updateFillImages(oldStyle ? oldStyle->maskLayers() : nullptr, m_style.maskLayers());
+ updateImage(oldStyle ? oldStyle->borderImage().image() : nullptr, m_style.borderImage().image());
+ updateImage(oldStyle ? oldStyle->maskBoxImage().image() : nullptr, m_style.maskBoxImage().image());
+ updateShapeImage(oldStyle ? oldStyle->shapeOutside() : nullptr, m_style.shapeOutside());
+
</ins><span class="cx"> if (s_affectsParentBlock)
</span><span class="cx"> handleDynamicFloatPositionChange();
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>