Title: [287434] trunk
Revision
287434
Author
[email protected]
Date
2021-12-24 18:03:22 -0800 (Fri, 24 Dec 2021)

Log Message

Internally unprefix -webkit-font-kerning CSS property
https://bugs.webkit.org/show_bug.cgi?id=234673

Reviewed by Myles C. Maxfield.

Same to what was done in bug 234602 for text-emphasis CSS properties.

LayoutTests/imported/w3c:

* web-platform-tests/css/css-cascade/all-prop-initial-xml-expected.txt:

Source/WebCore:

* css/CSSComputedStyleDeclaration.cpp:
(WebCore::ComputedStyleExtractor::valueForPropertyInStyle):
* css/CSSProperties.json:
* css/parser/CSSParserFastPaths.cpp:
(WebCore::CSSParserFastPaths::isValidKeywordPropertyAndValue):
(WebCore::CSSParserFastPaths::isKeywordPropertyID):
* editing/cocoa/HTMLConverter.mm:
(HTMLConverter::computedAttributesForElement):

LayoutTests:

* fast/css/getComputedStyle/computed-style-expected.txt:
* fast/css/getComputedStyle/computed-style-font-family-expected.txt:
* fast/css/getComputedStyle/computed-style-without-renderer-expected.txt:
* fast/css/getComputedStyle/resources/property-names.js:
* platform/glib/fast/css/getComputedStyle/computed-style-expected.txt:
* platform/glib/fast/css/getComputedStyle/computed-style-font-family-expected.txt: Removed.
* platform/glib/fast/css/getComputedStyle/computed-style-without-renderer-expected.txt:
* platform/glib/svg/css/getComputedStyle-basic-expected.txt:
* platform/ios/fast/css/getComputedStyle/computed-style-expected.txt:
* platform/ios/fast/css/getComputedStyle/computed-style-font-family-expected.txt: Removed.
* platform/ios/fast/css/getComputedStyle/computed-style-without-renderer-expected.txt:
* platform/ios/imported/w3c/web-platform-tests/css/css-cascade/all-prop-initial-xml-expected.txt:
* platform/ios/svg/css/getComputedStyle-basic-expected.txt:
* platform/mac/fast/css/getComputedStyle/computed-style-expected.txt:
* platform/mac/fast/css/getComputedStyle/computed-style-font-family-expected.txt: Removed.
* platform/mac/fast/css/getComputedStyle/computed-style-without-renderer-expected.txt:
* platform/mac/svg/css/getComputedStyle-basic-expected.txt:
* svg/css/getComputedStyle-basic-expected.txt:

Modified Paths

Removed Paths

Diff

Modified: trunk/LayoutTests/ChangeLog (287433 => 287434)


--- trunk/LayoutTests/ChangeLog	2021-12-24 21:59:50 UTC (rev 287433)
+++ trunk/LayoutTests/ChangeLog	2021-12-25 02:03:22 UTC (rev 287434)
@@ -1,5 +1,33 @@
 2021-12-24  Tim Nguyen  <[email protected]>
 
+        Internally unprefix -webkit-font-kerning CSS property
+        https://bugs.webkit.org/show_bug.cgi?id=234673
+
+        Reviewed by Myles C. Maxfield.
+
+        Same to what was done in bug 234602 for text-emphasis CSS properties.
+
+        * fast/css/getComputedStyle/computed-style-expected.txt:
+        * fast/css/getComputedStyle/computed-style-font-family-expected.txt:
+        * fast/css/getComputedStyle/computed-style-without-renderer-expected.txt:
+        * fast/css/getComputedStyle/resources/property-names.js:
+        * platform/glib/fast/css/getComputedStyle/computed-style-expected.txt:
+        * platform/glib/fast/css/getComputedStyle/computed-style-font-family-expected.txt: Removed.
+        * platform/glib/fast/css/getComputedStyle/computed-style-without-renderer-expected.txt:
+        * platform/glib/svg/css/getComputedStyle-basic-expected.txt:
+        * platform/ios/fast/css/getComputedStyle/computed-style-expected.txt:
+        * platform/ios/fast/css/getComputedStyle/computed-style-font-family-expected.txt: Removed.
+        * platform/ios/fast/css/getComputedStyle/computed-style-without-renderer-expected.txt:
+        * platform/ios/imported/w3c/web-platform-tests/css/css-cascade/all-prop-initial-xml-expected.txt:
+        * platform/ios/svg/css/getComputedStyle-basic-expected.txt:
+        * platform/mac/fast/css/getComputedStyle/computed-style-expected.txt:
+        * platform/mac/fast/css/getComputedStyle/computed-style-font-family-expected.txt: Removed.
+        * platform/mac/fast/css/getComputedStyle/computed-style-without-renderer-expected.txt:
+        * platform/mac/svg/css/getComputedStyle-basic-expected.txt:
+        * svg/css/getComputedStyle-basic-expected.txt:
+
+2021-12-24  Tim Nguyen  <[email protected]>
+
         Remove non-standard -webkit-background-composite CSS property
         https://bugs.webkit.org/show_bug.cgi?id=234661
 

Modified: trunk/LayoutTests/fast/css/getComputedStyle/computed-style-expected.txt (287433 => 287434)


--- trunk/LayoutTests/fast/css/getComputedStyle/computed-style-expected.txt	2021-12-24 21:59:50 UTC (rev 287433)
+++ trunk/LayoutTests/fast/css/getComputedStyle/computed-style-expected.txt	2021-12-25 02:03:22 UTC (rev 287434)
@@ -75,6 +75,7 @@
 float: none;
 flood-color: rgb(0, 0, 0);
 flood-opacity: 1;
+font-kerning: auto;
 font-size: 16px;
 font-style: normal;
 font-synthesis: weight style small-caps;
@@ -167,6 +168,9 @@
 text-align: start;
 text-anchor: start;
 text-decoration: none;
+text-emphasis-color: rgb(0, 0, 0);
+text-emphasis-position: over right;
+text-emphasis-style: none;
 text-indent: 0px;
 text-overflow: clip;
 text-rendering: auto;
@@ -215,7 +219,6 @@
 -webkit-column-break-after: auto;
 -webkit-column-break-before: auto;
 -webkit-column-break-inside: auto;
