Diff
Modified: trunk/LayoutTests/imported/w3c/ChangeLog (283215 => 283216)
--- trunk/LayoutTests/imported/w3c/ChangeLog 2021-09-29 14:38:48 UTC (rev 283215)
+++ trunk/LayoutTests/imported/w3c/ChangeLog 2021-09-29 15:23:09 UTC (rev 283216)
@@ -1,3 +1,13 @@
+2021-09-29 Antti Koivisto <[email protected]>
+
+ [CSS Cascade Layers] Add fonts and keyframes in cascade layer order
+ https://bugs.webkit.org/show_bug.cgi?id=230947
+
+ Reviewed by Simon Fraser.
+
+ * web-platform-tests/css/css-cascade/layer-font-face-override-expected.txt:
+ * web-platform-tests/css/css-cascade/layer-keyframes-override-expected.txt:
+
2021-09-28 Cameron McCormack <[email protected]>
Preserve color space when structured cloning ImageBitmaps
Modified: trunk/LayoutTests/imported/w3c/web-platform-tests/css/css-cascade/layer-font-face-override-expected.txt (283215 => 283216)
--- trunk/LayoutTests/imported/w3c/web-platform-tests/css/css-cascade/layer-font-face-override-expected.txt 2021-09-29 14:38:48 UTC (rev 283215)
+++ trunk/LayoutTests/imported/w3c/web-platform-tests/css/css-cascade/layer-font-face-override-expected.txt 2021-09-29 15:23:09 UTC (rev 283216)
@@ -1,7 +1,7 @@
Test
-FAIL @font-face layered overrides unlayered assert_equals: expected "80px" but got "38.515625px"
-FAIL @font-face override between layers assert_equals: expected "80px" but got "38.515625px"
-FAIL @font-face override update with appended sheet 1 assert_equals: expected "80px" but got "38.515625px"
+PASS @font-face layered overrides unlayered
+PASS @font-face override between layers
+PASS @font-face override update with appended sheet 1
PASS @font-face override update with appended sheet 2
Modified: trunk/LayoutTests/imported/w3c/web-platform-tests/css/css-cascade/layer-keyframes-override-expected.txt (283215 => 283216)
--- trunk/LayoutTests/imported/w3c/web-platform-tests/css/css-cascade/layer-keyframes-override-expected.txt 2021-09-29 14:38:48 UTC (rev 283215)
+++ trunk/LayoutTests/imported/w3c/web-platform-tests/css/css-cascade/layer-keyframes-override-expected.txt 2021-09-29 15:23:09 UTC (rev 283216)
@@ -1,6 +1,6 @@
-FAIL @keyframes layered overrides unlayered assert_equals: expected "rgb(0, 128, 0)" but got "rgb(255, 0, 0)"
-FAIL @keyframes override between layers assert_equals: expected "rgb(0, 128, 0)" but got "rgb(255, 0, 0)"
-FAIL @keyframes override update with appended sheet 1 assert_equals: expected "rgb(0, 128, 0)" but got "rgb(255, 0, 0)"
-FAIL @keyframes override update with appended sheet 2 assert_equals: expected "rgb(0, 128, 0)" but got "rgb(255, 0, 0)"
+PASS @keyframes layered overrides unlayered
+PASS @keyframes override between layers
+PASS @keyframes override update with appended sheet 1
+PASS @keyframes override update with appended sheet 2
Modified: trunk/Source/WebCore/ChangeLog (283215 => 283216)
--- trunk/Source/WebCore/ChangeLog 2021-09-29 14:38:48 UTC (rev 283215)
+++ trunk/Source/WebCore/ChangeLog 2021-09-29 15:23:09 UTC (rev 283216)
@@ -1,3 +1,30 @@
+2021-09-29 Antti Koivisto <[email protected]>
+
+ [CSS Cascade Layers] Add fonts and keyframes in cascade layer order
+ https://bugs.webkit.org/show_bug.cgi?id=230947
+
+ Reviewed by Simon Fraser.
+
+ Ensure font and keyframe rules respect cascade layer ordering.
+
+ * style/RuleSet.cpp:
+ (WebCore::Style::RuleSet::Builder::addChildRules):
+
+ Collect resolver mutating rules instead of processing them immediately.
+
+ (WebCore::Style::RuleSet::Builder::~Builder):
+ (WebCore::Style::RuleSet::Builder::addMutatingRulesToResolver):
+
+ Process the rules in correct order after cascade layer order has been established.
+
+ In additive case we need to also re-process rules added from earlier stylesheets as they might
+ have higher priority than the newly added ones.
+
+ (WebCore::Style::RuleSet::shrinkToFit):
+ * style/RuleSet.h:
+ (WebCore::Style::RuleSet::cascadeLayerOrderForIdentifier const):
+ (WebCore::Style::RuleSet::cascadeLayerOrderFor const):
+
2021-09-28 Myles C. Maxfield <[email protected]>
Factor out rare members of FontCreationContext into FontCreationContextRareData
Modified: trunk/Source/WebCore/style/RuleSet.cpp (283215 => 283216)
--- trunk/Source/WebCore/style/RuleSet.cpp 2021-09-29 14:38:48 UTC (rev 283215)
+++ trunk/Source/WebCore/style/RuleSet.cpp 2021-09-29 15:23:09 UTC (rev 283216)
@@ -346,27 +346,13 @@
popCascadeLayer(layerRule.name());
continue;
}
- if (is<StyleRuleFontFace>(*rule)) {
- // Add this font face to our set.
- if (resolver) {
- resolver->document().fontSelector().addFontFaceRule(downcast<StyleRuleFontFace>(*rule.get()), false);
- resolver->invalidateMatchedDeclarationsCache();
+ if (is<StyleRuleFontFace>(*rule) || is<StyleRuleFontPaletteValues>(*rule) || is<StyleRuleKeyframes>(*rule)) {
+ if (mode == Mode::ResolverMutationScan) {
+ mediaQueryCollector.didMutateResolver();
+ continue;
}
- mediaQueryCollector.didMutateResolver();
- continue;
- }
- if (is<StyleRuleFontPaletteValues>(*rule)) {
- if (resolver) {
- resolver->document().fontSelector().addFontPaletteValuesRule(downcast<StyleRuleFontPaletteValues>(*rule.get()));
- resolver->invalidateMatchedDeclarationsCache();
- }
- mediaQueryCollector.didMutateResolver();
- continue;
- }
- if (is<StyleRuleKeyframes>(*rule)) {
if (resolver)
- resolver->addKeyframeStyle(downcast<StyleRuleKeyframes>(*rule));
- mediaQueryCollector.didMutateResolver();
+ collectedResolverMutatingRules.append({ *rule, currentCascadeLayerIdentifier });
continue;
}
if (is<StyleRuleSupports>(*rule) && downcast<StyleRuleSupports>(*rule).conditionIsSupported()) {
@@ -403,8 +389,11 @@
RuleSet::Builder::~Builder()
{
- if (mode == Mode::Normal && !cascadeLayerIdentifierMap.isEmpty())
- updateCascadeLayerOrder();
+ if (mode == Mode::ResolverMutationScan)
+ return;
+
+ updateCascadeLayerOrder();
+ addMutatingRulesToResolver();
}
void RuleSet::Builder::addStyleRule(const StyleRule& rule)
@@ -470,6 +459,9 @@
void RuleSet::Builder::updateCascadeLayerOrder()
{
+ if (cascadeLayerIdentifierMap.isEmpty())
+ return;
+
auto compare = [&](CascadeLayerIdentifier a, CascadeLayerIdentifier b) {
while (a && b) {
// Identifiers are in parse order which almost corresponds to the layer priority order.
@@ -499,6 +491,46 @@
ruleSet->cascadeLayerForIdentifier(orderVector[i]).order = i + 1;
}
+void RuleSet::Builder::addMutatingRulesToResolver()
+{
+ if (!resolver)
+ return;
+
+ auto compareLayers = [&](const ResolverMutatingRule& a, const ResolverMutatingRule& b) {
+ auto aOrder = ruleSet->cascadeLayerOrderForIdentifier(a.layerIdentifier);
+ auto bOrder = ruleSet->cascadeLayerOrderForIdentifier(b.layerIdentifier);
+ return aOrder < bOrder;
+ };
+
+ // The order may change so we need to reprocess resolver mutating rules from earlier stylesheets.
+ auto rulesToAdd = std::exchange(ruleSet->m_resolverMutatingRulesInLayers, { });
+ rulesToAdd.appendVector(WTFMove(collectedResolverMutatingRules));
+
+ if (!cascadeLayerIdentifierMap.isEmpty())
+ std::stable_sort(rulesToAdd.begin(), rulesToAdd.end(), compareLayers);
+
+ for (auto& collectedRule : rulesToAdd) {
+ if (collectedRule.layerIdentifier)
+ ruleSet->m_resolverMutatingRulesInLayers.append(collectedRule);
+
+ auto& rule = collectedRule.rule;
+ if (is<StyleRuleFontFace>(rule)) {
+ resolver->document().fontSelector().addFontFaceRule(downcast<StyleRuleFontFace>(rule.get()), false);
+ resolver->invalidateMatchedDeclarationsCache();
+ continue;
+ }
+ if (is<StyleRuleFontPaletteValues>(rule)) {
+ resolver->document().fontSelector().addFontPaletteValuesRule(downcast<StyleRuleFontPaletteValues>(rule.get()));
+ resolver->invalidateMatchedDeclarationsCache();
+ continue;
+ }
+ if (is<StyleRuleKeyframes>(rule)) {
+ resolver->addKeyframeStyle(downcast<StyleRuleKeyframes>(rule.get()));
+ continue;
+ }
+ }
+}
+
template<typename Function>
void RuleSet::traverseRuleDatas(Function&& function)
{
@@ -635,6 +667,7 @@
m_cascadeLayers.shrinkToFit();
m_cascadeLayerIdentifierForRulePosition.shrinkToFit();
+ m_resolverMutatingRulesInLayers.shrinkToFit();
}
RuleSet::MediaQueryCollector::~MediaQueryCollector() = default;
Modified: trunk/Source/WebCore/style/RuleSet.h (283215 => 283216)
--- trunk/Source/WebCore/style/RuleSet.h 2021-09-29 14:38:48 UTC (rev 283215)
+++ trunk/Source/WebCore/style/RuleSet.h 2021-09-29 15:23:09 UTC (rev 283216)
@@ -152,6 +152,11 @@
using CascadeLayerIdentifier = unsigned;
+ struct ResolverMutatingRule {
+ Ref<StyleRuleBase> rule;
+ CascadeLayerIdentifier layerIdentifier;
+ };
+
struct Builder {
enum class Mode { Normal, ResolverMutationScan };
@@ -162,6 +167,7 @@
CascadeLayerName resolvedCascadeLayerName { };
HashMap<CascadeLayerName, CascadeLayerIdentifier> cascadeLayerIdentifierMap { };
CascadeLayerIdentifier currentCascadeLayerIdentifier { 0 };
+ Vector<ResolverMutatingRule> collectedResolverMutatingRules { };
void addRulesFromSheet(const StyleSheetContents&);
@@ -175,6 +181,7 @@
void pushCascadeLayer(const CascadeLayerName&);
void popCascadeLayer(const CascadeLayerName&);
void updateCascadeLayerOrder();
+ void addMutatingRulesToResolver();
};
struct CollectedMediaQueryChanges {
@@ -193,6 +200,7 @@
};
CascadeLayer& cascadeLayerForIdentifier(CascadeLayerIdentifier identifier) { return m_cascadeLayers[identifier - 1]; }
const CascadeLayer& cascadeLayerForIdentifier(CascadeLayerIdentifier identifier) const { return m_cascadeLayers[identifier - 1]; }
+ unsigned cascadeLayerOrderForIdentifier(CascadeLayerIdentifier) const;
AtomRuleMap m_idRules;
AtomRuleMap m_classRules;
@@ -218,6 +226,8 @@
// This is a side vector to hold layer identifiers without bloating RuleData.
Vector<CascadeLayerIdentifier> m_cascadeLayerIdentifierForRulePosition;
+ Vector<ResolverMutatingRule> m_resolverMutatingRulesInLayers;
+
bool m_hasHostPseudoClassRulesMatchingInShadowTree { false };
bool m_autoShrinkToFitEnabled { true };
bool m_hasViewportDependentMediaQueries { false };
@@ -233,14 +243,19 @@
return tagRules->get(key);
}
+inline unsigned RuleSet::cascadeLayerOrderForIdentifier(CascadeLayerIdentifier identifier) const
+{
+ if (!identifier)
+ return 0;
+ return cascadeLayerForIdentifier(identifier).order;
+}
+
inline unsigned RuleSet::cascadeLayerOrderFor(const RuleData& ruleData) const
{
if (m_cascadeLayerIdentifierForRulePosition.size() <= ruleData.position())
return 0;
auto identifier = m_cascadeLayerIdentifierForRulePosition[ruleData.position()];
- if (!identifier)
- return 0;
- return cascadeLayerForIdentifier(identifier).order;
+ return cascadeLayerOrderForIdentifier(identifier);
}
} // namespace Style
