<!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>[198553] 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/198553">198553</a></dd>
<dt>Author</dt> <dd>antti@apple.com</dd>
<dt>Date</dt> <dd>2016-03-22 14:31:16 -0700 (Tue, 22 Mar 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Non-const DocumentRuleSets::features() does not check default style version
https://bugs.webkit.org/show_bug.cgi?id=155766
Reviewed by Andreas Kling.
This may leave it out of date when the default stylesheet expands.
No test, don't know how to hit this with current codebase. With some further optimizations
it starts affecting some tests involving UA media control stylesheets.
* css/DocumentRuleSets.h:
(WebCore::DocumentRuleSets::mutableFeatures):
Check the default style version number in non-const case too.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorecssDocumentRuleSetsh">trunk/Source/WebCore/css/DocumentRuleSets.h</a></li>
<li><a href="#trunkSourceWebCorecssStyleBuilderCustomh">trunk/Source/WebCore/css/StyleBuilderCustom.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (198552 => 198553)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-03-22 21:28:43 UTC (rev 198552)
+++ trunk/Source/WebCore/ChangeLog 2016-03-22 21:31:16 UTC (rev 198553)
</span><span class="lines">@@ -1,3 +1,20 @@
</span><ins>+2016-03-22 Antti Koivisto <antti@apple.com>
+
+ Non-const DocumentRuleSets::features() does not check default style version
+ https://bugs.webkit.org/show_bug.cgi?id=155766
+
+ Reviewed by Andreas Kling.
+
+ This may leave it out of date when the default stylesheet expands.
+
+ No test, don't know how to hit this with current codebase. With some further optimizations
+ it starts affecting some tests involving UA media control stylesheets.
+
+ * css/DocumentRuleSets.h:
+ (WebCore::DocumentRuleSets::mutableFeatures):
+
+ Check the default style version number in non-const case too.
+
</ins><span class="cx"> 2016-03-22 Daniel Bates <dabates@apple.com>
</span><span class="cx">
</span><span class="cx"> CSP: Should only execute <script> or apply <style> if its hash appears in all policies
</span></span></pre></div>
<a id="trunkSourceWebCorecssDocumentRuleSetsh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/DocumentRuleSets.h (198552 => 198553)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/DocumentRuleSets.h 2016-03-22 21:28:43 UTC (rev 198552)
+++ trunk/Source/WebCore/css/DocumentRuleSets.h 2016-03-22 21:31:16 UTC (rev 198553)
</span><span class="lines">@@ -46,7 +46,6 @@
</span><span class="cx"> ~DocumentRuleSets();
</span><span class="cx"> RuleSet* authorStyle() const { return m_authorStyle.get(); }
</span><span class="cx"> RuleSet* userStyle() const { return m_userStyle.get(); }
</span><del>- RuleFeatureSet& features() { return m_features; }
</del><span class="cx"> const RuleFeatureSet& features() const;
</span><span class="cx"> RuleSet* sibling() const { return m_siblingRuleSet.get(); }
</span><span class="cx"> RuleSet* uncommonAttribute() const { return m_uncommonAttributeRuleSet.get(); }
</span><span class="lines">@@ -62,6 +61,8 @@
</span><span class="cx"> void resetAuthorStyle();
</span><span class="cx"> void appendAuthorStyleSheets(const Vector<RefPtr<CSSStyleSheet>>&, MediaQueryEvaluator*, InspectorCSSOMWrappers&, StyleResolver*);
</span><span class="cx">
</span><ins>+ RuleFeatureSet& mutableFeatures();
+
</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 class="lines">@@ -84,6 +85,14 @@
</span><span class="cx"> return m_features;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+// FIXME: There should be just the const version.
+inline RuleFeatureSet& DocumentRuleSets::mutableFeatures()
+{
+ if (m_defaultStyleVersionOnFeatureCollection < CSSDefaultStyleSheets::defaultStyleVersion)
+ collectFeatures();
+ return m_features;
+}
+
</ins><span class="cx"> } // namespace WebCore
</span><span class="cx">
</span><span class="cx"> #endif // DocumentRuleSets_h
</span></span></pre></div>
<a id="trunkSourceWebCorecssStyleBuilderCustomh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/StyleBuilderCustom.h (198552 => 198553)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/StyleBuilderCustom.h 2016-03-22 21:28:43 UTC (rev 198552)
+++ trunk/Source/WebCore/css/StyleBuilderCustom.h 2016-03-22 21:31:16 UTC (rev 198553)
</span><span class="lines">@@ -1345,8 +1345,8 @@
</span><span class="cx"> styleResolver.style()->setContent(value.isNull() ? emptyAtom : value.impl(), didSet);
</span><span class="cx"> didSet = true;
</span><span class="cx"> // Register the fact that the attribute value affects the style.
</span><del>- styleResolver.ruleSets().features().attributeCanonicalLocalNamesInRules.add(attr.localName().impl());
- styleResolver.ruleSets().features().attributeLocalNamesInRules.add(attr.localName().impl());
</del><ins>+ styleResolver.ruleSets().mutableFeatures().attributeCanonicalLocalNamesInRules.add(attr.localName().impl());
+ styleResolver.ruleSets().mutableFeatures().attributeLocalNamesInRules.add(attr.localName().impl());
</ins><span class="cx"> } else if (contentValue.isCounter()) {
</span><span class="cx"> Counter* counterValue = contentValue.getCounterValue();
</span><span class="cx"> EListStyleType listStyleType = NoneListStyle;
</span><span class="lines">@@ -1715,8 +1715,8 @@
</span><span class="cx"> styleResolver.style()->setContentAltText(value.isNull() ? emptyAtom : value);
</span><span class="cx">
</span><span class="cx"> // Register the fact that the attribute value affects the style.
</span><del>- styleResolver.ruleSets().features().attributeCanonicalLocalNamesInRules.add(attr.localName().impl());
- styleResolver.ruleSets().features().attributeLocalNamesInRules.add(attr.localName().impl());
</del><ins>+ styleResolver.ruleSets().mutableFeatures().attributeCanonicalLocalNamesInRules.add(attr.localName().impl());
+ styleResolver.ruleSets().mutableFeatures().attributeLocalNamesInRules.add(attr.localName().impl());
</ins><span class="cx"> } else
</span><span class="cx"> styleResolver.style()->setContentAltText(emptyAtom);
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>