--webkit-font-kerning: auto;
 -webkit-font-smoothing: auto;
 -webkit-hyphenate-character: auto;
 -webkit-hyphenate-limit-after: auto;

Modified: trunk/LayoutTests/fast/css/getComputedStyle/computed-style-font-family-expected.txt (287433 => 287434)


--- trunk/LayoutTests/fast/css/getComputedStyle/computed-style-font-family-expected.txt	2021-12-24 21:59:50 UTC (rev 287433)
+++ trunk/LayoutTests/fast/css/getComputedStyle/computed-style-font-family-expected.txt	2021-12-25 02:03:22 UTC (rev 287434)
@@ -2,6 +2,9 @@
 
 font-family: monospace, "Lucida Grande", sans-serif;
 font-feature-settings: normal;
+font-kerning: auto;
+font-optical-sizing: auto;
+font-palette: normal;
 font-size: 16px;
 font-stretch: normal;
 font-style: normal;

Modified: trunk/LayoutTests/fast/css/getComputedStyle/computed-style-without-renderer-expected.txt (287433 => 287434)


--- trunk/LayoutTests/fast/css/getComputedStyle/computed-style-without-renderer-expected.txt	2021-12-24 21:59:50 UTC (rev 287433)
+++ trunk/LayoutTests/fast/css/getComputedStyle/computed-style-without-renderer-expected.txt	2021-12-25 02:03:22 UTC (rev 287434)
@@ -74,6 +74,7 @@
 float: none
 flood-color: rgb(0, 0, 0)
 flood-opacity: 1
+font-kerning: auto
 font-size: 16px
 font-style: normal
 font-synthesis: weight style small-caps
@@ -166,6 +167,9 @@
 text-align: start
 text-anchor: start
 text-decoration: none
+text-emphasis-color: rgb(0, 0, 0)
+text-emphasis-position: over right
+text-emphasis-style: none
 text-indent: 0px
 text-overflow: clip
 text-rendering: auto
@@ -214,7 +218,6 @@
 -webkit-column-break-after: auto
 -webkit-column-break-before: auto
 -webkit-column-break-inside: auto
--webkit-font-kerning: auto
 -webkit-font-smoothing: auto
 -webkit-hyphenate-character: auto
 -webkit-hyphenate-limit-after: auto

Modified: trunk/LayoutTests/fast/css/getComputedStyle/resources/property-names.js (287433 => 287434)


--- trunk/LayoutTests/fast/css/getComputedStyle/resources/property-names.js	2021-12-24 21:59:50 UTC (rev 287433)
+++ trunk/LayoutTests/fast/css/getComputedStyle/resources/property-names.js	2021-12-25 02:03:22 UTC (rev 287434)
@@ -50,7 +50,7 @@
     "flex-grow": true,
     "flex-shrink": true,
     "flex-wrap": true,
-    "-webkit-font-kerning": true,
+    "font-kerning": true,
     "-webkit-font-smoothing": true,
     "grid-auto-columns": true,
     "grid-auto-flow": true,
@@ -99,9 +99,9 @@
     "-webkit-rtl-ordering": true,
     "-webkit-text-combine": true,
     "-webkit-text-decorations-in-effect": true,
-    "-webkit-text-emphasis-color": true,
-    "-webkit-text-emphasis-position": true,
-    "-webkit-text-emphasis-style": true,
+    "text-emphasis-color": true,
+    "text-emphasis-position": true,
+    "text-emphasis-style": true,
     "-webkit-text-fill-color": true,
     "-webkit-text-orientation": true,
     "-webkit-text-security": true,

Modified: trunk/LayoutTests/imported/w3c/ChangeLog (287433 => 287434)


--- trunk/LayoutTests/imported/w3c/ChangeLog	2021-12-24 21:59:50 UTC (rev 287433)
+++ trunk/LayoutTests/imported/w3c/ChangeLog	2021-12-25 02:03:22 UTC (rev 287434)
@@ -1,5 +1,16 @@
 2021-12-24  Tim Nguyen  <[email protected]>
 
+        Internally unprefix -webkit-font-kerning CSS property
+        https://bugs.webkit.org/show_bug.cgi?id=234673
+
+        Reviewed by Myles C. Maxfield.
+
+        Same to what was done in bug 234602 for text-emphasis CSS properties.
+
+        * web-platform-tests/css/css-cascade/all-prop-initial-xml-expected.txt:
+
+2021-12-24  Tim Nguyen  <[email protected]>
+
         Remove non-standard -webkit-background-composite CSS property
         https://bugs.webkit.org/show_bug.cgi?id=234661
 

Modified: trunk/LayoutTests/imported/w3c/web-platform-tests/css/css-cascade/all-prop-initial-xml-expected.txt (287433 => 287434)


--- trunk/LayoutTests/imported/w3c/web-platform-tests/css/css-cascade/all-prop-initial-xml-expected.txt	2021-12-24 21:59:50 UTC (rev 287433)
+++ trunk/LayoutTests/imported/w3c/web-platform-tests/css/css-cascade/all-prop-initial-xml-expected.txt	2021-12-25 02:03:22 UTC (rev 287434)
@@ -120,6 +120,7 @@
 PASS flood-opacity
 PASS font-family
 PASS font-feature-settings
+PASS font-kerning
 PASS font-optical-sizing
 PASS font-palette
 PASS font-size
@@ -355,7 +356,6 @@
 PASS -webkit-column-break-inside
 PASS -webkit-column-progression
 PASS -webkit-cursor-visibility
-PASS -webkit-font-kerning
 PASS -webkit-font-smoothing
 PASS -webkit-hyphenate-character
 PASS -webkit-hyphenate-limit-after

Modified: trunk/LayoutTests/platform/glib/fast/css/getComputedStyle/computed-style-expected.txt (287433 => 287434)


--- trunk/LayoutTests/platform/glib/fast/css/getComputedStyle/computed-style-expected.txt	2021-12-24 21:59:50 UTC (rev 287433)
+++ trunk/LayoutTests/platform/glib/fast/css/getComputedStyle/computed-style-expected.txt	2021-12-25 02:03:22 UTC (rev 287434)
@@ -75,6 +75,7 @@
 float: none;
 flood-color: rgb(0, 0, 0);
 flood-opacity: 1;
