<!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>[212919] branches/safari-603-branch/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/212919">212919</a></dd>
<dt>Author</dt> <dd>matthew_hanson@apple.com</dd>
<dt>Date</dt> <dd>2017-02-23 12:51:42 -0800 (Thu, 23 Feb 2017)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/212828">r212828</a>. rdar://problem/30636274</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari603branchSourceWebCoreChangeLog">branches/safari-603-branch/Source/WebCore/ChangeLog</a></li>
<li><a href="#branchessafari603branchSourceWebCorestyleStyleScopecpp">branches/safari-603-branch/Source/WebCore/style/StyleScope.cpp</a></li>
<li><a href="#branchessafari603branchSourceWebCorestyleStyleScopeh">branches/safari-603-branch/Source/WebCore/style/StyleScope.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchessafari603branchSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-603-branch/Source/WebCore/ChangeLog (212918 => 212919)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-603-branch/Source/WebCore/ChangeLog 2017-02-23 20:51:39 UTC (rev 212918)
+++ branches/safari-603-branch/Source/WebCore/ChangeLog 2017-02-23 20:51:42 UTC (rev 212919)
</span><span class="lines">@@ -1,3 +1,33 @@
</span><ins>+2017-02-22 Brent Fulgham <bfulgham@apple.com>
+
+ Merge r212828. rdar://problem/30636274
+
+ 2017-02-21 Antti Koivisto <antti@apple.com>
+
+ REGRESSION(r207669): Crash after mutating selector text
+ https://bugs.webkit.org/show_bug.cgi?id=168655
+ <rdar://problem/30632111>
+
+ Reviewed by Brent Fulgham.
+
+ Test: fast/css/selector-text-mutation-crash.html
+
+ * style/StyleScope.cpp:
+ (WebCore::Style::Scope::resolver):
+ (WebCore::Style::Scope::updateStyleResolver):
+
+ Protect against entering scheduleUpdate and wiping style resolver while updating it.
+ Extension stylesheets can trigger this.
+
+ (WebCore::Style::Scope::scheduleUpdate):
+
+ Clear the style resolver immediately if style sheet content changes. The resolver may
+ have data structures that point to the old sheet contents.
+
+ The resolver would get wiped anyway when the scheduled update actually occurs.
+
+ * style/StyleScope.h:
+
</ins><span class="cx"> 2017-02-23 Matthew Hanson <matthew_hanson@apple.com>
</span><span class="cx">
</span><span class="cx"> Rollout r212740. rdar://problem/30636274
</span></span></pre></div>
<a id="branchessafari603branchSourceWebCorestyleStyleScopecpp"></a>
<div class="modfile"><h4>Modified: branches/safari-603-branch/Source/WebCore/style/StyleScope.cpp (212918 => 212919)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-603-branch/Source/WebCore/style/StyleScope.cpp 2017-02-23 20:51:39 UTC (rev 212918)
+++ branches/safari-603-branch/Source/WebCore/style/StyleScope.cpp 2017-02-23 20:51:42 UTC (rev 212919)
</span><span class="lines">@@ -51,6 +51,7 @@
</span><span class="cx"> #include "UserContentController.h"
</span><span class="cx"> #include "UserContentURLPattern.h"
</span><span class="cx"> #include "UserStyleSheet.h"
</span><ins>+#include <wtf/SetForScope.h>
</ins><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><span class="lines">@@ -94,6 +95,7 @@
</span><span class="cx"> return m_document.userAgentShadowTreeStyleResolver();
</span><span class="cx">
</span><span class="cx"> if (!m_resolver) {
</span><ins>+ SetForScope<bool> isUpdatingStyleResolver { m_isUpdatingStyleResolver, true };
</ins><span class="cx"> m_resolver = std::make_unique<StyleResolver>(m_document);
</span><span class="cx"> m_resolver->appendAuthorStyleSheets(m_activeStyleSheets);
</span><span class="cx"> }
</span><span class="lines">@@ -459,6 +461,7 @@
</span><span class="cx"> }
</span><span class="cx"> auto& styleResolver = resolver();
</span><span class="cx">
</span><ins>+ SetForScope<bool> isUpdatingStyleResolver { m_isUpdatingStyleResolver, true };
</ins><span class="cx"> if (updateType == Reset) {
</span><span class="cx"> styleResolver.ruleSets().resetAuthorStyle();
</span><span class="cx"> styleResolver.appendAuthorStyleSheets(activeStyleSheets);
</span><span class="lines">@@ -529,6 +532,10 @@
</span><span class="cx">
</span><span class="cx"> void Scope::scheduleUpdate(UpdateType update)
</span><span class="cx"> {
</span><ins>+ // FIXME: The m_isUpdatingStyleResolver test is here because extension stylesheets can get us here from StyleResolver::appendAuthorStyleSheets.
+ if (update == UpdateType::ContentsOrInterpretation && !m_isUpdatingStyleResolver)
+ clearResolver();
+
</ins><span class="cx"> if (!m_pendingUpdate || *m_pendingUpdate < update) {
</span><span class="cx"> m_pendingUpdate = update;
</span><span class="cx"> if (m_shadowRoot)
</span></span></pre></div>
<a id="branchessafari603branchSourceWebCorestyleStyleScopeh"></a>
<div class="modfile"><h4>Modified: branches/safari-603-branch/Source/WebCore/style/StyleScope.h (212918 => 212919)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-603-branch/Source/WebCore/style/StyleScope.h 2017-02-23 20:51:39 UTC (rev 212918)
+++ branches/safari-603-branch/Source/WebCore/style/StyleScope.h 2017-02-23 20:51:42 UTC (rev 212919)
</span><span class="lines">@@ -165,6 +165,7 @@
</span><span class="cx"> String m_selectedStylesheetSetName;
</span><span class="cx">
</span><span class="cx"> bool m_usesStyleBasedEditability { false };
</span><ins>+ bool m_isUpdatingStyleResolver { false };
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> inline void Scope::flushPendingUpdate()
</span></span></pre>
</div>
</div>
</body>
</html>