<!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>[199099] trunk</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/199099">199099</a></dd>
<dt>Author</dt> <dd>antti@apple.com</dd>
<dt>Date</dt> <dd>2016-04-06 05:26:49 -0700 (Wed, 06 Apr 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>REGRESSION(<a href="http://trac.webkit.org/projects/webkit/changeset/196629">r196629</a>): Messages text size only changes for sending text, conversation text size does not change
https://bugs.webkit.org/show_bug.cgi?id=156287
<rdar://problem/24264756>
Reviewed by Andreas Kling.
Source/WebCore:
* css/RuleFeature.cpp:
(WebCore::RuleFeatureSet::recursivelyCollectFeaturesFromSelector):
(WebCore::makeAttributeSelectorKey):
Include attribute value to the key. Otherwise we may deduplicate selectors that are not indentical.
(WebCore::RuleFeatureSet::collectFeatures):
(WebCore::RuleFeatureSet::add):
Use HashMap::ensure().
* css/RuleFeature.h:
LayoutTests:
* fast/css/style-invalidation-attribute-change-descendants-expected.txt:
* fast/css/style-invalidation-attribute-change-descendants.html:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsfastcssstyleinvalidationattributechangedescendantsexpectedtxt">trunk/LayoutTests/fast/css/style-invalidation-attribute-change-descendants-expected.txt</a></li>
<li><a href="#trunkLayoutTestsfastcssstyleinvalidationattributechangedescendantshtml">trunk/LayoutTests/fast/css/style-invalidation-attribute-change-descendants.html</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorecssRuleFeaturecpp">trunk/Source/WebCore/css/RuleFeature.cpp</a></li>
<li><a href="#trunkSourceWebCorecssRuleFeatureh">trunk/Source/WebCore/css/RuleFeature.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (199098 => 199099)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2016-04-06 10:21:59 UTC (rev 199098)
+++ trunk/LayoutTests/ChangeLog 2016-04-06 12:26:49 UTC (rev 199099)
</span><span class="lines">@@ -1,3 +1,14 @@
</span><ins>+2016-04-06 Antti Koivisto <antti@apple.com>
+
+ REGRESSION(r196629): Messages text size only changes for sending text, conversation text size does not change
+ https://bugs.webkit.org/show_bug.cgi?id=156287
+ <rdar://problem/24264756>
+
+ Reviewed by Andreas Kling.
+
+ * fast/css/style-invalidation-attribute-change-descendants-expected.txt:
+ * fast/css/style-invalidation-attribute-change-descendants.html:
+
</ins><span class="cx"> 2016-04-06 Manuel Rego Casasnovas <rego@igalia.com>
</span><span class="cx">
</span><span class="cx"> [css-grid] Fix positioned children in RTL
</span></span></pre></div>
<a id="trunkLayoutTestsfastcssstyleinvalidationattributechangedescendantsexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/css/style-invalidation-attribute-change-descendants-expected.txt (199098 => 199099)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/css/style-invalidation-attribute-change-descendants-expected.txt 2016-04-06 10:21:59 UTC (rev 199098)
+++ trunk/LayoutTests/fast/css/style-invalidation-attribute-change-descendants-expected.txt 2016-04-06 12:26:49 UTC (rev 199099)
</span><span class="lines">@@ -154,6 +154,11 @@
</span><span class="cx"> PASS testStyleChangeType("target", "InlineStyleChange") is true
</span><span class="cx"> PASS testStyleChangeType("inert", "NoStyleChange") is true
</span><span class="cx"> PASS hasExpectedStyle is true
</span><ins>+Setting attribute 'myattr' value 'value11'
+PASS testStyleChangeType("root", "NoStyleChange") || testStyleChangeType("root", "InlineStyleChange") is true
+PASS testStyleChangeType("target", "InlineStyleChange") is true
+PASS testStyleChangeType("inert", "NoStyleChange") is true
+PASS hasExpectedStyle is true
</ins><span class="cx"> PASS successfullyParsed is true
</span><span class="cx">
</span><span class="cx"> TEST COMPLETE
</span></span></pre></div>
<a id="trunkLayoutTestsfastcssstyleinvalidationattributechangedescendantshtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/css/style-invalidation-attribute-change-descendants.html (199098 => 199099)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/css/style-invalidation-attribute-change-descendants.html 2016-04-06 10:21:59 UTC (rev 199098)
+++ trunk/LayoutTests/fast/css/style-invalidation-attribute-change-descendants.html 2016-04-06 12:26:49 UTC (rev 199099)
</span><span class="lines">@@ -46,6 +46,10 @@
</span><span class="cx"> color: rgb(10, 0, 0);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+[myattr=value11] target {
+ color: rgb(11, 0, 0);
+}
+
</ins><span class="cx"> </style>
</span><span class="cx"> </head>
</span><span class="cx"> <body>
</span><span class="lines">@@ -251,6 +255,10 @@
</span><span class="cx"> testStyleInvalidation("InlineStyleChange");
</span><span class="cx"> checkStyle(1);
</span><span class="cx">
</span><ins>+setAttribute('myattr', 'value11');
+testStyleInvalidation("InlineStyleChange");
+checkStyle(11);
+
</ins><span class="cx"> </script>
</span><span class="cx"> <script src="../../resources/js-test-post.js"></script>
</span><span class="cx"> </html>
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (199098 => 199099)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-04-06 10:21:59 UTC (rev 199098)
+++ trunk/Source/WebCore/ChangeLog 2016-04-06 12:26:49 UTC (rev 199099)
</span><span class="lines">@@ -1,3 +1,24 @@
</span><ins>+2016-04-06 Antti Koivisto <antti@apple.com>
+
+ REGRESSION(r196629): Messages text size only changes for sending text, conversation text size does not change
+ https://bugs.webkit.org/show_bug.cgi?id=156287
+ <rdar://problem/24264756>
+
+ Reviewed by Andreas Kling.
+
+ * css/RuleFeature.cpp:
+ (WebCore::RuleFeatureSet::recursivelyCollectFeaturesFromSelector):
+ (WebCore::makeAttributeSelectorKey):
+
+ Include attribute value to the key. Otherwise we may deduplicate selectors that are not indentical.
+
+ (WebCore::RuleFeatureSet::collectFeatures):
+ (WebCore::RuleFeatureSet::add):
+
+ Use HashMap::ensure().
+
+ * css/RuleFeature.h:
+
</ins><span class="cx"> 2016-04-06 Manuel Rego Casasnovas <rego@igalia.com>
</span><span class="cx">
</span><span class="cx"> [css-grid] Fix positioned children in RTL
</span></span></pre></div>
<a id="trunkSourceWebCorecssRuleFeaturecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/RuleFeature.cpp (199098 => 199099)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/RuleFeature.cpp 2016-04-06 10:21:59 UTC (rev 199098)
+++ trunk/Source/WebCore/css/RuleFeature.cpp 2016-04-06 12:26:49 UTC (rev 199099)
</span><span class="lines">@@ -84,11 +84,11 @@
</span><span class="cx"> } while (selector);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static std::pair<AtomicStringImpl*, unsigned> makeAttributeSelectorKey(const CSSSelector& selector)
</del><ins>+static RuleFeatureSet::AttributeRules::SelectorKey makeAttributeSelectorKey(const CSSSelector& selector)
</ins><span class="cx"> {
</span><span class="cx"> bool caseInsensitive = selector.attributeValueMatchingIsCaseInsensitive();
</span><span class="cx"> unsigned matchAndCase = static_cast<unsigned>(selector.match()) << 1 | caseInsensitive;
</span><del>- return std::make_pair(selector.attributeCanonicalLocalName().impl(), matchAndCase);
</del><ins>+ return std::make_pair(selector.attributeCanonicalLocalName().impl(), std::make_pair(selector.value().impl(), matchAndCase));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void RuleFeatureSet::collectFeatures(const RuleData& ruleData)
</span><span class="lines">@@ -100,16 +100,16 @@
</span><span class="cx"> if (ruleData.containsUncommonAttributeSelector())
</span><span class="cx"> uncommonAttributeRules.append(RuleFeature(ruleData.rule(), ruleData.selectorIndex(), ruleData.hasDocumentSecurityOrigin()));
</span><span class="cx"> for (auto* className : selectorFeatures.classesMatchingAncestors) {
</span><del>- auto addResult = ancestorClassRules.add(className, nullptr);
- if (addResult.isNewEntry)
- addResult.iterator->value = std::make_unique<Vector<RuleFeature>>();
</del><ins>+ auto addResult = ancestorClassRules.ensure(className, [] {
+ return std::make_unique<Vector<RuleFeature>>();
+ });
</ins><span class="cx"> addResult.iterator->value->append(RuleFeature(ruleData.rule(), ruleData.selectorIndex(), ruleData.hasDocumentSecurityOrigin()));
</span><span class="cx"> }
</span><span class="cx"> for (auto* selector : selectorFeatures.attributeSelectorsMatchingAncestors) {
</span><span class="cx"> // Hashing by attributeCanonicalLocalName makes this HTML specific.
</span><del>- auto addResult = ancestorAttributeRulesForHTML.add(selector->attributeCanonicalLocalName().impl(), nullptr);
- if (addResult.isNewEntry)
- addResult.iterator->value = std::make_unique<AttributeRules>();
</del><ins>+ auto addResult = ancestorAttributeRulesForHTML.ensure(selector->attributeCanonicalLocalName().impl(), [] {
+ return std::make_unique<AttributeRules>();
+ });
</ins><span class="cx"> auto& rules = *addResult.iterator->value;
</span><span class="cx"> rules.features.append(RuleFeature(ruleData.rule(), ruleData.selectorIndex(), ruleData.hasDocumentSecurityOrigin()));
</span><span class="cx"> // Deduplicate selectors.
</span><span class="lines">@@ -127,16 +127,15 @@
</span><span class="cx"> siblingRules.appendVector(other.siblingRules);
</span><span class="cx"> uncommonAttributeRules.appendVector(other.uncommonAttributeRules);
</span><span class="cx"> for (auto& keyValuePair : other.ancestorClassRules) {
</span><del>- auto addResult = ancestorClassRules.add(keyValuePair.key, nullptr);
- if (addResult.isNewEntry)
- addResult.iterator->value = std::make_unique<Vector<RuleFeature>>(*keyValuePair.value);
- else
- addResult.iterator->value->appendVector(*keyValuePair.value);
</del><ins>+ auto addResult = ancestorClassRules.ensure(keyValuePair.key, [] {
+ return std::make_unique<Vector<RuleFeature>>();
+ });
+ addResult.iterator->value->appendVector(*keyValuePair.value);
</ins><span class="cx"> }
</span><span class="cx"> for (auto& keyValuePair : other.ancestorAttributeRulesForHTML) {
</span><del>- auto addResult = ancestorAttributeRulesForHTML.add(keyValuePair.key, nullptr);
- if (addResult.isNewEntry)
- addResult.iterator->value = std::make_unique<AttributeRules>();
</del><ins>+ auto addResult = ancestorAttributeRulesForHTML.ensure(keyValuePair.key, [] {
+ return std::make_unique<AttributeRules>();
+ });
</ins><span class="cx"> auto& rules = *addResult.iterator->value;
</span><span class="cx"> rules.features.appendVector(keyValuePair.value->features);
</span><span class="cx"> for (auto& selectorPair : keyValuePair.value->selectors)
</span></span></pre></div>
<a id="trunkSourceWebCorecssRuleFeatureh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/RuleFeature.h (199098 => 199099)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/RuleFeature.h 2016-04-06 10:21:59 UTC (rev 199098)
+++ trunk/Source/WebCore/css/RuleFeature.h 2016-04-06 12:26:49 UTC (rev 199099)
</span><span class="lines">@@ -61,7 +61,8 @@
</span><span class="cx"> HashMap<AtomicStringImpl*, std::unique_ptr<Vector<RuleFeature>>> ancestorClassRules;
</span><span class="cx">
</span><span class="cx"> struct AttributeRules {
</span><del>- HashMap<std::pair<AtomicStringImpl*, unsigned>, const CSSSelector*> selectors;
</del><ins>+ using SelectorKey = std::pair<AtomicStringImpl*, std::pair<AtomicStringImpl*, unsigned>>;
+ HashMap<SelectorKey, const CSSSelector*> selectors;
</ins><span class="cx"> Vector<RuleFeature> features;
</span><span class="cx"> };
</span><span class="cx"> HashMap<AtomicStringImpl*, std::unique_ptr<AttributeRules>> ancestorAttributeRulesForHTML;
</span></span></pre>
</div>
</div>
</body>
</html>