<!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>[248297] 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/248297">248297</a></dd>
<dt>Author</dt> <dd>antti@apple.com</dd>
<dt>Date</dt> <dd>2019-08-06 09:18:05 -0700 (Tue, 06 Aug 2019)</dd>
</dl>

<h3>Log Message</h3>
<pre>Add release assert against InvalidationRuleSet mutation during invalidation
https://bugs.webkit.org/show_bug.cgi?id=200467

Reviewed by Chris Dumez.

Try to get a more informative stack for rdar://problem/53413013

* css/DocumentRuleSets.cpp:
(WebCore::DocumentRuleSets::~DocumentRuleSets):
(WebCore::DocumentRuleSets::collectFeatures const):
* css/DocumentRuleSets.h:
* style/AttributeChangeInvalidation.cpp:
(WebCore::Style::AttributeChangeInvalidation::invalidateStyleWithRuleSets):
* style/ClassChangeInvalidation.cpp:
(WebCore::Style::ClassChangeInvalidation::invalidateStyleWithRuleSets):</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorecssDocumentRuleSetscpp">trunk/Source/WebCore/css/DocumentRuleSets.cpp</a></li>
<li><a href="#trunkSourceWebCorecssDocumentRuleSetsh">trunk/Source/WebCore/css/DocumentRuleSets.h</a></li>
<li><a href="#trunkSourceWebCorestyleAttributeChangeInvalidationcpp">trunk/Source/WebCore/style/AttributeChangeInvalidation.cpp</a></li>
<li><a href="#trunkSourceWebCorestyleClassChangeInvalidationcpp">trunk/Source/WebCore/style/ClassChangeInvalidation.cpp</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (248296 => 248297)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog   2019-08-06 16:08:18 UTC (rev 248296)
+++ trunk/Source/WebCore/ChangeLog      2019-08-06 16:18:05 UTC (rev 248297)
</span><span class="lines">@@ -1,5 +1,23 @@
</span><span class="cx"> 2019-08-06  Antti Koivisto  <antti@apple.com>
</span><span class="cx"> 
</span><ins>+        Add release assert against InvalidationRuleSet mutation during invalidation
+        https://bugs.webkit.org/show_bug.cgi?id=200467
+
+        Reviewed by Chris Dumez.
+
+        Try to get a more informative stack for rdar://problem/53413013
+
+        * css/DocumentRuleSets.cpp:
+        (WebCore::DocumentRuleSets::~DocumentRuleSets):
+        (WebCore::DocumentRuleSets::collectFeatures const):
+        * css/DocumentRuleSets.h:
+        * style/AttributeChangeInvalidation.cpp:
+        (WebCore::Style::AttributeChangeInvalidation::invalidateStyleWithRuleSets):
+        * style/ClassChangeInvalidation.cpp:
+        (WebCore::Style::ClassChangeInvalidation::invalidateStyleWithRuleSets):
+
+2019-08-06  Antti Koivisto  <antti@apple.com>
+
</ins><span class="cx">         REGRESSION: Cannot tap on any buttons on m.naver.com home screen on iPad
</span><span class="cx">         https://bugs.webkit.org/show_bug.cgi?id=200466
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkSourceWebCorecssDocumentRuleSetscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/DocumentRuleSets.cpp (248296 => 248297)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/DocumentRuleSets.cpp    2019-08-06 16:08:18 UTC (rev 248296)
+++ trunk/Source/WebCore/css/DocumentRuleSets.cpp       2019-08-06 16:18:05 UTC (rev 248297)
</span><span class="lines">@@ -37,6 +37,9 @@
</span><span class="cx"> 
</span><span class="cx"> namespace WebCore {
</span><span class="cx"> 
</span><ins>+// For catching <rdar://problem/53413013>
+bool DocumentRuleSets::s_isInvalidatingStyleWithRuleSets { false };
+
</ins><span class="cx"> DocumentRuleSets::DocumentRuleSets(StyleResolver& styleResolver)
</span><span class="cx">     : m_styleResolver(styleResolver)
</span><span class="cx"> {
</span><span class="lines">@@ -44,7 +47,10 @@
</span><span class="cx">     m_authorStyle->disableAutoShrinkToFit();
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-DocumentRuleSets::~DocumentRuleSets() = default;
</del><ins>+DocumentRuleSets::~DocumentRuleSets()
+{
+    RELEASE_ASSERT(!s_isInvalidatingStyleWithRuleSets);
+}
</ins><span class="cx"> 
</span><span class="cx"> RuleSet* DocumentRuleSets::userAgentMediaQueryStyle() const
</span><span class="cx"> {
</span><span class="lines">@@ -148,6 +154,8 @@
</span><span class="cx"> 
</span><span class="cx"> void DocumentRuleSets::collectFeatures() const
</span><span class="cx"> {
</span><ins>+    RELEASE_ASSERT(!s_isInvalidatingStyleWithRuleSets);
+
</ins><span class="cx">     m_features.clear();
</span><span class="cx">     // Collect all ids and rules using sibling selectors (:first-child and similar)
</span><span class="cx">     // in the current set of stylesheets. Style sharing code uses this information to reject
</span></span></pre></div>
<a id="trunkSourceWebCorecssDocumentRuleSetsh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/DocumentRuleSets.h (248296 => 248297)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/DocumentRuleSets.h      2019-08-06 16:08:18 UTC (rev 248296)
+++ trunk/Source/WebCore/css/DocumentRuleSets.h 2019-08-06 16:18:05 UTC (rev 248297)
</span><span class="lines">@@ -76,6 +76,8 @@
</span><span class="cx"> 
</span><span class="cx">     RuleFeatureSet& mutableFeatures();
</span><span class="cx"> 
</span><ins>+    static bool s_isInvalidatingStyleWithRuleSets;
+
</ins><span class="cx"> private:
</span><span class="cx">     void collectFeatures() const;
</span><span class="cx">     void collectRulesFromUserStyleSheets(const Vector<RefPtr<CSSStyleSheet>>&, RuleSet& userStyle, const MediaQueryEvaluator&, StyleResolver&);
</span></span></pre></div>
<a id="trunkSourceWebCorestyleAttributeChangeInvalidationcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/style/AttributeChangeInvalidation.cpp (248296 => 248297)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/style/AttributeChangeInvalidation.cpp       2019-08-06 16:08:18 UTC (rev 248296)
+++ trunk/Source/WebCore/style/AttributeChangeInvalidation.cpp  2019-08-06 16:18:05 UTC (rev 248297)
</span><span class="lines">@@ -29,6 +29,7 @@
</span><span class="cx"> #include "ElementIterator.h"
</span><span class="cx"> #include "StyleInvalidationFunctions.h"
</span><span class="cx"> #include "StyleInvalidator.h"
</span><ins>+#include <wtf/SetForScope.h>
</ins><span class="cx"> 
</span><span class="cx"> namespace WebCore {
</span><span class="cx"> namespace Style {
</span><span class="lines">@@ -88,6 +89,8 @@
</span><span class="cx"> 
</span><span class="cx"> void AttributeChangeInvalidation::invalidateStyleWithRuleSets()
</span><span class="cx"> {
</span><ins>+    SetForScope<bool> isInvalidating(DocumentRuleSets::s_isInvalidatingStyleWithRuleSets, true);
+
</ins><span class="cx">     for (auto* invalidationRuleSet : m_invalidationRuleSets) {
</span><span class="cx">         Invalidator invalidator(*invalidationRuleSet->ruleSet);
</span><span class="cx">         invalidator.invalidateStyleWithMatchElement(m_element, invalidationRuleSet->matchElement);
</span></span></pre></div>
<a id="trunkSourceWebCorestyleClassChangeInvalidationcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/style/ClassChangeInvalidation.cpp (248296 => 248297)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/style/ClassChangeInvalidation.cpp   2019-08-06 16:08:18 UTC (rev 248296)
+++ trunk/Source/WebCore/style/ClassChangeInvalidation.cpp      2019-08-06 16:18:05 UTC (rev 248297)
</span><span class="lines">@@ -31,6 +31,7 @@
</span><span class="cx"> #include "StyleInvalidationFunctions.h"
</span><span class="cx"> #include "StyleInvalidator.h"
</span><span class="cx"> #include <wtf/BitVector.h>
</span><ins>+#include <wtf/SetForScope.h>
</ins><span class="cx"> 
</span><span class="cx"> namespace WebCore {
</span><span class="cx"> namespace Style {
</span><span class="lines">@@ -119,6 +120,8 @@
</span><span class="cx"> 
</span><span class="cx"> void ClassChangeInvalidation::invalidateStyleWithRuleSets()
</span><span class="cx"> {
</span><ins>+    SetForScope<bool> isInvalidating(DocumentRuleSets::s_isInvalidatingStyleWithRuleSets, true);
+
</ins><span class="cx">     for (auto* invalidationRuleSet : m_invalidationRuleSets) {
</span><span class="cx">         Invalidator invalidator(*invalidationRuleSet->ruleSet);
</span><span class="cx">         invalidator.invalidateStyleWithMatchElement(m_element, invalidationRuleSet->matchElement);
</span></span></pre>
</div>
</div>

</body>
</html>