+font-kerning: auto;
 font-optical-sizing: auto;
 font-size: 16px;
 font-style: normal;
@@ -171,6 +172,9 @@
 text-align: start;
 text-anchor: start;
 text-decoration: none;
+text-emphasis-color: rgb(0, 0, 0);
+text-emphasis-position: over right;
+text-emphasis-style: none;
 text-indent: 0px;
 text-overflow: clip;
 text-rendering: auto;
@@ -218,7 +222,6 @@
 -webkit-column-break-after: auto;
 -webkit-column-break-before: auto;
 -webkit-column-break-inside: auto;
--webkit-font-kerning: auto;
 -webkit-font-smoothing: auto;
 -webkit-hyphenate-character: auto;
 -webkit-hyphenate-limit-after: auto;

Deleted: trunk/LayoutTests/platform/glib/fast/css/getComputedStyle/computed-style-font-family-expected.txt (287433 => 287434)


--- trunk/LayoutTests/platform/glib/fast/css/getComputedStyle/computed-style-font-family-expected.txt	2021-12-24 21:59:50 UTC (rev 287433)
+++ trunk/LayoutTests/platform/glib/fast/css/getComputedStyle/computed-style-font-family-expected.txt	2021-12-25 02:03:22 UTC (rev 287434)
@@ -1,18 +0,0 @@
-Font attributes. The font-family should list three families:
-
-font-family: monospace, "Lucida Grande", sans-serif;
-font-feature-settings: normal;
-font-optical-sizing: auto;
-font-palette: normal;
-font-size: 16px;
-font-stretch: normal;
-font-style: normal;
-font-synthesis: weight style small-caps;
-font-variant-alternates: normal;
-font-variant-caps: normal;
-font-variant-east-asian: normal;
-font-variant-ligatures: normal;
-font-variant-numeric: normal;
-font-variant-position: normal;
-font-weight: 400;
-

Modified: trunk/LayoutTests/platform/glib/fast/css/getComputedStyle/computed-style-without-renderer-expected.txt (287433 => 287434)


--- trunk/LayoutTests/platform/glib/fast/css/getComputedStyle/computed-style-without-renderer-expected.txt	2021-12-24 21:59:50 UTC (rev 287433)
+++ trunk/LayoutTests/platform/glib/fast/css/getComputedStyle/computed-style-without-renderer-expected.txt	2021-12-25 02:03:22 UTC (rev 287434)
@@ -74,6 +74,7 @@
 float: none
 flood-color: rgb(0, 0, 0)
 flood-opacity: 1
+font-kerning: auto
 font-optical-sizing: auto
 font-size: 16px
 font-style: normal
@@ -170,6 +171,9 @@
 text-align: start
 text-anchor: start
 text-decoration: none
+text-emphasis-color: rgb(0, 0, 0)
+text-emphasis-position: over right
+text-emphasis-style: none
 text-indent: 0px
 text-overflow: clip
 text-rendering: auto
@@ -217,7 +221,6 @@
 -webkit-column-break-after: auto
 -webkit-column-break-before: auto
 -webkit-column-break-inside: auto
--webkit-font-kerning: auto
 -webkit-font-smoothing: auto
 -webkit-hyphenate-character: auto
 -webkit-hyphenate-limit-after: auto

Modified: trunk/LayoutTests/platform/glib/svg/css/getComputedStyle-basic-expected.txt (287433 => 287434)


--- trunk/LayoutTests/platform/glib/svg/css/getComputedStyle-basic-expected.txt	2021-12-24 21:59:50 UTC (rev 287433)
+++ trunk/LayoutTests/platform/glib/svg/css/getComputedStyle-basic-expected.txt	2021-12-25 02:03:22 UTC (rev 287434)
@@ -148,6 +148,8 @@
 rect: style.getPropertyCSSValue(flood-color) : [object CSSPrimitiveValue]
 rect: style.getPropertyValue(flood-opacity) : 1
 rect: style.getPropertyCSSValue(flood-opacity) : [object CSSPrimitiveValue]
+rect: style.getPropertyValue(font-kerning) : auto
+rect: style.getPropertyCSSValue(font-kerning) : [object CSSPrimitiveValue]
 rect: style.getPropertyValue(font-optical-sizing) : auto
 rect: style.getPropertyCSSValue(font-optical-sizing) : [object CSSPrimitiveValue]
 rect: style.getPropertyValue(font-size) : 16px
@@ -340,6 +342,12 @@
 rect: style.getPropertyCSSValue(text-anchor) : [object CSSPrimitiveValue]
 rect: style.getPropertyValue(text-decoration) : none
 rect: style.getPropertyCSSValue(text-decoration) : [object CSSPrimitiveValue]
+rect: style.getPropertyValue(text-emphasis-color) : rgb(0, 0, 0)
+rect: style.getPropertyCSSValue(text-emphasis-color) : [object CSSPrimitiveValue]
+rect: style.getPropertyValue(text-emphasis-position) : over right
+rect: style.getPropertyCSSValue(text-emphasis-position) : [object CSSValueList]
+rect: style.getPropertyValue(text-emphasis-style) : none
+rect: style.getPropertyCSSValue(text-emphasis-style) : [object CSSPrimitiveValue]
 rect: style.getPropertyValue(text-indent) : 0px
 rect: style.getPropertyCSSValue(text-indent) : [object CSSPrimitiveValue]
 rect: style.getPropertyValue(text-overflow) : clip
@@ -434,8 +442,6 @@
 rect: style.getPropertyCSSValue(-webkit-column-break-before) : [object CSSPrimitiveValue]
 rect: style.getPropertyValue(-webkit-column-break-inside) : auto
 rect: style.getPropertyCSSValue(-webkit-column-break-inside) : [object CSSPrimitiveValue]
-rect: style.getPropertyValue(-webkit-font-kerning) : auto
-rect: style.getPropertyCSSValue(-webkit-font-kerning) : [object CSSPrimitiveValue]
 rect: style.getPropertyValue(-webkit-font-smoothing) : auto
 rect: style.getPropertyCSSValue(-webkit-font-smoothing) : [object CSSPrimitiveValue]
 rect: style.getPropertyValue(-webkit-hyphenate-character) : auto
