Title: [282810] trunk/Source/WebCore
- Revision
- 282810
- Author
- [email protected]
- Date
- 2021-09-21 04:00:15 -0700 (Tue, 21 Sep 2021)
Log Message
Unreviewed, reverting r282807.
https://bugs.webkit.org/show_bug.cgi?id=230546
This is causing imported/w3c/web-platform-tests/css/css-
fonts/parsing/font-palette-values-valid.html crash
Reverted changeset:
"Push font-palette-values data into CSSFontSelector"
https://bugs.webkit.org/show_bug.cgi?id=230447
https://commits.webkit.org/r282807
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (282809 => 282810)
--- trunk/Source/WebCore/ChangeLog 2021-09-21 09:28:00 UTC (rev 282809)
+++ trunk/Source/WebCore/ChangeLog 2021-09-21 11:00:15 UTC (rev 282810)
@@ -1,3 +1,17 @@
+2021-09-21 Commit Queue <[email protected]>
+
+ Unreviewed, reverting r282807.
+ https://bugs.webkit.org/show_bug.cgi?id=230546
+
+ This is causing imported/w3c/web-platform-tests/css/css-
+ fonts/parsing/font-palette-values-valid.html crash
+
+ Reverted changeset:
+
+ "Push font-palette-values data into CSSFontSelector"
+ https://bugs.webkit.org/show_bug.cgi?id=230447
+ https://commits.webkit.org/r282807
+
2021-09-21 Chris Lord <[email protected]>
imported/w3c/web-platform-tests/css/css-font-loading/fontfaceset-load-var.html crashes
Modified: trunk/Source/WebCore/css/CSSFontSelector.cpp (282809 => 282810)
--- trunk/Source/WebCore/css/CSSFontSelector.cpp 2021-09-21 09:28:00 UTC (rev 282809)
+++ trunk/Source/WebCore/css/CSSFontSelector.cpp 2021-09-21 11:00:15 UTC (rev 282810)
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2007-2021 Apple Inc. All rights reserved.
+ * Copyright (C) 2007, 2008, 2011, 2013 Apple Inc. All rights reserved.
* (C) 2007, 2008 Nikolas Zimmermann <[email protected]>
*
* Redistribution and use in source and binary forms, with or without
@@ -135,8 +135,6 @@
if (face.cssConnection())
m_cssConnectionsPossiblyToRemove.add(&face);
}
-
- m_paletteFamilyMap.clear();
}
void CSSFontSelector::buildCompleted()
@@ -231,15 +229,6 @@
++m_version;
}
-void CSSFontSelector::addFontPaletteValuesRule(StyleRuleFontPaletteValues& fontPaletteValuesRule)
-{
- m_paletteFamilyMap.ensure(std::make_pair(fontPaletteValuesRule.fontFamily(), fontPaletteValuesRule.name()), [&] () {
- return fontPaletteValuesRule.fontPaletteValues();
- });
-
- ++m_version;
-}
-
void CSSFontSelector::registerForInvalidationCallbacks(FontSelectorClient& client)
{
m_clients.add(&client);
@@ -331,8 +320,6 @@
familyForLookup = *genericFamilyOptional;
};
- // FIXME https://bugs.webkit.org/show_bug.cgi?id=230449: Query for font palette data and pass it into the font creation routines.
-
if (resolveGenericFamilyFirst)
resolveAndAssignGenericFamily();
Document* document = is<Document>(m_context.get()) ? &downcast<Document>(*m_context) : nullptr;
Modified: trunk/Source/WebCore/css/CSSFontSelector.h (282809 => 282810)
--- trunk/Source/WebCore/css/CSSFontSelector.h 2021-09-21 09:28:00 UTC (rev 282809)
+++ trunk/Source/WebCore/css/CSSFontSelector.h 2021-09-21 11:00:15 UTC (rev 282810)
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2007-2021 Apple Inc. All rights reserved.
+ * Copyright (C) 2007, 2008, 2011 Apple Inc. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
@@ -70,7 +70,6 @@
void buildCompleted();
void addFontFaceRule(StyleRuleFontFace&, bool isInitiatingElementInUserAgentShadowTree);
- void addFontPaletteValuesRule(StyleRuleFontPaletteValues&);
FontCache& fontCache() const final { return m_fontCache.get(); }
void fontCacheInvalidated() final;
@@ -126,8 +125,6 @@
Ref<CSSFontFaceSet> m_cssFontFaceSet;
HashSet<FontSelectorClient*> m_clients;
- HashMap<std::pair<AtomString, AtomString>, FontPaletteValues> m_paletteFamilyMap;
-
HashSet<RefPtr<CSSFontFace>> m_cssConnectionsPossiblyToRemove;
HashSet<RefPtr<StyleRuleFontFace>> m_cssConnectionsEncounteredDuringBuild;
Modified: trunk/Source/WebCore/style/RuleSet.cpp (282809 => 282810)
--- trunk/Source/WebCore/style/RuleSet.cpp 2021-09-21 09:28:00 UTC (rev 282809)
+++ trunk/Source/WebCore/style/RuleSet.cpp 2021-09-21 11:00:15 UTC (rev 282810)
@@ -2,7 +2,7 @@
* Copyright (C) 1999 Lars Knoll ([email protected])
* (C) 2004-2005 Allan Sandfeld Jensen ([email protected])
* Copyright (C) 2006, 2007 Nicholas Shanks ([email protected])
- * Copyright (C) 2005-2021 Apple Inc. All rights reserved.
+ * Copyright (C) 2005-2019 Apple Inc. All rights reserved.
* Copyright (C) 2007 Alexey Proskuryakov <[email protected]>
* Copyright (C) 2007, 2008 Eric Seidel <[email protected]>
* Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved. (http://www.torchmobile.com/)
@@ -358,14 +358,6 @@
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));
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
