Diff
Modified: trunk/LayoutTests/ChangeLog (238001 => 238002)
--- trunk/LayoutTests/ChangeLog 2018-11-08 21:57:40 UTC (rev 238001)
+++ trunk/LayoutTests/ChangeLog 2018-11-08 22:18:15 UTC (rev 238002)
@@ -1,3 +1,13 @@
+2018-11-07 Myles C. Maxfield <[email protected]>
+
+ Unprefix text-decoration CSS3 properties
+ https://bugs.webkit.org/show_bug.cgi?id=127193
+
+ Reviewed by Dean Jackson.
+
+ * fast/css3-text/css3-text-decoration/unprefix-expected.html: Added.
+ * fast/css3-text/css3-text-decoration/unprefix.html: Added.
+
2018-11-08 Timothy Hatcher <[email protected]>
Add experimental support for a `supported-color-schemes` CSS property.
Added: trunk/LayoutTests/fast/css3-text/css3-text-decoration/unprefix-expected.html (0 => 238002)
--- trunk/LayoutTests/fast/css3-text/css3-text-decoration/unprefix-expected.html (rev 0)
+++ trunk/LayoutTests/fast/css3-text/css3-text-decoration/unprefix-expected.html 2018-11-08 22:18:15 UTC (rev 238002)
@@ -0,0 +1,13 @@
+<!DOCTYPE html>
+<html>
+<head>
+</head>
+<body>
+<div style="font-size: 48px;">
+<div style="-webkit-text-decoration-line: underline;">Hello</div>
+<div style="-webkit-text-decoration: underline; -webkit-text-decoration-style: dotted;">Hello</div>
+<div style="-webkit-text-decoration: underline; -webkit-text-decoration-color: green;">Hello</div>
+<div style="-webkit-text-decoration: underline; -webkit-text-decoration-skip: none;">Helylo</div>
+</div>
+</body>
+</html>
Added: trunk/LayoutTests/fast/css3-text/css3-text-decoration/unprefix.html (0 => 238002)
--- trunk/LayoutTests/fast/css3-text/css3-text-decoration/unprefix.html (rev 0)
+++ trunk/LayoutTests/fast/css3-text/css3-text-decoration/unprefix.html 2018-11-08 22:18:15 UTC (rev 238002)
@@ -0,0 +1,13 @@
+<!DOCTYPE html>
+<html>
+<head>
+</head>
+<body>
+<div style="font-size: 48px;">
+<div style="text-decoration-line: underline;">Hello</div>
+<div style="-webkit-text-decoration: underline; text-decoration-style: dotted;">Hello</div>
+<div style="-webkit-text-decoration: underline; text-decoration-color: green;">Hello</div>
+<div style="-webkit-text-decoration: underline; text-decoration-skip: none;">Helylo</div>
+</div>
+</body>
+</html>
Modified: trunk/LayoutTests/imported/blink/fast/css3-text/css3-text-decoration/text-decoration-line-recalc-expected.html (238001 => 238002)
--- trunk/LayoutTests/imported/blink/fast/css3-text/css3-text-decoration/text-decoration-line-recalc-expected.html 2018-11-08 21:57:40 UTC (rev 238001)
+++ trunk/LayoutTests/imported/blink/fast/css3-text/css3-text-decoration/text-decoration-line-recalc-expected.html 2018-11-08 22:18:15 UTC (rev 238002)
@@ -2,7 +2,7 @@
<style>
div {
font-size: 50px;
- text-decoration: overline solid green;
+ text-decoration: overline;
}
</style>
<p>Test that changes in text-decoration-line are recalculated correctly. PASS
@@ -9,4 +9,4 @@
if the text below has a solid green overline, and no underline.</p>
<div id="target">
Filler text
-</div>
\ No newline at end of file
+</div>
Modified: trunk/LayoutTests/imported/blink/fast/css3-text/css3-text-decoration/text-decoration-line-recalc.html (238001 => 238002)
--- trunk/LayoutTests/imported/blink/fast/css3-text/css3-text-decoration/text-decoration-line-recalc.html 2018-11-08 21:57:40 UTC (rev 238001)
+++ trunk/LayoutTests/imported/blink/fast/css3-text/css3-text-decoration/text-decoration-line-recalc.html 2018-11-08 22:18:15 UTC (rev 238002)
@@ -2,7 +2,7 @@
<style>
div {
font-size: 50px;
- text-decoration: underline solid green;
+ text-decoration: underline;
}
</style>
<script>
@@ -14,4 +14,4 @@
if the text below has a solid green overline, and no underline.</p>
<div id="target">
Filler text
-</div>
\ No newline at end of file
+</div>
Modified: trunk/LayoutTests/imported/w3c/web-platform-tests/css/css-text-decor/text-decoration-line-recalc-expected.html (238001 => 238002)
--- trunk/LayoutTests/imported/w3c/web-platform-tests/css/css-text-decor/text-decoration-line-recalc-expected.html 2018-11-08 21:57:40 UTC (rev 238001)
+++ trunk/LayoutTests/imported/w3c/web-platform-tests/css/css-text-decor/text-decoration-line-recalc-expected.html 2018-11-08 22:18:15 UTC (rev 238002)
@@ -2,7 +2,7 @@
<style>
div {
font-size: 50px;
- text-decoration: overline solid green;
+ text-decoration: overline;
}
</style>
<p>Test that changes in text-decoration-line are recalculated correctly. PASS
@@ -9,4 +9,4 @@
if the text below has a solid green overline, and no underline.</p>
<div id="target">
Filler text
-</div>
\ No newline at end of file
+</div>
Modified: trunk/LayoutTests/imported/w3c/web-platform-tests/css/css-text-decor/text-decoration-line-recalc.html (238001 => 238002)
--- trunk/LayoutTests/imported/w3c/web-platform-tests/css/css-text-decor/text-decoration-line-recalc.html 2018-11-08 21:57:40 UTC (rev 238001)
+++ trunk/LayoutTests/imported/w3c/web-platform-tests/css/css-text-decor/text-decoration-line-recalc.html 2018-11-08 22:18:15 UTC (rev 238002)
@@ -4,7 +4,7 @@
<style>
div {
font-size: 50px;
- text-decoration: underline solid green;
+ text-decoration: underline;
}
</style>
<script>
@@ -16,4 +16,4 @@
if the text below has a solid green overline, and no underline.</p>
<div id="target">
Filler text
-</div>
\ No newline at end of file
+</div>
Modified: trunk/LayoutTests/imported/w3c/web-platform-tests/css/mediaqueries/test_media_queries-expected.txt (238001 => 238002)
--- trunk/LayoutTests/imported/w3c/web-platform-tests/css/mediaqueries/test_media_queries-expected.txt 2018-11-08 21:57:40 UTC (rev 238001)
+++ trunk/LayoutTests/imported/w3c/web-platform-tests/css/mediaqueries/test_media_queries-expected.txt 2018-11-08 22:18:15 UTC (rev 238002)
@@ -77,68 +77,68 @@
PASS subtest_76
PASS subtest_77
PASS subtest_78
-FAIL subtest_79 assert_true: expected true got false
+PASS subtest_79
PASS subtest_80
PASS subtest_81
-FAIL subtest_82 assert_true: expected true got false
+PASS subtest_82
PASS subtest_83
-FAIL subtest_84 assert_true: expected true got false
-FAIL subtest_85 assert_true: expected true got false
-FAIL subtest_86 assert_true: expected true got false
+PASS subtest_84
+PASS subtest_85
+PASS subtest_86
PASS subtest_87
PASS subtest_88
-FAIL subtest_89 assert_true: expected true got false
-FAIL subtest_90 assert_true: expected true got false
+PASS subtest_89
+PASS subtest_90
PASS subtest_91
-FAIL subtest_92 assert_true: expected true got false
+PASS subtest_92
PASS subtest_93
PASS subtest_94
-FAIL subtest_95 assert_true: expected true got false
+PASS subtest_95
PASS subtest_96
-FAIL subtest_97 assert_true: expected true got false
-FAIL subtest_98 assert_true: expected true got false
-FAIL subtest_99 assert_true: expected true got false
+PASS subtest_97
+PASS subtest_98
+PASS subtest_99
PASS subtest_100
PASS subtest_101
-FAIL subtest_102 assert_true: expected true got false
-FAIL subtest_103 assert_true: expected true got false
+PASS subtest_102
+PASS subtest_103
PASS subtest_104
-FAIL subtest_105 assert_true: expected true got false
+PASS subtest_105
PASS subtest_106
PASS subtest_107
-FAIL subtest_108 assert_true: expected true got false
+PASS subtest_108
PASS subtest_109
-FAIL subtest_110 assert_true: expected true got false
-FAIL subtest_111 assert_true: expected true got false
-FAIL subtest_112 assert_true: expected true got false
+PASS subtest_110
+PASS subtest_111
+PASS subtest_112
PASS subtest_113
PASS subtest_114
-FAIL subtest_115 assert_true: expected true got false
-FAIL subtest_116 assert_true: expected true got false
+PASS subtest_115
+PASS subtest_116
PASS subtest_117
-FAIL subtest_118 assert_true: expected true got false
+PASS subtest_118
PASS subtest_119
PASS subtest_120
-FAIL subtest_121 assert_true: expected true got false
+PASS subtest_121
PASS subtest_122
-FAIL subtest_123 assert_true: expected true got false
-FAIL subtest_124 assert_true: expected true got false
-FAIL subtest_125 assert_true: expected true got false
+PASS subtest_123
+PASS subtest_124
+PASS subtest_125
PASS subtest_126
PASS subtest_127
-FAIL subtest_128 assert_true: expected true got false
-FAIL subtest_129 assert_true: expected true got false
+PASS subtest_128
+PASS subtest_129
PASS subtest_130
-FAIL subtest_131 assert_true: expected true got false
+PASS subtest_131
PASS subtest_132
PASS subtest_133
PASS subtest_134
-FAIL subtest_135 assert_true: expected true got false
-FAIL subtest_136 assert_true: expected true got false
+PASS subtest_135
+PASS subtest_136
PASS subtest_137
-FAIL subtest_138 assert_true: expected true got false
-FAIL subtest_139 assert_true: expected true got false
-FAIL subtest_140 assert_true: expected true got false
+PASS subtest_138
+PASS subtest_139
+PASS subtest_140
PASS subtest_141
PASS subtest_142
PASS subtest_143
@@ -148,56 +148,56 @@
PASS subtest_147
PASS subtest_148
PASS subtest_149
-FAIL subtest_150 assert_true: expected true got false
-FAIL subtest_151 assert_true: expected true got false
+PASS subtest_150
+PASS subtest_151
PASS subtest_152
-FAIL subtest_153 assert_true: expected true got false
-FAIL subtest_154 assert_true: expected true got false
+PASS subtest_153
+PASS subtest_154
PASS subtest_155
-FAIL subtest_156 assert_true: expected true got false
-FAIL subtest_157 assert_true: expected true got false
-FAIL subtest_158 assert_true: expected true got false
+PASS subtest_156
+PASS subtest_157
+PASS subtest_158
PASS subtest_159
PASS subtest_160
PASS subtest_161
PASS subtest_162
-FAIL subtest_163 assert_true: expected true got false
-FAIL subtest_164 assert_true: expected true got false
-FAIL subtest_165 assert_true: expected true got false
+PASS subtest_163
+PASS subtest_164
+PASS subtest_165
PASS subtest_166
PASS subtest_167
PASS subtest_168
PASS subtest_169
-FAIL subtest_170 assert_true: expected true got false
-FAIL subtest_171 assert_true: expected true got false
-FAIL subtest_172 assert_true: expected true got false
-FAIL subtest_173 assert_true: expected true got false
+PASS subtest_170
+PASS subtest_171
+PASS subtest_172
+PASS subtest_173
PASS subtest_174
PASS subtest_175
PASS subtest_176
-FAIL subtest_177 assert_true: expected true got false
+PASS subtest_177
PASS subtest_178
PASS subtest_179
-FAIL subtest_180 assert_true: expected true got false
-FAIL subtest_181 assert_true: expected true got false
+PASS subtest_180
+PASS subtest_181
PASS subtest_182
-FAIL subtest_183 assert_true: expected true got false
-FAIL subtest_184 assert_true: expected true got false
+PASS subtest_183
+PASS subtest_184
PASS subtest_185
PASS subtest_186
-FAIL subtest_187 assert_true: expected true got false
-FAIL subtest_188 assert_true: expected true got false
-FAIL subtest_189 assert_true: expected true got false
+PASS subtest_187
+PASS subtest_188
+PASS subtest_189
PASS subtest_190
-FAIL subtest_191 assert_true: expected true got false
+PASS subtest_191
PASS subtest_192
-FAIL subtest_193 assert_true: expected true got false
+PASS subtest_193
PASS subtest_194
-FAIL subtest_195 assert_true: expected true got false
-FAIL subtest_196 assert_true: expected true got false
-FAIL subtest_197 assert_true: expected true got false
+PASS subtest_195
+PASS subtest_196
+PASS subtest_197
PASS subtest_198
-FAIL subtest_199 assert_true: expected true got false
+PASS subtest_199
PASS subtest_200
PASS subtest_201
PASS subtest_202
@@ -229,24 +229,24 @@
PASS subtest_228
PASS subtest_229
PASS subtest_230
-FAIL monochrome_and_color assert_not_equals: should be either monochrome or color got disallowed value false
+PASS monochrome_and_color
PASS find_depth
-FAIL subtest_231 assert_true: expected true got false
+PASS subtest_231
PASS subtest_232
PASS subtest_233
-FAIL subtest_234 assert_true: expected true got false
+PASS subtest_234
PASS subtest_235
-FAIL subtest_236 assert_true: expected true got false
+PASS subtest_236
PASS subtest_237
PASS subtest_238
PASS subtest_239
-FAIL subtest_240 assert_true: expected true got false
+PASS subtest_240
PASS subtest_241
PASS subtest_242
PASS subtest_243
-FAIL subtest_244 assert_true: expected true got false
+PASS subtest_244
PASS subtest_245
-FAIL subtest_246 assert_true: expected true got false
+PASS subtest_246
PASS subtest_247
PASS subtest_248
PASS subtest_249
@@ -265,13 +265,13 @@
PASS subtest_262
PASS subtest_263
PASS subtest_264
-FAIL subtest_265 assert_true: expected true got false
+PASS subtest_265
PASS subtest_266
-FAIL subtest_267 assert_true: expected true got false
+PASS subtest_267
PASS subtest_268
-FAIL subtest_269 assert_true: expected true got false
-FAIL subtest_270 assert_true: expected true got false
-FAIL subtest_271 assert_true: expected true got false
+PASS subtest_269
+PASS subtest_270
+PASS subtest_271
PASS subtest_272
PASS subtest_273
PASS subtest_274
@@ -318,13 +318,13 @@
PASS subtest_314
PASS subtest_315
FAIL subtest_316 assert_true: expected true got false
-PASS subtest_317
-FAIL subtest_318 assert_true: expected true got false
+FAIL subtest_317 assert_false: expected false got true
+PASS subtest_318
PASS subtest_319
FAIL subtest_320 assert_true: expected true got false
FAIL subtest_321 assert_true: expected true got false
PASS subtest_322
-FAIL subtest_323 assert_true: expected true got false
+PASS subtest_323
FAIL subtest_324 assert_true: expected true got false
FAIL subtest_325 assert_true: expected true got false
FAIL subtest_326 assert_true: expected true got false
@@ -348,7 +348,7 @@
PASS subtest_344
PASS subtest_345
PASS subtest_346
-FAIL subtest_347 assert_true: expected true got false
+PASS subtest_347
PASS subtest_348
PASS subtest_349
PASS subtest_350
@@ -357,25 +357,25 @@
PASS subtest_353
PASS subtest_354
PASS subtest_355
-FAIL subtest_356 assert_true: expected true got false
+PASS subtest_356
PASS subtest_357
FAIL subtest_358 assert_true: expected true got false
PASS subtest_359
PASS subtest_360
-FAIL subtest_361 assert_true: expected true got false
+PASS subtest_361
PASS subtest_362
-FAIL subtest_363 assert_true: expected true got false
-FAIL subtest_364 assert_true: expected true got false
-FAIL subtest_365 assert_true: expected true got false
-FAIL subtest_366 assert_true: expected true got false
-FAIL subtest_367 assert_true: expected true got false
+PASS subtest_363
+PASS subtest_364
+PASS subtest_365
+PASS subtest_366
+PASS subtest_367
PASS subtest_368
-FAIL subtest_369 assert_true: expected true got false
-FAIL subtest_370 assert_true: expected true got false
+PASS subtest_369
+PASS subtest_370
PASS subtest_371
PASS subtest_372
-FAIL subtest_373 assert_true: expected true got false
-FAIL subtest_374 assert_true: expected true got false
+PASS subtest_373
+PASS subtest_374
PASS subtest_375
PASS subtest_376
PASS subtest_377
Modified: trunk/Source/WebCore/ChangeLog (238001 => 238002)
--- trunk/Source/WebCore/ChangeLog 2018-11-08 21:57:40 UTC (rev 238001)
+++ trunk/Source/WebCore/ChangeLog 2018-11-08 22:18:15 UTC (rev 238002)
@@ -1,3 +1,34 @@
+2018-11-07 Myles C. Maxfield <[email protected]>
+
+ Unprefix text-decoration CSS3 properties
+ https://bugs.webkit.org/show_bug.cgi?id=127193
+
+ Reviewed by Dean Jackson.
+
+ The properties are stable, and there is interop.
+
+ Test: fast/css3-text/css3-text-decoration/unprefix.html
+
+ * css/CSSComputedStyleDeclaration.cpp:
+ (WebCore::ComputedStyleExtractor::valueForPropertyinStyle):
+ * css/CSSProperties.json:
+ * css/StyleResolver.cpp:
+ (WebCore::shouldApplyPropertyInParseOrder):
+ (WebCore::isValidVisitedLinkProperty):
+ * css/parser/CSSParserFastPaths.cpp:
+ (WebCore::isColorPropertyID):
+ (WebCore::CSSParserFastPaths::isValidKeywordPropertyAndValue):
+ (WebCore::CSSParserFastPaths::isKeywordPropertyID):
+ * css/parser/CSSPropertyParser.cpp:
+ (WebCore::CSSPropertyParser::parseSingleValue):
+ * editing/cocoa/DataDetection.mm:
+ (WebCore::DataDetection::detectContentInRange):
+ * rendering/TextDecorationPainter.cpp:
+ (WebCore::decorationColor):
+ * rendering/style/RenderStyle.cpp:
+ (WebCore::RenderStyle::colorIncludingFallback const):
+ (WebCore::RenderStyle::visitedDependentColor const):
+
2018-11-08 Timothy Hatcher <[email protected]>
Add experimental support for a `supported-color-schemes` CSS property.
Modified: trunk/Source/WebCore/css/CSSComputedStyleDeclaration.cpp (238001 => 238002)
--- trunk/Source/WebCore/css/CSSComputedStyleDeclaration.cpp 2018-11-08 21:57:40 UTC (rev 238001)
+++ trunk/Source/WebCore/css/CSSComputedStyleDeclaration.cpp 2018-11-08 22:18:15 UTC (rev 238002)
@@ -211,10 +211,10 @@
CSSPropertyWebkitTextAlignLast,
CSSPropertyWebkitTextJustify,
#endif // CSS3_TEXT
- CSSPropertyWebkitTextDecorationLine,
- CSSPropertyWebkitTextDecorationStyle,
- CSSPropertyWebkitTextDecorationColor,
- CSSPropertyWebkitTextDecorationSkip,
+ CSSPropertyTextDecorationLine,
+ CSSPropertyTextDecorationStyle,
+ CSSPropertyTextDecorationColor,
+ CSSPropertyTextDecorationSkip,
CSSPropertyTextUnderlinePosition,
CSSPropertyTextIndent,
CSSPropertyTextRendering,
@@ -3344,13 +3344,13 @@
#endif // CSS3_TEXT
case CSSPropertyWebkitTextDecoration:
return getCSSPropertyValuesForShorthandProperties(webkitTextDecorationShorthand());
- case CSSPropertyWebkitTextDecorationLine:
+ case CSSPropertyTextDecorationLine:
return renderTextDecorationFlagsToCSSValue(style.textDecoration());
- case CSSPropertyWebkitTextDecorationStyle:
+ case CSSPropertyTextDecorationStyle:
return renderTextDecorationStyleFlagsToCSSValue(style.textDecorationStyle());
- case CSSPropertyWebkitTextDecorationColor:
+ case CSSPropertyTextDecorationColor:
return currentColorOrValidColor(&style, style.textDecorationColor());
- case CSSPropertyWebkitTextDecorationSkip:
+ case CSSPropertyTextDecorationSkip:
return renderTextDecorationSkipFlagsToCSSValue(style.textDecorationSkip());
case CSSPropertyTextUnderlinePosition:
return cssValuePool.createValue(style.textUnderlinePosition());
Modified: trunk/Source/WebCore/css/CSSProperties.json (238001 => 238002)
--- trunk/Source/WebCore/css/CSSProperties.json 2018-11-08 21:57:40 UTC (rev 238001)
+++ trunk/Source/WebCore/css/CSSProperties.json 2018-11-08 22:18:15 UTC (rev 238002)
@@ -5874,9 +5874,9 @@
"-webkit-text-decoration": {
"codegen-properties": {
"longhands": [
- "-webkit-text-decoration-line",
- "-webkit-text-decoration-style",
- "-webkit-text-decoration-color"
+ "text-decoration-line",
+ "text-decoration-style",
+ "text-decoration-color"
]
},
"status": {
@@ -5887,10 +5887,13 @@
"url": "https://www.w3.org/TR/css-text-decor-3/#text-decoration"
}
},
- "-webkit-text-decoration-line": {
+ "text-decoration-line": {
"codegen-properties": {
"name-for-methods": "TextDecoration",
- "converter": "TextDecoration"
+ "converter": "TextDecoration",
+ "aliases": [
+ "-webkit-text-decoration-line"
+ ]
},
"status": {
"status": "experimental"
@@ -5900,7 +5903,12 @@
"url": "https://www.w3.org/TR/css-text-decor-3/#text-decoration-line"
}
},
- "-webkit-text-decoration-style": {
+ "text-decoration-style": {
+ "codegen-properties": {
+ "aliases": [
+ "-webkit-text-decoration-style"
+ ]
+ },
"values": [
"solid",
"double",
@@ -5916,10 +5924,13 @@
"url": "https://www.w3.org/TR/css-text-decor-3/#text-decoration-style"
}
},
- "-webkit-text-decoration-color": {
+ "text-decoration-color": {
"codegen-properties": {
"initial": "invalidColor",
- "visited-link-color-support": true
+ "visited-link-color-support": true,
+ "aliases": [
+ "-webkit-text-decoration-color"
+ ]
},
"status": {
"status": "experimental"
@@ -5929,10 +5940,13 @@
"url": "https://www.w3.org/TR/css-text-decor-3/#text-decoration-color"
}
},
- "-webkit-text-decoration-skip": {
+ "text-decoration-skip": {
"inherited": true,
"codegen-properties": {
- "converter": "TextDecorationSkip"
+ "converter": "TextDecorationSkip",
+ "aliases": [
+ "-webkit-text-decoration-skip"
+ ]
},
"status": {
"status": "experimental"
Modified: trunk/Source/WebCore/css/StyleResolver.cpp (238001 => 238002)
--- trunk/Source/WebCore/css/StyleResolver.cpp 2018-11-08 21:57:40 UTC (rev 238001)
+++ trunk/Source/WebCore/css/StyleResolver.cpp 2018-11-08 22:18:15 UTC (rev 238002)
@@ -1171,10 +1171,10 @@
case CSSPropertyWebkitBoxShadow:
case CSSPropertyBoxShadow:
case CSSPropertyWebkitTextDecoration:
- case CSSPropertyWebkitTextDecorationLine:
- case CSSPropertyWebkitTextDecorationStyle:
- case CSSPropertyWebkitTextDecorationColor:
- case CSSPropertyWebkitTextDecorationSkip:
+ case CSSPropertyTextDecorationLine:
+ case CSSPropertyTextDecorationStyle:
+ case CSSPropertyTextDecorationColor:
+ case CSSPropertyTextDecorationSkip:
case CSSPropertyTextUnderlinePosition:
case CSSPropertyTextUnderlineOffset:
case CSSPropertyTextDecorationThickness:
@@ -1463,7 +1463,7 @@
case CSSPropertyColor:
case CSSPropertyOutlineColor:
case CSSPropertyColumnRuleColor:
- case CSSPropertyWebkitTextDecorationColor:
+ case CSSPropertyTextDecorationColor:
case CSSPropertyWebkitTextEmphasisColor:
case CSSPropertyWebkitTextFillColor:
case CSSPropertyWebkitTextStrokeColor:
Modified: trunk/Source/WebCore/css/parser/CSSParserFastPaths.cpp (238001 => 238002)
--- trunk/Source/WebCore/css/parser/CSSParserFastPaths.cpp 2018-11-08 21:57:40 UTC (rev 238001)
+++ trunk/Source/WebCore/css/parser/CSSParserFastPaths.cpp 2018-11-08 22:18:15 UTC (rev 238002)
@@ -198,7 +198,7 @@
case CSSPropertyWebkitTextEmphasisColor:
case CSSPropertyWebkitTextFillColor:
case CSSPropertyWebkitTextStrokeColor:
- case CSSPropertyWebkitTextDecorationColor:
+ case CSSPropertyTextDecorationColor:
return true;
default:
return false;
@@ -645,7 +645,7 @@
// FIXME-NEWPARSER: Support
// case CSSPropertyTextCombineUpright:
// return valueID == CSSValueNone || valueID == CSSValueAll;
- case CSSPropertyWebkitTextDecorationStyle:
+ case CSSPropertyTextDecorationStyle:
// solid | double | dotted | dashed | wavy
return valueID == CSSValueSolid || valueID == CSSValueDouble || valueID == CSSValueDotted || valueID == CSSValueDashed || valueID == CSSValueWavy;
#if ENABLE(CSS3_TEXT)
@@ -889,7 +889,7 @@
case CSSPropertyWebkitRtlOrdering:
case CSSPropertyWebkitRubyPosition:
case CSSPropertyWebkitTextCombine:
- case CSSPropertyWebkitTextDecorationStyle:
+ case CSSPropertyTextDecorationStyle:
case CSSPropertyWebkitTextOrientation:
case CSSPropertyWebkitTextSecurity:
case CSSPropertyWebkitTextZoom:
Modified: trunk/Source/WebCore/css/parser/CSSPropertyParser.cpp (238001 => 238002)
--- trunk/Source/WebCore/css/parser/CSSPropertyParser.cpp 2018-11-08 21:57:40 UTC (rev 238001)
+++ trunk/Source/WebCore/css/parser/CSSPropertyParser.cpp 2018-11-08 22:18:15 UTC (rev 238002)
@@ -4068,9 +4068,9 @@
case CSSPropertyOrphans:
case CSSPropertyWidows:
return consumePositiveInteger(m_range);
- case CSSPropertyWebkitTextDecorationColor:
+ case CSSPropertyTextDecorationColor:
return consumeColor(m_range, m_context.mode);
- case CSSPropertyWebkitTextDecorationSkip:
+ case CSSPropertyTextDecorationSkip:
return consumeTextDecorationSkip(m_range);
case CSSPropertyWebkitTextStrokeWidth:
return consumeTextStrokeWidth(m_range, m_context.mode);
@@ -4135,7 +4135,7 @@
return consumeFilter(m_range, m_context, AllowedFilterFunctions::ColorFilters);
case CSSPropertyTextDecoration:
case CSSPropertyWebkitTextDecorationsInEffect:
- case CSSPropertyWebkitTextDecorationLine:
+ case CSSPropertyTextDecorationLine:
return consumeTextDecorationLine(m_range);
case CSSPropertyWebkitTextEmphasisStyle:
return consumeTextEmphasisStyle(m_range);
Modified: trunk/Source/WebCore/editing/cocoa/DataDetection.mm (238001 => 238002)
--- trunk/Source/WebCore/editing/cocoa/DataDetection.mm 2018-11-08 21:57:40 UTC (rev 238001)
+++ trunk/Source/WebCore/editing/cocoa/DataDetection.mm 2018-11-08 22:18:15 UTC (rev 238002)
@@ -616,7 +616,7 @@
auto underlineColor = Color(colorWithOverrideAlpha(textColor.rgb(), overrideAlpha));
anchorElement->setInlineStyleProperty(CSSPropertyColor, textColor.cssText());
- anchorElement->setInlineStyleProperty(CSSPropertyWebkitTextDecorationColor, underlineColor.cssText());
+ anchorElement->setInlineStyleProperty(CSSPropertyTextDecorationColor, underlineColor.cssText());
}
}
} else if (is<StyledElement>(*parentNode)) {
Modified: trunk/Source/WebCore/rendering/TextDecorationPainter.cpp (238001 => 238002)
--- trunk/Source/WebCore/rendering/TextDecorationPainter.cpp 2018-11-08 21:57:40 UTC (rev 238001)
+++ trunk/Source/WebCore/rendering/TextDecorationPainter.cpp 2018-11-08 22:18:15 UTC (rev 238002)
@@ -315,7 +315,7 @@
static Color decorationColor(const RenderStyle& style)
{
// Check for text decoration color first.
- Color result = style.visitedDependentColorWithColorFilter(CSSPropertyWebkitTextDecorationColor);
+ Color result = style.visitedDependentColorWithColorFilter(CSSPropertyTextDecorationColor);
if (result.isValid())
return result;
if (style.hasPositiveStrokeWidth()) {
Modified: trunk/Source/WebCore/rendering/style/RenderStyle.cpp (238001 => 238002)
--- trunk/Source/WebCore/rendering/style/RenderStyle.cpp 2018-11-08 21:57:40 UTC (rev 238001)
+++ trunk/Source/WebCore/rendering/style/RenderStyle.cpp 2018-11-08 22:18:15 UTC (rev 238002)
@@ -1847,7 +1847,7 @@
case CSSPropertyColumnRuleColor:
result = visitedLink ? visitedLinkColumnRuleColor() : columnRuleColor();
break;
- case CSSPropertyWebkitTextDecorationColor:
+ case CSSPropertyTextDecorationColor:
// Text decoration color fallback is handled in RenderObject::decorationColor.
return visitedLink ? visitedLinkTextDecorationColor() : textDecorationColor();
case CSSPropertyWebkitTextEmphasisColor:
@@ -1885,7 +1885,7 @@
Color visitedColor = colorIncludingFallback(colorProperty, true);
// Text decoration color validity is preserved (checked in RenderObject::decorationColor).
- if (colorProperty == CSSPropertyWebkitTextDecorationColor)
+ if (colorProperty == CSSPropertyTextDecorationColor)
return visitedColor;
// FIXME: Technically someone could explicitly specify the color transparent, but for now we'll just