@@ -652,6 +658,8 @@
 g: style.getPropertyCSSValue(flood-color) : [object CSSPrimitiveValue]
 g: style.getPropertyValue(flood-opacity) : 1
 g: style.getPropertyCSSValue(flood-opacity) : [object CSSPrimitiveValue]
+g: style.getPropertyValue(font-kerning) : auto
+g: style.getPropertyCSSValue(font-kerning) : [object CSSPrimitiveValue]
 g: style.getPropertyValue(font-optical-sizing) : auto
 g: style.getPropertyCSSValue(font-optical-sizing) : [object CSSPrimitiveValue]
 g: style.getPropertyValue(font-size) : 16px
@@ -844,6 +852,12 @@
 g: style.getPropertyCSSValue(text-anchor) : [object CSSPrimitiveValue]
 g: style.getPropertyValue(text-decoration) : none
 g: style.getPropertyCSSValue(text-decoration) : [object CSSPrimitiveValue]
+g: style.getPropertyValue(text-emphasis-color) : rgb(0, 0, 0)
+g: style.getPropertyCSSValue(text-emphasis-color) : [object CSSPrimitiveValue]
+g: style.getPropertyValue(text-emphasis-position) : over right
+g: style.getPropertyCSSValue(text-emphasis-position) : [object CSSValueList]
+g: style.getPropertyValue(text-emphasis-style) : none
+g: style.getPropertyCSSValue(text-emphasis-style) : [object CSSPrimitiveValue]
 g: style.getPropertyValue(text-indent) : 0px
 g: style.getPropertyCSSValue(text-indent) : [object CSSPrimitiveValue]
 g: style.getPropertyValue(text-overflow) : clip
@@ -938,8 +952,6 @@
 g: style.getPropertyCSSValue(-webkit-column-break-before) : [object CSSPrimitiveValue]
 g: style.getPropertyValue(-webkit-column-break-inside) : auto
 g: style.getPropertyCSSValue(-webkit-column-break-inside) : [object CSSPrimitiveValue]
-g: style.getPropertyValue(-webkit-font-kerning) : auto
-g: style.getPropertyCSSValue(-webkit-font-kerning) : [object CSSPrimitiveValue]
 g: style.getPropertyValue(-webkit-font-smoothing) : auto
 g: style.getPropertyCSSValue(-webkit-font-smoothing) : [object CSSPrimitiveValue]
 g: style.getPropertyValue(-webkit-hyphenate-character) : auto

Modified: trunk/LayoutTests/platform/ios/fast/css/getComputedStyle/computed-style-expected.txt (287433 => 287434)


--- trunk/LayoutTests/platform/ios/fast/css/getComputedStyle/computed-style-expected.txt	2021-12-24 21:59:50 UTC (rev 287433)
+++ trunk/LayoutTests/platform/ios/fast/css/getComputedStyle/computed-style-expected.txt	2021-12-25 02:03:22 UTC (rev 287434)
@@ -75,6 +75,7 @@
 float: none;
 flood-color: rgb(0, 0, 0);
 flood-opacity: 1;
+font-kerning: auto;
 font-optical-sizing: auto;
 font-size: 16px;
 font-style: normal;
@@ -171,6 +172,9 @@
 text-align: start;
 text-anchor: start;
 text-decoration: none;
+text-emphasis-color: rgb(0, 0, 0);
+text-emphasis-position: over right;
+text-emphasis-style: none;
 text-indent: 0px;
 text-overflow: clip;
 text-rendering: auto;
@@ -218,7 +222,6 @@
 -webkit-column-break-after: auto;
 -webkit-column-break-before: auto;
 -webkit-column-break-inside: auto;
--webkit-font-kerning: auto;
 -webkit-font-smoothing: auto;
 -webkit-hyphenate-character: auto;
 -webkit-hyphenate-limit-after: auto;

Deleted: trunk/LayoutTests/platform/ios/fast/css/getComputedStyle/computed-style-font-family-expected.txt (287433 => 287434)


--- trunk/LayoutTests/platform/ios/fast/css/getComputedStyle/computed-style-font-family-expected.txt	2021-12-24 21:59:50 UTC (rev 287433)
+++ trunk/LayoutTests/platform/ios/fast/css/getComputedStyle/computed-style-font-family-expected.txt	2021-12-25 02:03:22 UTC (rev 287434)
@@ -1,18 +0,0 @@
-Font attributes. The font-family should list three families:
-
-font-family: monospace, "Lucida Grande", sans-serif;
-font-feature-settings: normal;
-font-optical-sizing: auto;
-font-palette: normal;
-font-size: 16px;
-font-stretch: normal;
-font-style: normal;
-font-synthesis: weight style small-caps;
-font-variant-alternates: normal;
-font-variant-caps: normal;
-font-variant-east-asian: normal;
-font-variant-ligatures: normal;
-font-variant-numeric: normal;
-font-variant-position: normal;
-font-weight: 400;
-

Modified: trunk/LayoutTests/platform/ios/fast/css/getComputedStyle/computed-style-without-renderer-expected.txt (287433 => 287434)


--- trunk/LayoutTests/platform/ios/fast/css/getComputedStyle/computed-style-without-renderer-expected.txt	2021-12-24 21:59:50 UTC (rev 287433)
+++ trunk/LayoutTests/platform/ios/fast/css/getComputedStyle/computed-style-without-renderer-expected.txt	2021-12-25 02:03:22 UTC (rev 287434)
@@ -74,6 +74,7 @@
 float: none
 flood-color: rgb(0, 0, 0)
 flood-opacity: 1
+font-kerning: auto
 font-optical-sizing: auto
 font-size: 16px
 font-style: normal
@@ -170,6 +171,9 @@
 text-align: start
 text-anchor: start
 text-decoration: none
+text-emphasis-color: rgb(0, 0, 0)
+text-emphasis-position: over right
+text-emphasis-style: none
 text-indent: 0px
 text-overflow: clip
 text-rendering: auto
