<!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>[160639] 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/160639">160639</a></dd>
<dt>Author</dt> <dd>darin@apple.com</dd>
<dt>Date</dt> <dd>2013-12-16 08:00:42 -0800 (Mon, 16 Dec 2013)</dd>
</dl>
<h3>Log Message</h3>
<pre>Catch callers who forget to use initializeStyle
https://bugs.webkit.org/show_bug.cgi?id=125763
Reviewed by Andreas Kling.
A recent fix was because a caller used setStyle first rather than using
initializeStyle. This patch adds an assertion to catch cases where we do
that so we see the mistake right away instead of indirectly later.
* rendering/RenderElement.cpp:
(WebCore::RenderElement::initializeStyle): Simplified an assertion.
(WebCore::RenderElement::setStyle): Added an assertion that m_hasInitializedStyle
is true, with an exception for RenderView, which needs to be created before we
have the correct style computed for it (at least for now). Also broke out an
assertion that was using &&, since we would prefer to know which clause failed,
making separate assertions more useful than a combined assertion.</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 (160638 => 160639)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2013-12-16 15:58:34 UTC (rev 160638)
+++ trunk/Source/WebCore/ChangeLog 2013-12-16 16:00:42 UTC (rev 160639)
</span><span class="lines">@@ -1,3 +1,22 @@
</span><ins>+2013-12-15 Darin Adler <darin@apple.com>
+
+ Catch callers who forget to use initializeStyle
+ https://bugs.webkit.org/show_bug.cgi?id=125763
+
+ Reviewed by Andreas Kling.
+
+ A recent fix was because a caller used setStyle first rather than using
+ initializeStyle. This patch adds an assertion to catch cases where we do
+ that so we see the mistake right away instead of indirectly later.
+
+ * rendering/RenderElement.cpp:
+ (WebCore::RenderElement::initializeStyle): Simplified an assertion.
+ (WebCore::RenderElement::setStyle): Added an assertion that m_hasInitializedStyle
+ is true, with an exception for RenderView, which needs to be created before we
+ have the correct style computed for it (at least for now). Also broke out an
+ assertion that was using &&, since we would prefer to know which clause failed,
+ making separate assertions more useful than a combined assertion.
+
</ins><span class="cx"> 2013-12-16 Mario Sanchez Prada <mario.prada@samsung.com>
</span><span class="cx">
</span><span class="cx"> [ATK] Expose accessibility objects with ATK_ROLE_CHECK_MENU_ITEM
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderElement.cpp (160638 => 160639)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderElement.cpp 2013-12-16 15:58:34 UTC (rev 160638)
+++ trunk/Source/WebCore/rendering/RenderElement.cpp 2013-12-16 16:00:42 UTC (rev 160639)
</span><span class="lines">@@ -384,11 +384,8 @@
</span><span class="cx">
</span><span class="cx"> styleDidChange(StyleDifferenceEqual, nullptr);
</span><span class="cx">
</span><del>-#if !ASSERT_DISABLED
</del><span class="cx"> // We shouldn't have any text children that would need styleDidChange at this point.
</span><del>- auto textChildren = childrenOfType<RenderText>(*this);
- ASSERT(textChildren.begin() == textChildren.end());
-#endif
</del><ins>+ ASSERT(!childrenOfType<RenderText>(*this).first());
</ins><span class="cx">
</span><span class="cx"> // It would be nice to assert that !parent() here, but some RenderLayer subrenderers
</span><span class="cx"> // have their parent set before getting a call to initializeStyle() :|
</span><span class="lines">@@ -396,11 +393,19 @@
</span><span class="cx">
</span><span class="cx"> void RenderElement::setStyle(PassRef<RenderStyle> style)
</span><span class="cx"> {
</span><ins>+ // FIXME: Should change RenderView so it can use initializeStyle too.
+ // If we do that, we can assert m_hasInitializedStyle unconditionally,
+ // and remove the check of m_hasInitializedStyle below too.
+ ASSERT(m_hasInitializedStyle || isRenderView());
+
</ins><span class="cx"> if (&m_style.get() == &style.get()) {
</span><ins>+ // FIXME: Can we change things so we never hit this code path?
</ins><span class="cx"> #if USE(ACCELERATED_COMPOSITING)
</span><span class="cx"> // We need to run through adjustStyleDifference() for iframes, plugins, and canvas so
</span><span class="cx"> // style sharing is disabled for them. That should ensure that we never hit this code path.
</span><del>- ASSERT(!isRenderIFrame() && !isEmbeddedObject() && !isCanvas());
</del><ins>+ ASSERT(!isRenderIFrame());
+ ASSERT(!isEmbeddedObject());
+ ASSERT(!isCanvas());
</ins><span class="cx"> #endif
</span><span class="cx"> style.dropRef();
</span><span class="cx"> return;
</span></span></pre>
</div>
</div>
</body>
</html>