Diff
Modified: trunk/LayoutTests/imported/w3c/ChangeLog (283129 => 283130)
--- trunk/LayoutTests/imported/w3c/ChangeLog 2021-09-27 19:33:18 UTC (rev 283129)
+++ trunk/LayoutTests/imported/w3c/ChangeLog 2021-09-27 19:50:12 UTC (rev 283130)
@@ -1,3 +1,19 @@
+2021-09-27 Myles C. Maxfield <[email protected]>
+
+ The CSS Fonts spec has deleted CSSRule.FONT_PALETTE_VALUES_RULE
+ https://bugs.webkit.org/show_bug.cgi?id=230786
+ <rdar://problem/83528219>
+
+ Reviewed by Antti Koivisto.
+
+ The test is being upstreamed at https://github.com/web-platform-tests/wpt/pull/30959.
+
+ * web-platform-tests/css/css-fonts/idlharness-expected.txt:
+ * web-platform-tests/css/css-fonts/parsing/font-palette-values-invalid-expected.txt:
+ * web-platform-tests/css/css-fonts/parsing/font-palette-values-invalid.html:
+ * web-platform-tests/css/css-fonts/parsing/font-palette-values-valid.html:
+ * web-platform-tests/interfaces/css-fonts.idl:
+
2021-09-27 Antti Koivisto <[email protected]>
[CSS Cascade Layers] Support @layer statement before @import statements
Modified: trunk/LayoutTests/imported/w3c/web-platform-tests/css/css-fonts/idlharness-expected.txt (283129 => 283130)
--- trunk/LayoutTests/imported/w3c/web-platform-tests/css/css-fonts/idlharness-expected.txt 2021-09-27 19:33:18 UTC (rev 283129)
+++ trunk/LayoutTests/imported/w3c/web-platform-tests/css/css-fonts/idlharness-expected.txt 2021-09-27 19:50:12 UTC (rev 283130)
@@ -3,8 +3,6 @@
PASS idl_test validation
PASS Partial interface CSSRule: original interface defined
PASS Partial interface CSSRule: member names are unique
-PASS Partial interface CSSRule[2]: original interface defined
-PASS Partial interface CSSRule[2]: member names are unique
PASS CSSFontFaceRule interface: existence and properties of interface object
PASS CSSFontFaceRule interface object length
PASS CSSFontFaceRule interface object name
@@ -16,7 +14,6 @@
PASS Stringification of cssFontFaceRule
PASS CSSFontFaceRule interface: cssFontFaceRule must inherit property "style" with the proper type
FAIL CSSRule interface: cssFontFaceRule must inherit property "FONT_FEATURE_VALUES_RULE" with the proper type assert_inherits: property "FONT_FEATURE_VALUES_RULE" not found in prototype chain
-FAIL CSSRule interface: cssFontFaceRule must inherit property "FONT_PALETTE_VALUES_RULE" with the proper type assert_equals: expected 15 but got 19
FAIL CSSFontFeatureValuesRule interface: existence and properties of interface object assert_own_property: self does not have own property "CSSFontFeatureValuesRule" expected property "CSSFontFeatureValuesRule" missing
FAIL CSSFontFeatureValuesRule interface object length assert_own_property: self does not have own property "CSSFontFeatureValuesRule" expected property "CSSFontFeatureValuesRule" missing
FAIL CSSFontFeatureValuesRule interface object name assert_own_property: self does not have own property "CSSFontFeatureValuesRule" expected property "CSSFontFeatureValuesRule" missing
@@ -47,8 +44,5 @@
FAIL CSSFontPaletteValuesRule interface: attribute basePalette assert_equals: setter must be function for PutForwards, Replaceable, or non-readonly attributes expected "function" but got "undefined"
FAIL CSSRule interface: constant FONT_FEATURE_VALUES_RULE on interface object assert_own_property: expected property "FONT_FEATURE_VALUES_RULE" missing
FAIL CSSRule interface: constant FONT_FEATURE_VALUES_RULE on interface prototype object assert_own_property: expected property "FONT_FEATURE_VALUES_RULE" missing
-FAIL CSSRule interface: constant FONT_PALETTE_VALUES_RULE on interface object assert_equals: property has wrong value expected 15 but got 19
-FAIL CSSRule interface: constant FONT_PALETTE_VALUES_RULE on interface prototype object assert_equals: property has wrong value expected 15 but got 19
FAIL CSSRule interface: cssRule must inherit property "FONT_FEATURE_VALUES_RULE" with the proper type assert_inherits: property "FONT_FEATURE_VALUES_RULE" not found in prototype chain
-FAIL CSSRule interface: cssRule must inherit property "FONT_PALETTE_VALUES_RULE" with the proper type assert_equals: expected 15 but got 19
Modified: trunk/LayoutTests/imported/w3c/web-platform-tests/css/css-fonts/parsing/font-palette-values-invalid-expected.txt (283129 => 283130)
--- trunk/LayoutTests/imported/w3c/web-platform-tests/css/css-fonts/parsing/font-palette-values-invalid-expected.txt 2021-09-27 19:33:18 UTC (rev 283129)
+++ trunk/LayoutTests/imported/w3c/web-platform-tests/css/css-fonts/parsing/font-palette-values-invalid-expected.txt 2021-09-27 19:50:12 UTC (rev 283130)
@@ -17,4 +17,5 @@
PASS CSS Fonts Module Level 4: parsing @font-palette-values 15
PASS CSS Fonts Module Level 4: parsing @font-palette-values 16
PASS CSS Fonts Module Level 4: parsing @font-palette-values 17
+PASS CSS Fonts Module Level 4: parsing @font-palette-values 18
Modified: trunk/LayoutTests/imported/w3c/web-platform-tests/css/css-fonts/parsing/font-palette-values-invalid.html (283129 => 283130)
--- trunk/LayoutTests/imported/w3c/web-platform-tests/css/css-fonts/parsing/font-palette-values-invalid.html 2021-09-27 19:33:18 UTC (rev 283129)
+++ trunk/LayoutTests/imported/w3c/web-platform-tests/css/css-fonts/parsing/font-palette-values-invalid.html 2021-09-27 19:50:12 UTC (rev 283130)
@@ -234,6 +234,10 @@
assert_equals(rule.size, 0);
assert_equals(rule.basePalette, "");
});
+
+test(function() {
+ assert_equals(CSSRule.FONT_PALETTE_VALUES_RULE, undefined);
+});
</script>
</body>
</html>
Modified: trunk/LayoutTests/imported/w3c/web-platform-tests/css/css-fonts/parsing/font-palette-values-valid.html (283129 => 283130)
--- trunk/LayoutTests/imported/w3c/web-platform-tests/css/css-fonts/parsing/font-palette-values-valid.html 2021-09-27 19:33:18 UTC (rev 283129)
+++ trunk/LayoutTests/imported/w3c/web-platform-tests/css/css-fonts/parsing/font-palette-values-valid.html 2021-09-27 19:50:12 UTC (rev 283130)
@@ -117,7 +117,6 @@
test(function() {
let rule = rules[0];
- assert_equals(rule.type, CSSRule.FONT_PALETTE_VALUES_RULE);
assert_equals(rule.constructor.name, "CSSFontPaletteValuesRule");
assert_equals(rule.fontFamily, "");
assert_equals(rule.basePalette, "");
Modified: trunk/LayoutTests/imported/w3c/web-platform-tests/interfaces/css-fonts.idl (283129 => 283130)
--- trunk/LayoutTests/imported/w3c/web-platform-tests/interfaces/css-fonts.idl 2021-09-27 19:33:18 UTC (rev 283129)
+++ trunk/LayoutTests/imported/w3c/web-platform-tests/interfaces/css-fonts.idl 2021-09-27 19:50:12 UTC (rev 283130)
@@ -28,9 +28,6 @@
(unsigned long or sequence<unsigned long>) values);
};
-partial interface CSSRule { const unsigned short FONT_PALETTE_VALUES_RULE = 15;
-};
-
[Exposed=Window]
interface CSSFontPaletteValuesRule : CSSRule {
maplike<unsigned long, CSSOMString>;
Modified: trunk/Source/WebCore/ChangeLog (283129 => 283130)
--- trunk/Source/WebCore/ChangeLog 2021-09-27 19:33:18 UTC (rev 283129)
+++ trunk/Source/WebCore/ChangeLog 2021-09-27 19:50:12 UTC (rev 283130)
@@ -1,3 +1,20 @@
+2021-09-27 Myles C. Maxfield <[email protected]>
+
+ The CSS Fonts spec has deleted CSSRule.FONT_PALETTE_VALUES_RULE
+ https://bugs.webkit.org/show_bug.cgi?id=230786
+ <rdar://problem/83528219>
+
+ Reviewed by Antti Koivisto.
+
+ Update WebKit according to
+ https://github.com/w3c/csswg-drafts/commit/45bda92646e0438c1fcd44497144aa86f0df1b61.
+
+ Test: web-platform-tests/css/css-fonts/parsing/font-palette-values-invalid.html
+
+ * css/CSSRule.h:
+ * css/CSSRule.idl:
+ * css/StyleRuleType.h:
+
2021-09-27 Andres Gonzalez <[email protected]>
Boundary check of AccessibilityMathMLElement::mathOverObject is incorrect
Modified: trunk/Source/WebCore/css/CSSRule.h (283129 => 283130)
--- trunk/Source/WebCore/css/CSSRule.h 2021-09-27 19:33:18 UTC (rev 283129)
+++ trunk/Source/WebCore/css/CSSRule.h 2021-09-27 19:50:12 UTC (rev 283130)
@@ -51,7 +51,7 @@
NAMESPACE_RULE = 10,
COUNTER_STYLE_RULE = 11,
SUPPORTS_RULE = 12,
- FONT_PALETTE_VALUES_RULE = 19 // https://github.com/w3c/csswg-drafts/issues/6623
+ FONT_PALETTE_VALUES_RULE = 19
};
enum DeprecatedType {
Modified: trunk/Source/WebCore/css/CSSRule.idl (283129 => 283130)
--- trunk/Source/WebCore/css/CSSRule.idl 2021-09-27 19:33:18 UTC (rev 283129)
+++ trunk/Source/WebCore/css/CSSRule.idl 2021-09-27 19:50:12 UTC (rev 283130)
@@ -44,7 +44,6 @@
const unsigned short NAMESPACE_RULE = 10;
[EnabledBySetting=CSSCounterStyleAtRules] const unsigned short COUNTER_STYLE_RULE = 11;
const unsigned short SUPPORTS_RULE = 12;
- const unsigned short FONT_PALETTE_VALUES_RULE = 19; /* https://github.com/w3c/csswg-drafts/issues/6623 */
// Legacy synonyms for the above, kept to avoid breaking existing content.
const unsigned short WEBKIT_KEYFRAMES_RULE = 7;
Modified: trunk/Source/WebCore/css/StyleRuleType.h (283129 => 283130)
--- trunk/Source/WebCore/css/StyleRuleType.h 2021-09-27 19:33:18 UTC (rev 283129)
+++ trunk/Source/WebCore/css/StyleRuleType.h 2021-09-27 19:50:12 UTC (rev 283130)
@@ -41,7 +41,7 @@
Namespace = 10,
CounterStyle = 11,
Supports = 12,
- FontPaletteValues = 19, // https://github.com/w3c/csswg-drafts/issues/6623
+ FontPaletteValues = 19,
Layer = 20
};