@@ -217,7 +221,6 @@
 -webkit-column-break-after: auto
 -webkit-column-break-before: auto
 -webkit-column-break-inside: auto
--webkit-font-kerning: auto
 -webkit-font-smoothing: auto
 -webkit-hyphenate-character: auto
 -webkit-hyphenate-limit-after: auto

Modified: trunk/LayoutTests/platform/ios/imported/w3c/web-platform-tests/css/css-cascade/all-prop-initial-xml-expected.txt (287433 => 287434)


--- trunk/LayoutTests/platform/ios/imported/w3c/web-platform-tests/css/css-cascade/all-prop-initial-xml-expected.txt	2021-12-24 21:59:50 UTC (rev 287433)
+++ trunk/LayoutTests/platform/ios/imported/w3c/web-platform-tests/css/css-cascade/all-prop-initial-xml-expected.txt	2021-12-25 02:03:22 UTC (rev 287434)
@@ -112,6 +112,7 @@
 PASS flood-opacity
 PASS font-family
 PASS font-feature-settings
+PASS font-kerning
 PASS font-optical-sizing
 PASS font-size
 PASS font-stretch
@@ -327,7 +328,6 @@
 PASS -webkit-column-break-inside
 PASS -webkit-column-progression
 PASS -webkit-cursor-visibility
-PASS -webkit-font-kerning
 PASS -webkit-font-smoothing
 PASS -webkit-hyphenate-character
 PASS -webkit-hyphenate-limit-after

Modified: trunk/LayoutTests/platform/ios/svg/css/getComputedStyle-basic-expected.txt (287433 => 287434)


--- trunk/LayoutTests/platform/ios/svg/css/getComputedStyle-basic-expected.txt	2021-12-24 21:59:50 UTC (rev 287433)
+++ trunk/LayoutTests/platform/ios/svg/css/getComputedStyle-basic-expected.txt	2021-12-25 02:03:22 UTC (rev 287434)
@@ -148,6 +148,8 @@
 rect: style.getPropertyCSSValue(flood-color) : [object CSSPrimitiveValue]
 rect: style.getPropertyValue(flood-opacity) : 1
 rect: style.getPropertyCSSValue(flood-opacity) : [object CSSPrimitiveValue]
+rect: style.getPropertyValue(font-kerning) : auto
+rect: style.getPropertyCSSValue(font-kerning) : [object CSSPrimitiveValue]
 rect: style.getPropertyValue(font-optical-sizing) : auto
 rect: style.getPropertyCSSValue(font-optical-sizing) : [object CSSPrimitiveValue]
 rect: style.getPropertyValue(font-size) : 16px
@@ -340,6 +342,12 @@
 rect: style.getPropertyCSSValue(text-anchor) : [object CSSPrimitiveValue]
 rect: style.getPropertyValue(text-decoration) : none
 rect: style.getPropertyCSSValue(text-decoration) : [object CSSPrimitiveValue]
+rect: style.getPropertyValue(text-emphasis-color) : rgb(0, 0, 0)
+rect: style.getPropertyCSSValue(text-emphasis-color) : [object CSSPrimitiveValue]
+rect: style.getPropertyValue(text-emphasis-position) : over right
+rect: style.getPropertyCSSValue(text-emphasis-position) : [object CSSValueList]
+rect: style.getPropertyValue(text-emphasis-style) : none
+rect: style.getPropertyCSSValue(text-emphasis-style) : [object CSSPrimitiveValue]
 rect: style.getPropertyValue(text-indent) : 0px
 rect: style.getPropertyCSSValue(text-indent) : [object CSSPrimitiveValue]
 rect: style.getPropertyValue(text-overflow) : clip
@@ -434,8 +442,6 @@
 rect: style.getPropertyCSSValue(-webkit-column-break-before) : [object CSSPrimitiveValue]
 rect: style.getPropertyValue(-webkit-column-break-inside) : auto
 rect: style.getPropertyCSSValue(-webkit-column-break-inside) : [object CSSPrimitiveValue]
-rect: style.getPropertyValue(-webkit-font-kerning) : auto
-rect: style.getPropertyCSSValue(-webkit-font-kerning) : [object CSSPrimitiveValue]
 rect: style.getPropertyValue(-webkit-font-smoothing) : auto
 rect: style.getPropertyCSSValue(-webkit-font-smoothing) : [object CSSPrimitiveValue]
 rect: style.getPropertyValue(-webkit-hyphenate-character) : auto
@@ -652,6 +658,8 @@
 g: style.getPropertyCSSValue(flood-color) : [object CSSPrimitiveValue]
 g: style.getPropertyValue(flood-opacity) : 1
 g: style.getPropertyCSSValue(flood-opacity) : [object CSSPrimitiveValue]
+g: style.getPropertyValue(font-kerning) : auto
+g: style.getPropertyCSSValue(font-kerning) : [object CSSPrimitiveValue]
 g: style.getPropertyValue(font-optical-sizing) : auto
 g: style.getPropertyCSSValue(font-optical-sizing) : [object CSSPrimitiveValue]
 g: style.getPropertyValue(font-size) : 16px
@@ -844,6 +852,12 @@
 g: style.getPropertyCSSValue(text-anchor) : [object CSSPrimitiveValue]
 g: style.getPropertyValue(text-decoration) : none
 g: style.getPropertyCSSValue(text-decoration) : [object CSSPrimitiveValue]
+g: style.getPropertyValue(text-emphasis-color) : rgb(0, 0, 0)
+g: style.getPropertyCSSValue(text-emphasis-color) : [object CSSPrimitiveValue]
+g: style.getPropertyValue(text-emphasis-position) : over right
+g: style.getPropertyCSSValue(text-emphasis-position) : [object CSSValueList]
+g: style.getPropertyValue(text-emphasis-style) : none
+g: style.getPropertyCSSValue(text-emphasis-style) : [object CSSPrimitiveValue]
 g: style.getPropertyValue(text-indent) : 0px
 g: style.getPropertyCSSValue(text-indent) : [object CSSPrimitiveValue]
 g: style.getPropertyValue(text-overflow) : clip
