<!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>[213051] releases/WebKitGTK/webkit-2.16</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/213051">213051</a></dd>
<dt>Author</dt> <dd>carlosgc@webkit.org</dd>
<dt>Date</dt> <dd>2017-02-27 05:57:24 -0800 (Mon, 27 Feb 2017)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/212828">r212828</a> - REGRESSION(<a href="http://trac.webkit.org/projects/webkit/changeset/207669">r207669</a>): Crash after mutating selector text
https://bugs.webkit.org/show_bug.cgi?id=168655
<rdar://problem/30632111>
Reviewed by Andreas Kling.
Source/WebCore:
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:
LayoutTests:
* fast/css/selector-text-mutation-crash-expected.txt: Added.
* fast/css/selector-text-mutation-crash.html: Added.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#releasesWebKitGTKwebkit216LayoutTestsChangeLog">releases/WebKitGTK/webkit-2.16/LayoutTests/ChangeLog</a></li>
<li><a href="#releasesWebKitGTKwebkit216SourceWebCoreChangeLog">releases/WebKitGTK/webkit-2.16/Source/WebCore/ChangeLog</a></li>
<li><a href="#releasesWebKitGTKwebkit216SourceWebCorestyleStyleScopecpp">releases/WebKitGTK/webkit-2.16/Source/WebCore/style/StyleScope.cpp</a></li>
<li><a href="#releasesWebKitGTKwebkit216SourceWebCorestyleStyleScopeh">releases/WebKitGTK/webkit-2.16/Source/WebCore/style/StyleScope.h</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#releasesWebKitGTKwebkit216LayoutTestsfastcssselectortextmutationcrashexpectedtxt">releases/WebKitGTK/webkit-2.16/LayoutTests/fast/css/selector-text-mutation-crash-expected.txt</a></li>
<li><a href="#releasesWebKitGTKwebkit216LayoutTestsfastcssselectortextmutationcrashhtml">releases/WebKitGTK/webkit-2.16/LayoutTests/fast/css/selector-text-mutation-crash.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="releasesWebKitGTKwebkit216LayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.16/LayoutTests/ChangeLog (213050 => 213051)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.16/LayoutTests/ChangeLog 2017-02-27 13:45:11 UTC (rev 213050)
+++ releases/WebKitGTK/webkit-2.16/LayoutTests/ChangeLog 2017-02-27 13:57:24 UTC (rev 213051)
</span><span class="lines">@@ -1,3 +1,14 @@
</span><ins>+2017-02-22 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 Andreas Kling.
+
+ * fast/css/selector-text-mutation-crash-expected.txt: Added.
+ * fast/css/selector-text-mutation-crash.html: Added.
+
</ins><span class="cx"> 2017-02-22 Carlos Garcia Campos <cgarcia@igalia.com>
</span><span class="cx">
</span><span class="cx"> [GTK] Test fast/events/message-port-postMessage-recursive.html times out
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit216LayoutTestsfastcssselectortextmutationcrashexpectedtxt"></a>
<div class="addfile"><h4>Added: releases/WebKitGTK/webkit-2.16/LayoutTests/fast/css/selector-text-mutation-crash-expected.txt (0 => 213051)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.16/LayoutTests/fast/css/selector-text-mutation-crash-expected.txt (rev 0)
+++ releases/WebKitGTK/webkit-2.16/LayoutTests/fast/css/selector-text-mutation-crash-expected.txt 2017-02-27 13:57:24 UTC (rev 213051)
</span><span class="lines">@@ -0,0 +1 @@
</span><ins>+PASS
</ins></span></pre></div>
<a id="releasesWebKitGTKwebkit216LayoutTestsfastcssselectortextmutationcrashhtml"></a>
<div class="addfile"><h4>Added: releases/WebKitGTK/webkit-2.16/LayoutTests/fast/css/selector-text-mutation-crash.html (0 => 213051)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.16/LayoutTests/fast/css/selector-text-mutation-crash.html (rev 0)
+++ releases/WebKitGTK/webkit-2.16/LayoutTests/fast/css/selector-text-mutation-crash.html 2017-02-27 13:57:24 UTC (rev 213051)
</span><span class="lines">@@ -0,0 +1,14 @@
</span><ins>+<script>
+if (window.testRunner)
+ testRunner.dumpAsText();
+</script>
+<style id=s>
+body[foo] [id=d] { color: green };
+</style>
+<body>
+<div id=d>PASS</div>
+<script>
+d.offsetLeft;
+s.sheet.cssRules.item(0).selectorText = "body[foo]";
+document.body.setAttribute("foo", "foo");
+</script>
</ins></span></pre></div>
<a id="releasesWebKitGTKwebkit216SourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.16/Source/WebCore/ChangeLog (213050 => 213051)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.16/Source/WebCore/ChangeLog 2017-02-27 13:45:11 UTC (rev 213050)
+++ releases/WebKitGTK/webkit-2.16/Source/WebCore/ChangeLog 2017-02-27 13:57:24 UTC (rev 213051)
</span><span class="lines">@@ -1,3 +1,29 @@
</span><ins>+2017-02-22 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 Andreas Kling.
+
+ 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-08 Sergio Villar Senin <svillar@igalia.com>
</span><span class="cx">
</span><span class="cx"> [css-grid] Move the track sizing algorithm to its own class
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit216SourceWebCorestyleStyleScopecpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.16/Source/WebCore/style/StyleScope.cpp (213050 => 213051)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.16/Source/WebCore/style/StyleScope.cpp 2017-02-27 13:45:11 UTC (rev 213050)
+++ releases/WebKitGTK/webkit-2.16/Source/WebCore/style/StyleScope.cpp 2017-02-27 13:57:24 UTC (rev 213051)
</span><span class="lines">@@ -48,6 +48,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">@@ -91,6 +92,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">@@ -451,6 +453,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">@@ -521,6 +524,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="releasesWebKitGTKwebkit216SourceWebCorestyleStyleScopeh"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.16/Source/WebCore/style/StyleScope.h (213050 => 213051)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.16/Source/WebCore/style/StyleScope.h 2017-02-27 13:45:11 UTC (rev 213050)
+++ releases/WebKitGTK/webkit-2.16/Source/WebCore/style/StyleScope.h 2017-02-27 13:57:24 UTC (rev 213051)
</span><span class="lines">@@ -161,6 +161,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>