<!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>[203031] 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/203031">203031</a></dd>
<dt>Author</dt> <dd>antti@apple.com</dd>
<dt>Date</dt> <dd>2016-07-09 08:47:29 -0700 (Sat, 09 Jul 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>REGRESSION (<a href="http://trac.webkit.org/projects/webkit/changeset/202931">r202931</a>): breaks release builds with ASSERT_WITH_SECURITY_IMPLICATION for fuzzing
https://bugs.webkit.org/show_bug.cgi?id=159599
rdar://problem/27248835
Reviewed by Chris Dumez.
Make RenderStyle::deletionHasBegun() available with ENABLE(SECURITY_ASSERTIONS)
* rendering/style/RenderStyle.cpp:
(WebCore::RenderStyle::~RenderStyle):
* rendering/style/RenderStyle.h:
(WebCore::RenderStyle::deletionHasBegun):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorerenderingstyleRenderStylecpp">trunk/Source/WebCore/rendering/style/RenderStyle.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingstyleRenderStyleh">trunk/Source/WebCore/rendering/style/RenderStyle.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (203030 => 203031)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-07-09 15:39:34 UTC (rev 203030)
+++ trunk/Source/WebCore/ChangeLog 2016-07-09 15:47:29 UTC (rev 203031)
</span><span class="lines">@@ -1,3 +1,18 @@
</span><ins>+2016-07-09 Antti Koivisto <antti@apple.com>
+
+ REGRESSION (r202931): breaks release builds with ASSERT_WITH_SECURITY_IMPLICATION for fuzzing
+ https://bugs.webkit.org/show_bug.cgi?id=159599
+ rdar://problem/27248835
+
+ Reviewed by Chris Dumez.
+
+ Make RenderStyle::deletionHasBegun() available with ENABLE(SECURITY_ASSERTIONS)
+
+ * rendering/style/RenderStyle.cpp:
+ (WebCore::RenderStyle::~RenderStyle):
+ * rendering/style/RenderStyle.h:
+ (WebCore::RenderStyle::deletionHasBegun):
+
</ins><span class="cx"> 2016-07-09 Youenn Fablet <youenn@apple.com>
</span><span class="cx">
</span><span class="cx"> Make use of PrivateIdentifier to simplify Fetch Headers built-in checks
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingstyleRenderStylecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/style/RenderStyle.cpp (203030 => 203031)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/style/RenderStyle.cpp 2016-07-09 15:39:34 UTC (rev 203030)
+++ trunk/Source/WebCore/rendering/style/RenderStyle.cpp 2016-07-09 15:47:29 UTC (rev 203031)
</span><span class="lines">@@ -80,7 +80,7 @@
</span><span class="cx"> struct NonInheritedFlags {
</span><span class="cx"> uint64_t m_flags;
</span><span class="cx"> } noninherited_flags;
</span><del>-#if !ASSERT_DISABLED
</del><ins>+#if !ASSERT_DISABLED || ENABLE(SECURITY_ASSERTIONS)
</ins><span class="cx"> bool deletionCheck;
</span><span class="cx"> #endif
</span><span class="cx"> };
</span><span class="lines">@@ -184,8 +184,8 @@
</span><span class="cx">
</span><span class="cx"> RenderStyle::~RenderStyle()
</span><span class="cx"> {
</span><del>-#if !ASSERT_DISABLED
- ASSERT(!m_deletionHasBegun);
</del><ins>+#if !ASSERT_DISABLED || ENABLE(SECURITY_ASSERTIONS)
+ ASSERT_WITH_SECURITY_IMPLICATION(!m_deletionHasBegun);
</ins><span class="cx"> m_deletionHasBegun = true;
</span><span class="cx"> #endif
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingstyleRenderStyleh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/style/RenderStyle.h (203030 => 203031)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/style/RenderStyle.h 2016-07-09 15:39:34 UTC (rev 203030)
+++ trunk/Source/WebCore/rendering/style/RenderStyle.h 2016-07-09 15:47:29 UTC (rev 203031)
</span><span class="lines">@@ -468,7 +468,7 @@
</span><span class="cx"> // don't inherit
</span><span class="cx"> NonInheritedFlags noninherited_flags;
</span><span class="cx">
</span><del>-#if !ASSERT_DISABLED
</del><ins>+#if !ASSERT_DISABLED || ENABLE(SECURITY_ASSERTIONS)
</ins><span class="cx"> bool m_deletionHasBegun { false };
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="lines">@@ -498,7 +498,7 @@
</span><span class="cx"> static RenderStyle createAnonymousStyleWithDisplay(const RenderStyle& parentStyle, EDisplay);
</span><span class="cx"> static RenderStyle createStyleInheritingFromPseudoStyle(const RenderStyle& pseudoStyle);
</span><span class="cx">
</span><del>-#if !ASSERT_DISABLED
</del><ins>+#if !ASSERT_DISABLED || ENABLE(SECURITY_ASSERTIONS)
</ins><span class="cx"> bool deletionHasBegun() const { return m_deletionHasBegun; }
</span><span class="cx"> #endif
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>