@@ -938,8 +952,6 @@
 g: style.getPropertyCSSValue(-webkit-column-break-before) : [object CSSPrimitiveValue]
 g: style.getPropertyValue(-webkit-column-break-inside) : auto
 g: style.getPropertyCSSValue(-webkit-column-break-inside) : [object CSSPrimitiveValue]
-g: style.getPropertyValue(-webkit-font-kerning) : auto
-g: style.getPropertyCSSValue(-webkit-font-kerning) : [object CSSPrimitiveValue]
 g: style.getPropertyValue(-webkit-font-smoothing) : auto
 g: style.getPropertyCSSValue(-webkit-font-smoothing) : [object CSSPrimitiveValue]
 g: style.getPropertyValue(-webkit-hyphenate-character) : auto

Modified: trunk/LayoutTests/platform/mac/fast/css/getComputedStyle/computed-style-expected.txt (287433 => 287434)


--- trunk/LayoutTests/platform/mac/fast/css/getComputedStyle/computed-style-expected.txt	2021-12-24 21:59:50 UTC (rev 287433)
+++ trunk/LayoutTests/platform/mac/fast/css/getComputedStyle/computed-style-expected.txt	2021-12-25 02:03:22 UTC (rev 287434)
@@ -75,6 +75,7 @@
 float: none;
 flood-color: rgb(0, 0, 0);
 flood-opacity: 1;
+font-kerning: auto;
 font-optical-sizing: auto;
 font-size: 16px;
 font-style: normal;
@@ -171,6 +172,9 @@
 text-align: start;
 text-anchor: start;
 text-decoration: none;
+text-emphasis-color: rgb(0, 0, 0);
+text-emphasis-position: over right;
+text-emphasis-style: none;
 text-indent: 0px;
 text-overflow: clip;
 text-rendering: auto;
@@ -218,7 +222,6 @@
 -webkit-column-break-after: auto;
 -webkit-column-break-before: auto;
 -webkit-column-break-inside: auto;
--webkit-font-kerning: auto;
 -webkit-font-smoothing: auto;
 -webkit-hyphenate-character: auto;
 -webkit-hyphenate-limit-after: auto;

Deleted: trunk/LayoutTests/platform/mac/fast/css/getComputedStyle/computed-style-font-family-expected.txt (287433 => 287434)


--- trunk/LayoutTests/platform/mac/fast/css/getComputedStyle/computed-style-font-family-expected.txt	2021-12-24 21:59:50 UTC (rev 287433)
+++ trunk/LayoutTests/platform/mac/fast/css/getComputedStyle/computed-style-font-family-expected.txt	2021-12-25 02:03:22 UTC (rev 287434)
@@ -1,18 +0,0 @@
-Font attributes. The font-family should list three families:
-
-font-family: monospace, "Lucida Grande", sans-serif;
-font-feature-settings: normal;
-font-optical-sizing: auto;
-font-palette: normal;
-font-size: 16px;
-font-stretch: normal;
-font-style: normal;
-font-synthesis: weight style small-caps;
-font-variant-alternates: normal;
-font-variant-caps: normal;
-font-variant-east-asian: normal;
-font-variant-ligatures: normal;
-font-variant-numeric: normal;
-font-variant-position: normal;
-font-weight: 400;
-

Modified: trunk/LayoutTests/platform/mac/fast/css/getComputedStyle/computed-style-without-renderer-expected.txt (287433 => 287434)


--- trunk/LayoutTests/platform/mac/fast/css/getComputedStyle/computed-style-without-renderer-expected.txt	2021-12-24 21:59:50 UTC (rev 287433)
+++ trunk/LayoutTests/platform/mac/fast/css/getComputedStyle/computed-style-without-renderer-expected.txt	2021-12-25 02:03:22 UTC (rev 287434)
@@ -74,6 +74,7 @@
 float: none
 flood-color: rgb(0, 0, 0)
 flood-opacity: 1
+font-kerning: auto
 font-optical-sizing: auto
 font-size: 16px
 font-style: normal
@@ -170,6 +171,9 @@
 text-align: start
 text-anchor: start
 text-decoration: none
+text-emphasis-color: rgb(0, 0, 0)
+text-emphasis-position: over right
+text-emphasis-style: none
 text-indent: 0px
 text-overflow: clip
 text-rendering: auto
@@ -217,7 +221,6 @@
 -webkit-column-break-after: auto
 -webkit-column-break-before: auto
 -webkit-column-break-inside: auto
--webkit-font-kerning: auto
 -webkit-font-smoothing: auto
 -webkit-hyphenate-character: auto
 -webkit-hyphenate-limit-after: auto

Modified: trunk/LayoutTests/platform/mac/svg/css/getComputedStyle-basic-expected.txt (287433 => 287434)


--- trunk/LayoutTests/platform/mac/svg/css/getComputedStyle-basic-expected.txt	2021-12-24 21:59:50 UTC (rev 287433)
+++ trunk/LayoutTests/platform/mac/svg/css/getComputedStyle-basic-expected.txt	2021-12-25 02:03:22 UTC (rev 287434)
@@ -148,6 +148,8 @@
 rect: style.getPropertyCSSValue(flood-color) : [object CSSPrimitiveValue]
 rect: style.getPropertyValue(flood-opacity) : 1
 rect: style.getPropertyCSSValue(flood-opacity) : [object CSSPrimitiveValue]
+rect: style.getPropertyValue(font-kerning) : auto
+rect: style.getPropertyCSSValue(font-kerning) : [object CSSPrimitiveValue]
 rect: style.getPropertyValue(font-optical-sizing) : auto
 rect: style.getPropertyCSSValue(font-optical-sizing) : [object CSSPrimitiveValue]
 rect: style.getPropertyValue(font-size) : 16px
@@ -340,6 +342,12 @@
 rect: style.getPropertyCSSValue(text-anchor) : [object CSSPrimitiveValue]
 rect: style.getPropertyValue(text-decoration) : none
 rect: style.getPropertyCSSValue(text-decoration) : [object CSSPrimitiveValue]
+rect: style.getPropertyValue(text-emphasis-color) : rgb(0, 0, 0)
+rect: style.getPropertyCSSValue(text-emphasis-color) : [object CSSPrimitiveValue]
+rect: style.getPropertyValue(text-emphasis-position) : over right
+rect: style.getPropertyCSSValue(text-emphasis-position) : [object CSSValueList]
+rect: style.getPropertyValue(text-emphasis-style) : none
+rect: style.getPropertyCSSValue(text-emphasis-style) : [object CSSPrimitiveValue]
 rect: style.getPropertyValue(text-indent) : 0px
 rect: style.getPropertyCSSValue(text-indent) : [object CSSPrimitiveValue]
 rect: style.getPropertyValue(text-overflow) : clip
@@ -434,8 +442,6 @@
 rect: style.getPropertyCSSValue(-webkit-column-break-before) : [object CSSPrimitiveValue]
 rect: style.getPropertyValue(-webkit-column-break-inside) : auto
 rect: style.getPropertyCSSValue(-webkit-column-break-inside) : [object CSSPrimitiveValue]
-rect: style.getPropertyValue(-webkit-font-kerning) : auto
-rect: style.getPropertyCSSValue(-webkit-font-kerning) : [object CSSPrimitiveValue]
 rect: style.getPropertyValue(-webkit-font-smoothing) : auto
 rect: style.getPropertyCSSValue(-webkit-font-smoothing) : [object CSSPrimitiveValue]
 rect: style.getPropertyValue(-webkit-hyphenate-character) : auto
@@ -652,6 +658,8 @@
 g: style.getPropertyCSSValue(flood-color) : [object CSSPrimitiveValue]
 g: style.getPropertyValue(flood-opacity) : 1
 g: style.getPropertyCSSValue(flood-opacity) : [object CSSPrimitiveValue]
+g: style.getPropertyValue(font-kerning) : auto
+g: style.getPropertyCSSValue(font-kerning) : [object CSSPrimitiveValue]
 g: style.getPropertyValue(font-optical-sizing) : auto
 g: style.getPropertyCSSValue(font-optical-sizing) : [object CSSPrimitiveValue]
 g: style.getPropertyValue(font-size) : 16px
@@ -844,6 +852,12 @@
 g: style.getPropertyCSSValue(text-anchor) : [object CSSPrimitiveValue]
 g: style.getPropertyValue(text-decoration) : none
 g: style.getPropertyCSSValue(text-decoration) : [object CSSPrimitiveValue]
+g: style.getPropertyValue(text-emphasis-color) : rgb(0, 0, 0)
+g: style.getPropertyCSSValue(text-emphasis-color) : [object CSSPrimitiveValue]
+g: style.getPropertyValue(text-emphasis-position) : over right
+g: style.getPropertyCSSValue(text-emphasis-position) : [object CSSValueList]
+g: style.getPropertyValue(text-emphasis-style) : none
+g: style.getPropertyCSSValue(text-emphasis-style) : [object CSSPrimitiveValue]
 g: style.getPropertyValue(text-indent) : 0px
 g: style.getPropertyCSSValue(text-indent) : [object CSSPrimitiveValue]
 g: style.getPropertyValue(text-overflow) : clip
@@ -938,8 +952,6 @@
 g: style.getPropertyCSSValue(-webkit-column-break-before) : [object CSSPrimitiveValue]
 g: style.getPropertyValue(-webkit-column-break-inside) : auto
 g: style.getPropertyCSSValue(-webkit-column-break-inside) : [object CSSPrimitiveValue]
-g: style.getPropertyValue(-webkit-font-kerning) : auto
-g: style.getPropertyCSSValue(-webkit-font-kerning) : [object CSSPrimitiveValue]
 g: style.getPropertyValue(-webkit-font-smoothing) : auto
 g: style.getPropertyCSSValue(-webkit-font-smoothing) : [object CSSPrimitiveValue]
 g: style.getPropertyValue(-webkit-hyphenate-character) : auto

Modified: trunk/LayoutTests/svg/css/getComputedStyle-basic-expected.txt (287433 => 287434)


--- trunk/LayoutTests/svg/css/getComputedStyle-basic-expected.txt	2021-12-24 21:59:50 UTC (rev 287433)
+++ trunk/LayoutTests/svg/css/getComputedStyle-basic-expected.txt	2021-12-25 02:03:22 UTC (rev 287434)
@@ -428,8 +428,6 @@
 rect: style.getPropertyCSSValue(-webkit-column-break-before) : [object CSSPrimitiveValue]
 rect: style.getPropertyValue(-webkit-column-break-inside) : auto
 rect: style.getPropertyCSSValue(-webkit-column-break-inside) : [object CSSPrimitiveValue]
-rect: style.getPropertyValue(-webkit-font-kerning) : auto
-rect: style.getPropertyCSSValue(-webkit-font-kerning) : [object CSSPrimitiveValue]
 rect: style.getPropertyValue(-webkit-font-smoothing) : auto
 rect: style.getPropertyCSSValue(-webkit-font-smoothing) : [object CSSPrimitiveValue]
 rect: style.getPropertyValue(-webkit-hyphenate-character) : auto
@@ -944,8 +942,6 @@
 g: style.getPropertyCSSValue(-webkit-column-break-before) : [object CSSPrimitiveValue]
 g: style.getPropertyValue(-webkit-column-break-inside) : auto
 g: style.getPropertyCSSValue(-webkit-column-break-inside) : [object CSSPrimitiveValue]
-g: style.getPropertyValue(-webkit-font-kerning) : auto
-g: style.getPropertyCSSValue(-webkit-font-kerning) : [object CSSPrimitiveValue]
 g: style.getPropertyValue(-webkit-font-smoothing) : auto
 g: style.getPropertyCSSValue(-webkit-font-smoothing) : [object CSSPrimitiveValue]
 g: style.getPropertyValue(-webkit-hyphenate-character) : auto

Modified: trunk/Source/WebCore/ChangeLog (287433 => 287434)


--- trunk/Source/WebCore/ChangeLog	2021-12-24 21:59:50 UTC (rev 287433)
+++ trunk/Source/WebCore/ChangeLog	2021-12-25 02:03:22 UTC (rev 287434)
@@ -1,5 +1,23 @@
 2021-12-24  Tim Nguyen  <[email protected]>
 
+        Internally unprefix -webkit-font-kerning CSS property
+        https://bugs.webkit.org/show_bug.cgi?id=234673
+
+        Reviewed by Myles C. Maxfield.
+
+        Same to what was done in bug 234602 for text-emphasis CSS properties.
+
+        * css/CSSComputedStyleDeclaration.cpp:
+        (WebCore::ComputedStyleExtractor::valueForPropertyInStyle):
+        * css/CSSProperties.json:
+        * css/parser/CSSParserFastPaths.cpp:
+        (WebCore::CSSParserFastPaths::isValidKeywordPropertyAndValue):
+        (WebCore::CSSParserFastPaths::isKeywordPropertyID):
+        * editing/cocoa/HTMLConverter.mm:
+        (HTMLConverter::computedAttributesForElement):
+
+2021-12-24  Tim Nguyen  <[email protected]>
+
         Remove non-standard -webkit-background-composite CSS property
         https://bugs.webkit.org/show_bug.cgi?id=234661
 

Modified: trunk/Source/WebCore/css/CSSComputedStyleDeclaration.cpp (287433 => 287434)


--- trunk/Source/WebCore/css/CSSComputedStyleDeclaration.cpp	2021-12-24 21:59:50 UTC (rev 287433)
+++ trunk/Source/WebCore/css/CSSComputedStyleDeclaration.cpp	2021-12-25 02:03:22 UTC (rev 287434)
@@ -3480,7 +3480,7 @@
             return cssValuePool.createValue(style.nbspMode());
         case CSSPropertyResize:
             return cssValuePool.createValue(style.resize());
-        case CSSPropertyWebkitFontKerning:
+        case CSSPropertyFontKerning:
             return cssValuePool.createValue(style.fontDescription().kerning());
         case CSSPropertyWebkitFontSmoothing:
             return cssValuePool.createValue(style.fontDescription().fontSmoothing());

Modified: trunk/Source/WebCore/css/CSSProperties.json (287433 => 287434)


--- trunk/Source/WebCore/css/CSSProperties.json	2021-12-24 21:59:50 UTC (rev 287433)
+++ trunk/Source/WebCore/css/CSSProperties.json	2021-12-25 02:03:22 UTC (rev 287434)
@@ -464,7 +464,7 @@
                 "url": "https://drafts.csswg.org/css-fonts-4/#font-variation-settings-def"
             }
         },
-        "-webkit-font-kerning": {
+        "font-kerning": {
             "inherited": true,
             "values": [
                 "auto",
@@ -473,7 +473,7 @@
             ],
             "codegen-properties": {
                 "aliases": [
-                    "font-kerning"
+                    "-webkit-font-kerning"
                 ],
                 "name-for-methods": "Kerning",
                 "font-property": true,

Modified: trunk/Source/WebCore/css/parser/CSSParserFastPaths.cpp (287433 => 287434)


--- trunk/Source/WebCore/css/parser/CSSParserFastPaths.cpp	2021-12-24 21:59:50 UTC (rev 287433)
+++ trunk/Source/WebCore/css/parser/CSSParserFastPaths.cpp	2021-12-25 02:03:22 UTC (rev 287434)
@@ -792,7 +792,7 @@
         return valueID == CSSValueNowrap || valueID == CSSValueWrap || valueID == CSSValueWrapReverse;
     case CSSPropertyWebkitHyphens:
         return valueID == CSSValueAuto || valueID == CSSValueNone || valueID == CSSValueManual;
-    case CSSPropertyWebkitFontKerning:
+    case CSSPropertyFontKerning:
         return valueID == CSSValueAuto || valueID == CSSValueNormal || valueID == CSSValueNone;
     case CSSPropertyWebkitFontSmoothing:
         return valueID == CSSValueAuto || valueID == CSSValueNone || valueID == CSSValueAntialiased || valueID == CSSValueSubpixelAntialiased;
@@ -928,6 +928,7 @@
     case CSSPropertyFlexDirection:
     case CSSPropertyFlexWrap:
     case CSSPropertyFloat:
+    case CSSPropertyFontKerning:
     case CSSPropertyFontVariantAlternates:
     case CSSPropertyFontVariantCaps:
     case CSSPropertyFontVariantPosition:
@@ -963,7 +964,6 @@
     case CSSPropertyWebkitBoxOrient:
     case CSSPropertyWebkitBoxPack:
     case CSSPropertyWebkitColumnAxis:
-    case CSSPropertyWebkitFontKerning:
     case CSSPropertyWebkitFontSmoothing:
     case CSSPropertyWebkitHyphens:
     case CSSPropertyWebkitLineAlign:
@@ -1009,13 +1009,11 @@
 
     // FIXME-NEWPARSER: Add the following unprefixed properties:
     // case CSSPropertyBackfaceVisibility:
-    // case CSSPropertyFontKerning:
     // case CSSPropertyHyphens:
     // case CSSPropertyOverflowAnchor:
     // case CSSPropertyScrollSnapType:
     // case CSSPropertyTextAlignLast:
     // case CSSPropertyTextCombineUpright:
-    // case CSSPropertyTextDecorationStyle:
     // case CSSPropertyTextJustify:
     // case CSSPropertyUserSelect:
 #if ENABLE(CSS_TRAILING_WORD)

Modified: trunk/Source/WebCore/editing/cocoa/HTMLConverter.mm (287433 => 287434)


--- trunk/Source/WebCore/editing/cocoa/HTMLConverter.mm	2021-12-24 21:59:50 UTC (rev 287433)
+++ trunk/Source/WebCore/editing/cocoa/HTMLConverter.mm	2021-12-25 02:03:22 UTC (rev 287434)
@@ -1013,7 +1013,7 @@
     if (strokeColor)
         [attrs setObject:strokeColor.get() forKey:NSStrokeColorAttributeName];
 
-    String fontKerning = _caches->propertyValueForNode(element, CSSPropertyWebkitFontKerning);
+    String fontKerning = _caches->propertyValueForNode(element, CSSPropertyFontKerning);
     String letterSpacing = _caches->propertyValueForNode(element, CSSPropertyLetterSpacing);
     if (fontKerning.length() || letterSpacing.length()) {
         if (fontKerning == "none")
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to