Diff
Modified: trunk/LayoutTests/TestExpectations (295009 => 295010)
--- trunk/LayoutTests/TestExpectations 2022-05-29 05:09:11 UTC (rev 295009)
+++ trunk/LayoutTests/TestExpectations 2022-05-29 07:57:37 UTC (rev 295010)
@@ -2911,9 +2911,10 @@
imported/w3c/web-platform-tests/secure-contexts/basic-dedicated-worker.https.html [ Skip ]
imported/w3c/web-platform-tests/secure-contexts/basic-popup-and-iframe-tests.https.html [ Skip ]
-# CSS3 Text support is not yet enabled (needs ENABLE_CSS3_TEXT).
-webkit.org/b/76173 fast/css3-text/css3-text-align-last [ Skip ]
-webkit.org/b/99945 fast/css3-text/css3-text-justify [ Skip ]
+# text-align-last
+webkit.org/b/76173 fast/css3-text/css3-text-align-last/text-align-last-with-text-align-justify.html [ ImageOnlyFailure ]
+# text-justify
+webkit.org/b/99945 fast/css3-text/css3-text-justify/text-justify-none.html [ ImageOnlyFailure ]
# Link prefetch is disabled by default (needs ENABLE_LINK_PREFETCH)
webkit.org/b/3652 fast/dom/HTMLLinkElement/link-and-subresource-test.html [ Skip ]
Modified: trunk/LayoutTests/imported/w3c/web-platform-tests/css/css-cascade/all-prop-initial-xml-expected.txt (295009 => 295010)
--- trunk/LayoutTests/imported/w3c/web-platform-tests/css/css-cascade/all-prop-initial-xml-expected.txt 2022-05-29 05:09:11 UTC (rev 295009)
+++ trunk/LayoutTests/imported/w3c/web-platform-tests/css/css-cascade/all-prop-initial-xml-expected.txt 2022-05-29 07:57:37 UTC (rev 295010)
@@ -384,8 +384,10 @@
PASS -webkit-nbsp-mode
PASS -webkit-rtl-ordering
PASS -webkit-ruby-position
+PASS -webkit-text-align-last
PASS -webkit-text-combine
PASS -webkit-text-fill-color
+PASS -webkit-text-justify
PASS -webkit-text-security
PASS -webkit-text-size-adjust
PASS -webkit-text-stroke-color
Modified: trunk/LayoutTests/imported/w3c/web-platform-tests/css/cssom/getComputedStyle-detached-subtree-expected.txt (295009 => 295010)
--- trunk/LayoutTests/imported/w3c/web-platform-tests/css/cssom/getComputedStyle-detached-subtree-expected.txt 2022-05-29 05:09:11 UTC (rev 295009)
+++ trunk/LayoutTests/imported/w3c/web-platform-tests/css/cssom/getComputedStyle-detached-subtree-expected.txt 2022-05-29 07:57:37 UTC (rev 295010)
@@ -1,8 +1,8 @@
PASS getComputedStyle returns no style for detached element
-FAIL getComputedStyle returns no style for element in non-rendered iframe (display: none) assert_equals: expected 0 but got 391
-FAIL getComputedStyle returns no style for element in non-rendered iframe (display: none) from iframe's window assert_equals: expected 0 but got 391
-FAIL getComputedStyle returns no style for element outside the flat tree assert_equals: expected 0 but got 391
-FAIL getComputedStyle returns no style for descendant outside the flat tree assert_equals: expected 0 but got 391
+FAIL getComputedStyle returns no style for element in non-rendered iframe (display: none) assert_equals: expected 0 but got 393
+FAIL getComputedStyle returns no style for element in non-rendered iframe (display: none) from iframe's window assert_equals: expected 0 but got 393
+FAIL getComputedStyle returns no style for element outside the flat tree assert_equals: expected 0 but got 393
+FAIL getComputedStyle returns no style for descendant outside the flat tree assert_equals: expected 0 but got 393
PASS getComputedStyle returns no style for shadow tree outside of flattened tree
Modified: trunk/LayoutTests/platform/gtk/imported/w3c/web-platform-tests/css/css-cascade/all-prop-initial-xml-expected.txt (295009 => 295010)
--- trunk/LayoutTests/platform/gtk/imported/w3c/web-platform-tests/css/css-cascade/all-prop-initial-xml-expected.txt 2022-05-29 05:09:11 UTC (rev 295009)
+++ trunk/LayoutTests/platform/gtk/imported/w3c/web-platform-tests/css/css-cascade/all-prop-initial-xml-expected.txt 2022-05-29 07:57:37 UTC (rev 295010)
@@ -383,8 +383,10 @@
PASS -webkit-rtl-ordering
PASS -webkit-ruby-position
PASS -webkit-tap-highlight-color
+PASS -webkit-text-align-last
PASS -webkit-text-combine
PASS -webkit-text-fill-color
+PASS -webkit-text-justify
PASS -webkit-text-security
PASS -webkit-text-stroke-color
PASS -webkit-text-stroke-width
Modified: trunk/LayoutTests/platform/gtk/imported/w3c/web-platform-tests/css/cssom/getComputedStyle-detached-subtree-expected.txt (295009 => 295010)
--- trunk/LayoutTests/platform/gtk/imported/w3c/web-platform-tests/css/cssom/getComputedStyle-detached-subtree-expected.txt 2022-05-29 05:09:11 UTC (rev 295009)
+++ trunk/LayoutTests/platform/gtk/imported/w3c/web-platform-tests/css/cssom/getComputedStyle-detached-subtree-expected.txt 2022-05-29 07:57:37 UTC (rev 295010)
@@ -1,8 +1,8 @@
PASS getComputedStyle returns no style for detached element
-FAIL getComputedStyle returns no style for element in non-rendered iframe (display: none) assert_equals: expected 0 but got 389
-FAIL getComputedStyle returns no style for element in non-rendered iframe (display: none) from iframe's window assert_equals: expected 0 but got 389
-FAIL getComputedStyle returns no style for element outside the flat tree assert_equals: expected 0 but got 389
-FAIL getComputedStyle returns no style for descendant outside the flat tree assert_equals: expected 0 but got 389
+FAIL getComputedStyle returns no style for element in non-rendered iframe (display: none) assert_equals: expected 0 but got 391
+FAIL getComputedStyle returns no style for element in non-rendered iframe (display: none) from iframe's window assert_equals: expected 0 but got 391
+FAIL getComputedStyle returns no style for element outside the flat tree assert_equals: expected 0 but got 391
+FAIL getComputedStyle returns no style for descendant outside the flat tree assert_equals: expected 0 but got 391
PASS getComputedStyle returns no style for shadow tree outside of flattened tree
Modified: trunk/LayoutTests/platform/ios/imported/w3c/web-platform-tests/css/cssom/getComputedStyle-detached-subtree-expected.txt (295009 => 295010)
--- trunk/LayoutTests/platform/ios/imported/w3c/web-platform-tests/css/cssom/getComputedStyle-detached-subtree-expected.txt 2022-05-29 05:09:11 UTC (rev 295009)
+++ trunk/LayoutTests/platform/ios/imported/w3c/web-platform-tests/css/cssom/getComputedStyle-detached-subtree-expected.txt 2022-05-29 07:57:37 UTC (rev 295010)
@@ -1,8 +1,8 @@
PASS getComputedStyle returns no style for detached element
-FAIL getComputedStyle returns no style for element in non-rendered iframe (display: none) assert_equals: expected 0 but got 393
-FAIL getComputedStyle returns no style for element in non-rendered iframe (display: none) from iframe's window assert_equals: expected 0 but got 393
-FAIL getComputedStyle returns no style for element outside the flat tree assert_equals: expected 0 but got 393
-FAIL getComputedStyle returns no style for descendant outside the flat tree assert_equals: expected 0 but got 393
+FAIL getComputedStyle returns no style for element in non-rendered iframe (display: none) assert_equals: expected 0 but got 395
+FAIL getComputedStyle returns no style for element in non-rendered iframe (display: none) from iframe's window assert_equals: expected 0 but got 395
+FAIL getComputedStyle returns no style for element outside the flat tree assert_equals: expected 0 but got 395
+FAIL getComputedStyle returns no style for descendant outside the flat tree assert_equals: expected 0 but got 395
PASS getComputedStyle returns no style for shadow tree outside of flattened tree
Modified: trunk/LayoutTests/platform/win/TestExpectations (295009 => 295010)
--- trunk/LayoutTests/platform/win/TestExpectations 2022-05-29 05:09:11 UTC (rev 295009)
+++ trunk/LayoutTests/platform/win/TestExpectations 2022-05-29 07:57:37 UTC (rev 295010)
@@ -898,9 +898,6 @@
# Backdrop Filters do not work on Windows
fast/css/will-change/will-change-creates-stacking-context-inline.html [ ImageOnlyFailure ]
-# TODO CSS3_TEXT is disabled on Windows
-fast/css3-text/ [ Skip ]
-
# TODO ACCELERATED_OVERFLOW_SCROLLING is disabled on Windows
compositing/overflow/scrolling-without-painting.html [ Skip ]
compositing/overflow/updating-scrolling-content.html [ Skip ]
@@ -5054,3 +5051,10 @@
imported/mozilla/svg/blend-hard-light.svg [ Skip ]
imported/mozilla/svg/blend-hue.svg [ Skip ]
imported/mozilla/svg/blend-luminosity.svg [ Skip ]
+
+# css3-text failures.
+fast/css3-text/font-synthesis.html [ ImageOnlyFailure ]
+fast/css3-text/css3-text-decoration/repaint/underline-outside-of-layout-rect-removed.html [ ImageOnlyFailure ]
+fast/css3-text/css3-text-decoration/repaint/underline-outside-of-layout-rect.html [ ImageOnlyFailure ]
+fast/css3-text/css3-text-decoration/text-decoration-offset-repaint.html [ ImageOnlyFailure ]
+fast/css3-text/css3-text-decoration/text-decoration-thickness-repaint.html [ ImageOnlyFailure ]
Modified: trunk/LayoutTests/platform/wincairo/TestExpectations (295009 => 295010)
--- trunk/LayoutTests/platform/wincairo/TestExpectations 2022-05-29 05:09:11 UTC (rev 295009)
+++ trunk/LayoutTests/platform/wincairo/TestExpectations 2022-05-29 07:57:37 UTC (rev 295010)
@@ -1060,9 +1060,6 @@
fast/css-generated-content/initial-letter-pagination-sunken-rl.html [ ImageOnlyFailure ]
fast/css-generated-content/initial-letter-pagination-sunken.html [ ImageOnlyFailure ]
-# TODO CSS3_TEXT is disabled on Windows
-fast/css3-text/ [ Skip ]
-
webkit.org/b/150949 imported/blink/fast/css/transformed-overflow-hidden-clips-fixed.html [ ImageOnlyFailure ]
# color-filters are off by default
Modified: trunk/LayoutTests/platform/wpe/imported/w3c/web-platform-tests/css/css-cascade/all-prop-initial-xml-expected.txt (295009 => 295010)
--- trunk/LayoutTests/platform/wpe/imported/w3c/web-platform-tests/css/css-cascade/all-prop-initial-xml-expected.txt 2022-05-29 05:09:11 UTC (rev 295009)
+++ trunk/LayoutTests/platform/wpe/imported/w3c/web-platform-tests/css/css-cascade/all-prop-initial-xml-expected.txt 2022-05-29 07:57:37 UTC (rev 295010)
@@ -382,8 +382,10 @@
PASS -webkit-rtl-ordering
PASS -webkit-ruby-position
PASS -webkit-tap-highlight-color
+PASS -webkit-text-align-last
PASS -webkit-text-combine
PASS -webkit-text-fill-color
+PASS -webkit-text-justify
PASS -webkit-text-security
PASS -webkit-text-stroke-color
PASS -webkit-text-stroke-width
Modified: trunk/LayoutTests/platform/wpe/imported/w3c/web-platform-tests/css/cssom/getComputedStyle-detached-subtree-expected.txt (295009 => 295010)
--- trunk/LayoutTests/platform/wpe/imported/w3c/web-platform-tests/css/cssom/getComputedStyle-detached-subtree-expected.txt 2022-05-29 05:09:11 UTC (rev 295009)
+++ trunk/LayoutTests/platform/wpe/imported/w3c/web-platform-tests/css/cssom/getComputedStyle-detached-subtree-expected.txt 2022-05-29 07:57:37 UTC (rev 295010)
@@ -1,8 +1,8 @@
PASS getComputedStyle returns no style for detached element
-FAIL getComputedStyle returns no style for element in non-rendered iframe (display: none) assert_equals: expected 0 but got 388
-FAIL getComputedStyle returns no style for element in non-rendered iframe (display: none) from iframe's window assert_equals: expected 0 but got 388
-FAIL getComputedStyle returns no style for element outside the flat tree assert_equals: expected 0 but got 388
-FAIL getComputedStyle returns no style for descendant outside the flat tree assert_equals: expected 0 but got 388
+FAIL getComputedStyle returns no style for element in non-rendered iframe (display: none) assert_equals: expected 0 but got 390
+FAIL getComputedStyle returns no style for element in non-rendered iframe (display: none) from iframe's window assert_equals: expected 0 but got 390
+FAIL getComputedStyle returns no style for element outside the flat tree assert_equals: expected 0 but got 390
+FAIL getComputedStyle returns no style for descendant outside the flat tree assert_equals: expected 0 but got 390
PASS getComputedStyle returns no style for shadow tree outside of flattened tree
Modified: trunk/Source/WTF/Scripts/Preferences/WebPreferencesExperimental.yaml (295009 => 295010)
--- trunk/Source/WTF/Scripts/Preferences/WebPreferencesExperimental.yaml 2022-05-29 05:09:11 UTC (rev 295009)
+++ trunk/Source/WTF/Scripts/Preferences/WebPreferencesExperimental.yaml 2022-05-29 07:57:37 UTC (rev 295010)
@@ -405,6 +405,30 @@
WebCore:
default: false
+CSSTextAlignLastEnabled:
+ type: bool
+ humanReadableName: "CSS text-align-last property"
+ humanReadableDescription: "Enable the property text-align-last, defined in CSS Text 3"
+ defaultValue:
+ WebKitLegacy:
+ default: false
+ WebKit:
+ default: false
+ WebCore:
+ default: false
+
+CSSTextJustifyEnabled:
+ type: bool
+ humanReadableName: "CSS text-justify property"
+ humanReadableDescription: "Enable the property text-justify, defined in CSS Text 3"
+ defaultValue:
+ WebKitLegacy:
+ default: false
+ WebKit:
+ default: false
+ WebCore:
+ default: false
+
CSSTypedOMEnabled:
type: bool
humanReadableName: "CSS Typed OM"
Modified: trunk/Source/WTF/wtf/PlatformEnable.h (295009 => 295010)
--- trunk/Source/WTF/wtf/PlatformEnable.h 2022-05-29 05:09:11 UTC (rev 295009)
+++ trunk/Source/WTF/wtf/PlatformEnable.h 2022-05-29 07:57:37 UTC (rev 295010)
@@ -204,10 +204,6 @@
#define ENABLE_CONTEXT_MENU_EVENT 1
#endif
-#if !defined(ENABLE_CSS3_TEXT)
-#define ENABLE_CSS3_TEXT 0
-#endif
-
#if !defined(ENABLE_CSS_BOX_DECORATION_BREAK)
#define ENABLE_CSS_BOX_DECORATION_BREAK 1
#endif
Modified: trunk/Source/WebCore/animation/CSSPropertyAnimation.cpp (295009 => 295010)
--- trunk/Source/WebCore/animation/CSSPropertyAnimation.cpp 2022-05-29 05:09:11 UTC (rev 295009)
+++ trunk/Source/WebCore/animation/CSSPropertyAnimation.cpp 2022-05-29 07:57:37 UTC (rev 295010)
@@ -3652,6 +3652,9 @@
case CSSPropertyWebkitUserDrag:
case CSSPropertyWebkitUserModify:
case CSSPropertyUserSelect:
+ // TODO (webkit.org/b/240591): implement animation support for the following two elements.
+ case CSSPropertyWebkitTextAlignLast:
+ case CSSPropertyWebkitTextJustify:
continue;
default:
auto resolvedProperty = CSSProperty::resolveDirectionAwareProperty(property, RenderStyle::initialDirection(), RenderStyle::initialWritingMode());
Modified: trunk/Source/WebCore/css/CSSComputedStyleDeclaration.cpp (295009 => 295010)
--- trunk/Source/WebCore/css/CSSComputedStyleDeclaration.cpp 2022-05-29 05:09:11 UTC (rev 295009)
+++ trunk/Source/WebCore/css/CSSComputedStyleDeclaration.cpp 2022-05-29 07:57:37 UTC (rev 295010)
@@ -3557,12 +3557,14 @@
return cssValuePool.createValue(style.textAlign());
case CSSPropertyTextDecoration:
return renderTextDecorationLineFlagsToCSSValue(style.textDecorationLine());
-#if ENABLE(CSS3_TEXT)
case CSSPropertyWebkitTextAlignLast:
+ if (!m_element->document().settings().cssTextAlignLastEnabled())
+ return nullptr;
return cssValuePool.createValue(style.textAlignLast());
case CSSPropertyWebkitTextJustify:
+ if (!m_element->document().settings().cssTextJustifyEnabled())
+ return nullptr;
return cssValuePool.createValue(style.textJustify());
-#endif // CSS3_TEXT
case CSSPropertyWebkitTextDecoration:
return getCSSPropertyValuesForShorthandProperties(webkitTextDecorationShorthand());
case CSSPropertyTextDecorationLine:
Modified: trunk/Source/WebCore/css/CSSPrimitiveValueMappings.h (295009 => 295010)
--- trunk/Source/WebCore/css/CSSPrimitiveValueMappings.h 2022-05-29 05:09:11 UTC (rev 295009)
+++ trunk/Source/WebCore/css/CSSPrimitiveValueMappings.h 2022-05-29 07:57:37 UTC (rev 295010)
@@ -2213,7 +2213,6 @@
}
}
-#if ENABLE(CSS3_TEXT)
template<> inline CSSPrimitiveValue::CSSPrimitiveValue(TextAlignLast e)
: CSSValue(PrimitiveClass)
{
@@ -2310,7 +2309,6 @@
ASSERT_NOT_REACHED();
return TextJustify::Auto;
}
-#endif // CSS3_TEXT
template<> inline CSSPrimitiveValue::operator OptionSet<TextDecorationLine>() const
{
Modified: trunk/Source/WebCore/css/CSSProperties.json (295009 => 295010)
--- trunk/Source/WebCore/css/CSSProperties.json 2022-05-29 05:09:11 UTC (rev 295009)
+++ trunk/Source/WebCore/css/CSSProperties.json 2022-05-29 07:57:37 UTC (rev 295010)
@@ -6838,7 +6838,7 @@
"auto"
],
"codegen-properties": {
- "enable-if": "ENABLE_CSS3_TEXT"
+ "settings-flag": "cssTextAlignLastEnabled"
},
"status": {
"status": "experimental"
@@ -6857,7 +6857,7 @@
"none"
],
"codegen-properties": {
- "enable-if": "ENABLE_CSS3_TEXT"
+ "settings-flag": "cssTextJustifyEnabled"
},
"status": {
"status": "experimental"
Modified: trunk/Source/WebCore/css/StyleProperties.cpp (295009 => 295010)
--- trunk/Source/WebCore/css/StyleProperties.cpp 2022-05-29 05:09:11 UTC (rev 295009)
+++ trunk/Source/WebCore/css/StyleProperties.cpp 2022-05-29 07:57:37 UTC (rev 295010)
@@ -1801,10 +1801,8 @@
CSSPropertyPageBreakBefore,
CSSPropertyPageBreakInside,
CSSPropertyTextAlign,
-#if ENABLE(CSS3_TEXT)
CSSPropertyWebkitTextAlignLast,
CSSPropertyWebkitTextJustify,
-#endif // CSS3_TEXT
CSSPropertyTextIndent,
CSSPropertyWidows
};
Modified: trunk/Source/WebCore/css/parser/CSSParserContext.cpp (295009 => 295010)
--- trunk/Source/WebCore/css/parser/CSSParserContext.cpp 2022-05-29 05:09:11 UTC (rev 295009)
+++ trunk/Source/WebCore/css/parser/CSSParserContext.cpp 2022-05-29 07:57:37 UTC (rev 295010)
@@ -114,6 +114,8 @@
, subgridEnabled { document.settings().subgridEnabled() }
, containIntrinsicSizeEnabled { document.settings().cssContainIntrinsicSizeEnabled() }
, motionPathEnabled { document.settings().cssMotionPathEnabled() }
+ , cssTextAlignLastEnabled { document.settings().cssTextAlignLastEnabled() }
+ , cssTextJustifyEnabled { document.settings().cssTextJustifyEnabled() }
#if ENABLE(ATTACHMENT_ELEMENT)
, attachmentEnabled { RuntimeEnabledFeatures::sharedFeatures().attachmentElementEnabled() }
#endif
@@ -169,6 +171,8 @@
&& a.subgridEnabled == b.subgridEnabled
&& a.containIntrinsicSizeEnabled == b.containIntrinsicSizeEnabled
&& a.motionPathEnabled == b.motionPathEnabled
+ && a.cssTextAlignLastEnabled == b.cssTextAlignLastEnabled
+ && a.cssTextJustifyEnabled == b.cssTextJustifyEnabled
;
}
@@ -215,7 +219,10 @@
| context.subgridEnabled << 31
| (uint64_t)context.containIntrinsicSizeEnabled << 32
| (uint64_t)context.motionPathEnabled << 33
- | (uint64_t)context.mode << 34; // This is multiple bits, so keep it last.
+ | (uint64_t)context.cssTextAlignLastEnabled << 34
+ | (uint64_t)context.cssTextJustifyEnabled << 35
+ | (uint64_t)context.mode << 36; // This is multiple bits, so keep it last.
+
add(hasher, context.baseURL, context.charset, bits);
}
@@ -275,6 +282,10 @@
case CSSPropertyOffsetAnchor:
case CSSPropertyOffsetRotate:
return !motionPathEnabled;
+ case CSSPropertyWebkitTextAlignLast:
+ return !cssTextAlignLastEnabled;
+ case CSSPropertyWebkitTextJustify:
+ return !cssTextJustifyEnabled;
default:
return false;
}
Modified: trunk/Source/WebCore/css/parser/CSSParserContext.h (295009 => 295010)
--- trunk/Source/WebCore/css/parser/CSSParserContext.h 2022-05-29 05:09:11 UTC (rev 295009)
+++ trunk/Source/WebCore/css/parser/CSSParserContext.h 2022-05-29 07:57:37 UTC (rev 295010)
@@ -91,6 +91,8 @@
bool subgridEnabled { false };
bool containIntrinsicSizeEnabled { false };
bool motionPathEnabled { false };
+ bool cssTextAlignLastEnabled { false };
+ bool cssTextJustifyEnabled { false };
// RuntimeEnabledFeatures.
#if ENABLE(ATTACHMENT_ELEMENT)
Modified: trunk/Source/WebCore/css/parser/CSSParserFastPaths.cpp (295009 => 295010)
--- trunk/Source/WebCore/css/parser/CSSParserFastPaths.cpp 2022-05-29 05:09:11 UTC (rev 295009)
+++ trunk/Source/WebCore/css/parser/CSSParserFastPaths.cpp 2022-05-29 07:57:37 UTC (rev 295010)
@@ -716,21 +716,17 @@
return valueID == CSSValueAuto || valueID == CSSValueFixed;
case CSSPropertyTextAlign:
return (valueID >= CSSValueWebkitAuto && valueID <= CSSValueWebkitMatchParent) || valueID == CSSValueStart || valueID == CSSValueEnd;
-#if ENABLE(CSS3_TEXT)
case CSSPropertyWebkitTextAlignLast:
// auto | start | end | left | right | center | justify
return (valueID >= CSSValueLeft && valueID <= CSSValueJustify) || valueID == CSSValueStart || valueID == CSSValueEnd || valueID == CSSValueAuto;
-#endif
case CSSPropertyTextAnchor:
return valueID == CSSValueStart || valueID == CSSValueMiddle || valueID == CSSValueEnd;
case CSSPropertyTextDecorationStyle:
// solid | double | dotted | dashed | wavy
return valueID == CSSValueSolid || valueID == CSSValueDouble || valueID == CSSValueDotted || valueID == CSSValueDashed || valueID == CSSValueWavy;
-#if ENABLE(CSS3_TEXT)
case CSSPropertyWebkitTextJustify:
// auto | none | inter-word | distribute
return valueID == CSSValueInterWord || valueID == CSSValueDistribute || valueID == CSSValueAuto || valueID == CSSValueNone;
-#endif
case CSSPropertyTextOrientation:
// mixed | upright | sideways
return valueID == CSSValueMixed || valueID == CSSValueUpright || valueID == CSSValueSideways;
@@ -1046,10 +1042,8 @@
#if ENABLE(OVERFLOW_SCROLLING_TOUCH)
case CSSPropertyWebkitOverflowScrolling:
#endif
-#if ENABLE(CSS3_TEXT)
case CSSPropertyWebkitTextAlignLast:
case CSSPropertyWebkitTextJustify:
-#endif
#if PLATFORM(IOS_FAMILY)
// Apple specific property. This will never be standardized and is purely to
// support custom WebKit-based Apple applications.
Modified: trunk/Source/WebCore/rendering/LegacyLineLayout.cpp (295009 => 295010)
--- trunk/Source/WebCore/rendering/LegacyLineLayout.cpp 2022-05-29 05:09:11 UTC (rev 295009)
+++ trunk/Source/WebCore/rendering/LegacyLineLayout.cpp 2022-05-29 07:57:37 UTC (rev 295010)
@@ -360,18 +360,13 @@
return *overrideAlignment;
TextAlignMode alignment = style().textAlign();
-#if ENABLE(CSS3_TEXT)
TextJustify textJustify = style().textJustify();
if (alignment == TextAlignMode::Justify && textJustify == TextJustify::None)
return style().direction() == TextDirection::LTR ? TextAlignMode::Left : TextAlignMode::Right;
-#endif
if (endsWithSoftBreak)
return alignment;
-#if !ENABLE(CSS3_TEXT)
- return (alignment == TextAlignMode::Justify) ? TextAlignMode::Start : alignment;
-#else
if (alignment != TextAlignMode::Justify)
return alignment;
@@ -395,7 +390,6 @@
return TextAlignMode::Start;
}
return alignment;
-#endif
}
static void updateLogicalWidthForLeftAlignedBlock(bool isLeftToRightDirection, BidiRun* trailingSpaceRun, float& logicalLeft, float& totalLogicalWidth, float availableLogicalWidth)
Modified: trunk/Source/WebCore/rendering/style/RenderStyle.cpp (295009 => 295010)
--- trunk/Source/WebCore/rendering/style/RenderStyle.cpp 2022-05-29 05:09:11 UTC (rev 295009)
+++ trunk/Source/WebCore/rendering/style/RenderStyle.cpp 2022-05-29 07:57:37 UTC (rev 295010)
@@ -823,10 +823,8 @@
ASSERT(&first != &second);
if (first.indent != second.indent
-#if ENABLE(CSS3_TEXT)
|| first.textAlignLast != second.textAlignLast
|| first.textJustify != second.textJustify
-#endif
|| first.textIndentLine != second.textIndentLine
|| first.effectiveZoom != second.effectiveZoom
|| first.textZoom != second.textZoom
Modified: trunk/Source/WebCore/rendering/style/RenderStyle.h (295009 => 295010)
--- trunk/Source/WebCore/rendering/style/RenderStyle.h 2022-05-29 05:09:11 UTC (rev 295009)
+++ trunk/Source/WebCore/rendering/style/RenderStyle.h 2022-05-29 07:57:37 UTC (rev 295010)
@@ -389,10 +389,8 @@
TextIndentLine textIndentLine() const { return static_cast<TextIndentLine>(m_rareInheritedData->textIndentLine); }
TextIndentType textIndentType() const { return static_cast<TextIndentType>(m_rareInheritedData->textIndentType); }
-#if ENABLE(CSS3_TEXT)
TextAlignLast textAlignLast() const { return static_cast<TextAlignLast>(m_rareInheritedData->textAlignLast); }
TextJustify textJustify() const { return static_cast<TextJustify>(m_rareInheritedData->textJustify); }
-#endif
const Length& wordSpacing() const;
float letterSpacing() const;
@@ -1044,10 +1042,8 @@
void setTextIndentLine(TextIndentLine v) { SET_VAR(m_rareInheritedData, textIndentLine, static_cast<unsigned>(v)); }
void setTextIndentType(TextIndentType v) { SET_VAR(m_rareInheritedData, textIndentType, static_cast<unsigned>(v)); }
-#if ENABLE(CSS3_TEXT)
void setTextAlignLast(TextAlignLast v) { SET_VAR(m_rareInheritedData, textAlignLast, static_cast<unsigned>(v)); }
void setTextJustify(TextJustify v) { SET_VAR(m_rareInheritedData, textJustify, static_cast<unsigned>(v)); }
-#endif
#if ENABLE(TEXT_AUTOSIZING)
void setSpecifiedLineHeight(Length&&);
@@ -1778,10 +1774,8 @@
static TextIndentLine initialTextIndentLine() { return TextIndentLine::FirstLine; }
static TextIndentType initialTextIndentType() { return TextIndentType::Normal; }
-#if ENABLE(CSS3_TEXT)
static TextAlignLast initialTextAlignLast() { return TextAlignLast::Auto; }
static TextJustify initialTextJustify() { return TextJustify::Auto; }
-#endif
#if ENABLE(CURSOR_VISIBILITY)
static CursorVisibility initialCursorVisibility() { return CursorVisibility::Auto; }
Modified: trunk/Source/WebCore/rendering/style/RenderStyleConstants.h (295009 => 295010)
--- trunk/Source/WebCore/rendering/style/RenderStyleConstants.h 2022-05-29 05:09:11 UTC (rev 295009)
+++ trunk/Source/WebCore/rendering/style/RenderStyleConstants.h 2022-05-29 07:57:37 UTC (rev 295010)
@@ -752,7 +752,6 @@
Wavy
};
-#if ENABLE(CSS3_TEXT)
enum class TextAlignLast : uint8_t {
Auto,
Start,
@@ -769,7 +768,6 @@
InterWord,
Distribute
};
-#endif // CSS3_TEXT
enum class TextDecorationSkipInk : uint8_t {
None,
Modified: trunk/Source/WebCore/rendering/style/StyleRareInheritedData.cpp (295009 => 295010)
--- trunk/Source/WebCore/rendering/style/StyleRareInheritedData.cpp 2022-05-29 05:09:11 UTC (rev 295009)
+++ trunk/Source/WebCore/rendering/style/StyleRareInheritedData.cpp 2022-05-29 07:57:37 UTC (rev 295010)
@@ -117,10 +117,8 @@
, imageResolutionSource(RenderStyle::initialImageResolutionSource())
, imageResolutionSnap(RenderStyle::initialImageResolutionSnap())
#endif
-#if ENABLE(CSS3_TEXT)
, textAlignLast(static_cast<unsigned>(RenderStyle::initialTextAlignLast()))
, textJustify(static_cast<unsigned>(RenderStyle::initialTextJustify()))
-#endif
, textDecorationSkipInk(static_cast<unsigned>(RenderStyle::initialTextDecorationSkipInk()))
, textUnderlinePosition(static_cast<unsigned>(RenderStyle::initialTextUnderlinePosition()))
, rubyPosition(static_cast<unsigned>(RenderStyle::initialRubyPosition()))
@@ -215,10 +213,8 @@
, imageResolutionSource(o.imageResolutionSource)
, imageResolutionSnap(o.imageResolutionSnap)
#endif
-#if ENABLE(CSS3_TEXT)
, textAlignLast(o.textAlignLast)
, textJustify(o.textJustify)
-#endif
, textDecorationSkipInk(o.textDecorationSkipInk)
, textUnderlinePosition(o.textUnderlinePosition)
, rubyPosition(o.rubyPosition)
@@ -345,10 +341,8 @@
&& imageResolutionSnap == o.imageResolutionSnap
&& imageResolution == o.imageResolution
#endif
-#if ENABLE(CSS3_TEXT)
&& textAlignLast == o.textAlignLast
&& textJustify == o.textJustify
-#endif // CSS3_TEXT
&& textDecorationSkipInk == o.textDecorationSkipInk
&& textUnderlinePosition == o.textUnderlinePosition
&& rubyPosition == o.rubyPosition
Modified: trunk/Source/WebCore/rendering/style/StyleRareInheritedData.h (295009 => 295010)
--- trunk/Source/WebCore/rendering/style/StyleRareInheritedData.h 2022-05-29 05:09:11 UTC (rev 295009)
+++ trunk/Source/WebCore/rendering/style/StyleRareInheritedData.h 2022-05-29 07:57:37 UTC (rev 295010)
@@ -140,10 +140,8 @@
unsigned imageResolutionSource : 1; // ImageResolutionSource
unsigned imageResolutionSnap : 1; // ImageResolutionSnap
#endif
-#if ENABLE(CSS3_TEXT)
unsigned textAlignLast : 3; // TextAlignLast
unsigned textJustify : 2; // TextJustify
-#endif
unsigned textDecorationSkipInk : 2; // TextDecorationSkipInk
unsigned textUnderlinePosition : 2; // TextUnderlinePosition
unsigned rubyPosition : 2; // RubyPosition
Modified: trunk/Source/WebKitLegacy/win/WebPreferences.cpp (295009 => 295010)
--- trunk/Source/WebKitLegacy/win/WebPreferences.cpp 2022-05-29 05:09:11 UTC (rev 295009)
+++ trunk/Source/WebKitLegacy/win/WebPreferences.cpp 2022-05-29 07:57:37 UTC (rev 295010)
@@ -2649,3 +2649,13 @@
{
return boolValueForKey("WebKitCSSInputSecurityEnabled");
}
+
+bool WebPreferences::cssTextAlignLastEnabled()
+{
+ return boolValueForKey("WebKitCSSTextAlignLastEnabled");
+}
+
+bool WebPreferences::cssTextJustifyEnabled()
+{
+ return boolValueForKey("WebKitCSSTextJustifyEnabled");
+}
Modified: trunk/Source/WebKitLegacy/win/WebPreferences.h (295009 => 295010)
--- trunk/Source/WebKitLegacy/win/WebPreferences.h 2022-05-29 05:09:11 UTC (rev 295009)
+++ trunk/Source/WebKitLegacy/win/WebPreferences.h 2022-05-29 07:57:37 UTC (rev 295010)
@@ -350,6 +350,8 @@
bool cssGradientPremultipliedAlphaInterpolationEnabled();
bool mockScrollbarsControllerEnabled();
bool cssInputSecurityEnabled();
+ bool cssTextAlignLastEnabled();
+ bool cssTextJustifyEnabled();
private:
WebPreferences();
Modified: trunk/Source/WebKitLegacy/win/WebView.cpp (295009 => 295010)
--- trunk/Source/WebKitLegacy/win/WebView.cpp 2022-05-29 05:09:11 UTC (rev 295009)
+++ trunk/Source/WebKitLegacy/win/WebView.cpp 2022-05-29 07:57:37 UTC (rev 295010)
@@ -5414,6 +5414,8 @@
settings.setCSSGradientPremultipliedAlphaInterpolationEnabled(m_preferences->cssGradientPremultipliedAlphaInterpolationEnabled());
settings.setMockScrollbarsControllerEnabled(m_preferences->mockScrollbarsControllerEnabled());
settings.setCSSInputSecurityEnabled(m_preferences->cssInputSecurityEnabled());
+ settings.setCSSTextAlignLastEnabled(m_preferences->cssTextAlignLastEnabled());
+ settings.setCSSTextJustifyEnabled(m_preferences->cssTextJustifyEnabled());
return S_OK;
}
Modified: trunk/Source/cmake/OptionsWin.cmake (295009 => 295010)
--- trunk/Source/cmake/OptionsWin.cmake 2022-05-29 05:09:11 UTC (rev 295009)
+++ trunk/Source/cmake/OptionsWin.cmake 2022-05-29 07:57:37 UTC (rev 295010)
@@ -22,7 +22,6 @@
WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_API_TESTS PUBLIC ON)
WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_ATTACHMENT_ELEMENT PUBLIC ON)
WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_CHANNEL_MESSAGING PUBLIC ON)
-WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_CSS3_TEXT PUBLIC OFF)
WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_CSS_BOX_DECORATION_BREAK PUBLIC ON)
WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_CSS_SELECTORS_LEVEL4 PUBLIC ON)
WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_CURSOR_VISIBILITY PUBLIC ON)
Modified: trunk/Source/cmake/WebKitFeatures.cmake (295009 => 295010)
--- trunk/Source/cmake/WebKitFeatures.cmake 2022-05-29 05:09:11 UTC (rev 295009)
+++ trunk/Source/cmake/WebKitFeatures.cmake 2022-05-29 07:57:37 UTC (rev 295010)
@@ -119,7 +119,6 @@
WEBKIT_OPTION_DEFINE(ENABLE_CONTENT_EXTENSIONS "Toggle Content Extensions support" PRIVATE OFF)
WEBKIT_OPTION_DEFINE(ENABLE_CONTENT_FILTERING "Toggle content filtering support" PRIVATE OFF)
WEBKIT_OPTION_DEFINE(ENABLE_CONTEXT_MENUS "Toggle Context Menu support" PRIVATE ON)
- WEBKIT_OPTION_DEFINE(ENABLE_CSS3_TEXT "Toggle CSS3 Text support" PRIVATE OFF)
WEBKIT_OPTION_DEFINE(ENABLE_CSS_BOX_DECORATION_BREAK "Toggle CSS box-decoration-break support" PRIVATE ON)
WEBKIT_OPTION_DEFINE(ENABLE_CSS_COMPOSITING "Toggle CSS Compositing support" PRIVATE ON)
WEBKIT_OPTION_DEFINE(ENABLE_CSS_CONIC_GRADIENTS "Toggle CSS Conic Gradient support" PRIVATE OFF)
Modified: trunk/Source/cmake/tools/vsprops/FeatureDefines.props (295009 => 295010)
--- trunk/Source/cmake/tools/vsprops/FeatureDefines.props 2022-05-29 05:09:11 UTC (rev 295009)
+++ trunk/Source/cmake/tools/vsprops/FeatureDefines.props 2022-05-29 07:57:37 UTC (rev 295010)
@@ -6,7 +6,6 @@
<ENABLE_ATTACHMENT_ELEMENT>ENABLE_ATTACHMENT_ELEMENT</ENABLE_ATTACHMENT_ELEMENT>
<ENABLE_CHANNEL_MESSAGING>ENABLE_CHANNEL_MESSAGING</ENABLE_CHANNEL_MESSAGING>
<ENABLE_CSS3_CONDITIONAL_RULES>ENABLE_CSS3_CONDITIONAL_RULES</ENABLE_CSS3_CONDITIONAL_RULES>
- <ENABLE_CSS3_TEXT />
<ENABLE_CSS_BOX_DECORATION_BREAK>ENABLE_CSS_BOX_DECORATION_BREAK</ENABLE_CSS_BOX_DECORATION_BREAK>
<ENABLE_CSS_COMPOSITING />
<ENABLE_CSS_IMAGE_SET>ENABLE_CSS_IMAGE_SET</ENABLE_CSS_IMAGE_SET>
@@ -64,7 +63,7 @@
</PropertyGroup>
<ItemDefinitionGroup>
<ClCompile>
- <PreprocessorDefinitions>$(ENABLE_3D_TRANSFORMS);$(ENABLE_OVERFLOW_SCROLLING_TOUCH);$(ENABLE_ATTACHMENT_ELEMENT);$(ENABLE_CHANNEL_MESSAGING);$(ENABLE_CSS3_CONDITIONAL_RULES);$(ENABLE_CSS_IMAGE_SET);$(ENABLE_CSS3_TEXT);$(ENABLE_CSS_BOX_DECORATION_BREAK);$(ENABLE_CSS_SHADERS);$(ENABLE_CSS_COMPOSITING);$(ENABLE_CSS_SELECTORS_LEVEL4);$(ENABLE_CSS_SHAPE_INSIDE);$(ENABLE_CSS_TRANSFORMS_ANIMATIONS_TRANSITIONS_UNPREFIXED);$(ENABLE_CURSOR_VISIBILITY);$(ENABLE_CUSTOM_SCHEME_HANDLER);$(ENABLE_DARK_MODE_CSS);$(ENABLE_DATAGRID);$(ENABLE_DATALIST_ELEMENT);$(ENABLE_DEVICE_ORIENTATION);$(ENABLE_DIRECTORY_UPLOAD);$(ENABLE_ENCRYPTED_MEDIA);$(ENABLE_FETCH_API);$(ENABLE_FILE_SYSTEM);$(ENABLE_FULLSCREEN_API);$(ENABLE_GAMEPAD);$(ENABLE_GEOLOCATION);$(ENABLE_HIGH_DPI_CANVAS);$(ENABLE_INPUT_TYPE_COLOR);$(ENABLE_INPUT_SPEECH);$(ENABLE_INPUT_TYPE_DATE);$(ENABLE_INPUT_TYPE_DATETIMELOCAL);$(ENABLE_INPUT_TYPE_MONTH);$(ENABLE_INPUT_TYPE_TIME);$(ENABLE_INPUT_TYPE_WEEK);$(ENABLE_LEGACY_ENCR
YPTED_MEDIA);$(ENABLE_LINK_PRERENDER);$(ENABLE_MATHML);$(ENABLE_MICRODATA);$(ENABLE_MOUSE_CURSOR_SCALE);$(ENABLE_NOTIFICATIONS);$(ENABLE_SCRIPTED_SPEECH);$(ENABLE_SHARED_WORKERS);$(ENABLE_MEDIA_CONTROLS_SCRIPT);$(ENABLE_MEDIA_SOURCE);$(ENABLE_MEDIA_STATISTICS);$(ENABLE_SQL_DATABASE);$(ENABLE_STYLE_SCOPED);$(ENABLE_SUBPIXEL_LAYOUT);$(ENABLE_SVG_DOM_OBJC_BINDINGS);$(ENABLE_VIDEO);$(ENABLE_WEB_AUDIO);$(ENABLE_WEBGL);$(ENABLE_WEBXR);$(ENABLE_XHR_TIMEOUT);$(ENABLE_XSLT);%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions>$(ENABLE_3D_TRANSFORMS);$(ENABLE_OVERFLOW_SCROLLING_TOUCH);$(ENABLE_ATTACHMENT_ELEMENT);$(ENABLE_CHANNEL_MESSAGING);$(ENABLE_CSS3_CONDITIONAL_RULES);$(ENABLE_CSS_IMAGE_SET);$(ENABLE_CSS_BOX_DECORATION_BREAK);$(ENABLE_CSS_SHADERS);$(ENABLE_CSS_COMPOSITING);$(ENABLE_CSS_SELECTORS_LEVEL4);$(ENABLE_CSS_SHAPE_INSIDE);$(ENABLE_CSS_TRANSFORMS_ANIMATIONS_TRANSITIONS_UNPREFIXED);$(ENABLE_CURSOR_VISIBILITY);$(ENABLE_CUSTOM_SCHEME_HANDLER);$(ENABLE_DARK_MODE_CSS);$(ENABLE_DATAGRID);$(ENABLE_DATALIST_ELEMENT);$(ENABLE_DEVICE_ORIENTATION);$(ENABLE_DIRECTORY_UPLOAD);$(ENABLE_ENCRYPTED_MEDIA);$(ENABLE_FETCH_API);$(ENABLE_FILE_SYSTEM);$(ENABLE_FULLSCREEN_API);$(ENABLE_GAMEPAD);$(ENABLE_GEOLOCATION);$(ENABLE_HIGH_DPI_CANVAS);$(ENABLE_INPUT_TYPE_COLOR);$(ENABLE_INPUT_SPEECH);$(ENABLE_INPUT_TYPE_DATE);$(ENABLE_INPUT_TYPE_DATETIMELOCAL);$(ENABLE_INPUT_TYPE_MONTH);$(ENABLE_INPUT_TYPE_TIME);$(ENABLE_INPUT_TYPE_WEEK);$(ENABLE_LEGACY_ENCRYPTED_MEDIA);$(ENABLE
_LINK_PRERENDER);$(ENABLE_MATHML);$(ENABLE_MICRODATA);$(ENABLE_MOUSE_CURSOR_SCALE);$(ENABLE_NOTIFICATIONS);$(ENABLE_SCRIPTED_SPEECH);$(ENABLE_SHARED_WORKERS);$(ENABLE_MEDIA_CONTROLS_SCRIPT);$(ENABLE_MEDIA_SOURCE);$(ENABLE_MEDIA_STATISTICS);$(ENABLE_SQL_DATABASE);$(ENABLE_STYLE_SCOPED);$(ENABLE_SUBPIXEL_LAYOUT);$(ENABLE_SVG_DOM_OBJC_BINDINGS);$(ENABLE_VIDEO);$(ENABLE_WEB_AUDIO);$(ENABLE_WEBGL);$(ENABLE_WEBXR);$(ENABLE_XHR_TIMEOUT);$(ENABLE_XSLT);%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
</ItemDefinitionGroup>
<ItemGroup>
@@ -88,10 +87,6 @@
<Value>$(ENABLE_CSS3_CONDITIONAL_RULES)</Value>
<EnvironmentVariable>true</EnvironmentVariable>
</BuildMacro>
- <BuildMacro Include="ENABLE_CSS3_TEXT">
- <Value>$(ENABLE_CSS3_TEXT)</Value>
- <EnvironmentVariable>true</EnvironmentVariable>
- </BuildMacro>
<BuildMacro Include="ENABLE_CSS_BOX_DECORATION_BREAK">
<Value>$(ENABLE_CSS_BOX_DECORATION_BREAK)</Value>
<EnvironmentVariable>true</EnvironmentVariable>
Modified: trunk/Source/cmake/tools/vsprops/FeatureDefinesCairo.props (295009 => 295010)
--- trunk/Source/cmake/tools/vsprops/FeatureDefinesCairo.props 2022-05-29 05:09:11 UTC (rev 295009)
+++ trunk/Source/cmake/tools/vsprops/FeatureDefinesCairo.props 2022-05-29 07:57:37 UTC (rev 295010)
@@ -6,7 +6,6 @@
<ENABLE_ATTACHMENT_ELEMENT>ENABLE_ATTACHMENT_ELEMENT</ENABLE_ATTACHMENT_ELEMENT>
<ENABLE_CHANNEL_MESSAGING>ENABLE_CHANNEL_MESSAGING</ENABLE_CHANNEL_MESSAGING>
<ENABLE_CSS3_CONDITIONAL_RULES>ENABLE_CSS3_CONDITIONAL_RULES</ENABLE_CSS3_CONDITIONAL_RULES>
- <ENABLE_CSS3_TEXT />
<ENABLE_CSS_BOX_DECORATION_BREAK>ENABLE_CSS_BOX_DECORATION_BREAK</ENABLE_CSS_BOX_DECORATION_BREAK>
<ENABLE_CSS_COMPOSITING />
<ENABLE_CSS_IMAGE_SET>ENABLE_CSS_IMAGE_SET</ENABLE_CSS_IMAGE_SET>
@@ -64,7 +63,7 @@
</PropertyGroup>
<ItemDefinitionGroup>
<ClCompile>
- <PreprocessorDefinitions>$(ENABLE_3D_TRANSFORMS);$(ENABLE_OVERFLOW_SCROLLING_TOUCH);$(ENABLE_ATTACHMENT_ELEMENT);$(ENABLE_CHANNEL_MESSAGING);$(ENABLE_CSS3_CONDITIONAL_RULES);$(ENABLE_CSS_IMAGE_SET);$(ENABLE_CSS3_TEXT);$(ENABLE_CSS_BOX_DECORATION_BREAK);$(ENABLE_CSS_SHADERS);$(ENABLE_CSS_COMPOSITING);$(ENABLE_CSS_SELECTORS_LEVEL4);$(ENABLE_CSS_SHAPE_INSIDE);$(ENABLE_CSS_TRANSFORMS_ANIMATIONS_TRANSITIONS_UNPREFIXED);$(ENABLE_CURSOR_VISIBILITY);$(ENABLE_CUSTOM_SCHEME_HANDLER);$(ENABLE_DARK_MODE_CSS);$(ENABLE_DATAGRID);$(ENABLE_DATALIST_ELEMENT);$(ENABLE_DEVICE_ORIENTATION);$(ENABLE_DIRECTORY_UPLOAD);$(ENABLE_ENCRYPTED_MEDIA);$(ENABLE_FETCH_API);$(ENABLE_FILE_SYSTEM);$(ENABLE_FULLSCREEN_API);$(ENABLE_GAMEPAD);$(ENABLE_GEOLOCATION);$(ENABLE_HIGH_DPI_CANVAS);$(ENABLE_INPUT_TYPE_COLOR);$(ENABLE_INPUT_SPEECH);$(ENABLE_INPUT_TYPE_DATE);$(ENABLE_INPUT_TYPE_DATETIMELOCAL);$(ENABLE_INPUT_TYPE_MONTH);$(ENABLE_INPUT_TYPE_TIME);$(ENABLE_INPUT_TYPE_WEEK);$(ENABLE_LEGACY_ENCR
YPTED_MEDIA);$(ENABLE_LINK_PRERENDER);$(ENABLE_MATHML);$(ENABLE_MICRODATA);$(ENABLE_MOUSE_CURSOR_SCALE);$(ENABLE_NOTIFICATIONS);$(ENABLE_SCRIPTED_SPEECH);$(ENABLE_SHARED_WORKERS);$(ENABLE_MEDIA_CONTROLS_SCRIPT);$(ENABLE_MEDIA_SOURCE);$(ENABLE_MEDIA_STATISTICS);$(ENABLE_SQL_DATABASE);$(ENABLE_STYLE_SCOPED);$(ENABLE_SUBPIXEL_LAYOUT);$(ENABLE_SVG_DOM_OBJC_BINDINGS);$(ENABLE_VIDEO);$(ENABLE_WEB_AUDIO);$(ENABLE_WEBGL);$(ENABLE_WEBXR);$(ENABLE_XHR_TIMEOUT);$(ENABLE_XSLT);%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions>$(ENABLE_3D_TRANSFORMS);$(ENABLE_OVERFLOW_SCROLLING_TOUCH);$(ENABLE_ATTACHMENT_ELEMENT);$(ENABLE_CHANNEL_MESSAGING);$(ENABLE_CSS3_CONDITIONAL_RULES);$(ENABLE_CSS_IMAGE_SET);$(ENABLE_CSS_BOX_DECORATION_BREAK);$(ENABLE_CSS_SHADERS);$(ENABLE_CSS_COMPOSITING);$(ENABLE_CSS_SELECTORS_LEVEL4);$(ENABLE_CSS_SHAPE_INSIDE);$(ENABLE_CSS_TRANSFORMS_ANIMATIONS_TRANSITIONS_UNPREFIXED);$(ENABLE_CURSOR_VISIBILITY);$(ENABLE_CUSTOM_SCHEME_HANDLER);$(ENABLE_DARK_MODE_CSS);$(ENABLE_DATAGRID);$(ENABLE_DATALIST_ELEMENT);$(ENABLE_DEVICE_ORIENTATION);$(ENABLE_DIRECTORY_UPLOAD);$(ENABLE_ENCRYPTED_MEDIA);$(ENABLE_FETCH_API);$(ENABLE_FILE_SYSTEM);$(ENABLE_FULLSCREEN_API);$(ENABLE_GAMEPAD);$(ENABLE_GEOLOCATION);$(ENABLE_HIGH_DPI_CANVAS);$(ENABLE_INPUT_TYPE_COLOR);$(ENABLE_INPUT_SPEECH);$(ENABLE_INPUT_TYPE_DATE);$(ENABLE_INPUT_TYPE_DATETIMELOCAL);$(ENABLE_INPUT_TYPE_MONTH);$(ENABLE_INPUT_TYPE_TIME);$(ENABLE_INPUT_TYPE_WEEK);$(ENABLE_LEGACY_ENCRYPTED_MEDIA);$(ENABLE
_LINK_PRERENDER);$(ENABLE_MATHML);$(ENABLE_MICRODATA);$(ENABLE_MOUSE_CURSOR_SCALE);$(ENABLE_NOTIFICATIONS);$(ENABLE_SCRIPTED_SPEECH);$(ENABLE_SHARED_WORKERS);$(ENABLE_MEDIA_CONTROLS_SCRIPT);$(ENABLE_MEDIA_SOURCE);$(ENABLE_MEDIA_STATISTICS);$(ENABLE_SQL_DATABASE);$(ENABLE_STYLE_SCOPED);$(ENABLE_SUBPIXEL_LAYOUT);$(ENABLE_SVG_DOM_OBJC_BINDINGS);$(ENABLE_VIDEO);$(ENABLE_WEB_AUDIO);$(ENABLE_WEBGL);$(ENABLE_WEBXR);$(ENABLE_XHR_TIMEOUT);$(ENABLE_XSLT);%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
</ItemDefinitionGroup>
<ItemGroup>
@@ -88,10 +87,6 @@
<Value>$(ENABLE_CSS3_CONDITIONAL_RULES)</Value>
<EnvironmentVariable>true</EnvironmentVariable>
</BuildMacro>
- <BuildMacro Include="ENABLE_CSS3_TEXT">
- <Value>$(ENABLE_CSS3_TEXT)</Value>
- <EnvironmentVariable>true</EnvironmentVariable>
- </BuildMacro>
<BuildMacro Include="ENABLE_CSS_BOX_DECORATION_BREAK">
<Value>$(ENABLE_CSS_BOX_DECORATION_BREAK)</Value>
<EnvironmentVariable>true</EnvironmentVariable>
Modified: trunk/Tools/DumpRenderTree/TestOptions.cpp (295009 => 295010)
--- trunk/Tools/DumpRenderTree/TestOptions.cpp 2022-05-29 05:09:11 UTC (rev 295009)
+++ trunk/Tools/DumpRenderTree/TestOptions.cpp 2022-05-29 07:57:37 UTC (rev 295010)
@@ -136,6 +136,8 @@
{ "CSSInputSecurityEnabled", true },
{ "CSSLogicalEnabled", false },
{ "CSSOMViewSmoothScrollingEnabled", false },
+ { "CSSTextAlignLastEnabled", true },
+ { "CSSTextJustifyEnabled", true },
{ "CanvasColorSpaceEnabled", true },
{ "ColorFilterEnabled", false },
{ "ContactPickerAPIEnabled", false },
Modified: trunk/Tools/Scripts/webkitperl/FeatureList.pm (295009 => 295010)
--- trunk/Tools/Scripts/webkitperl/FeatureList.pm 2022-05-29 05:09:11 UTC (rev 295009)
+++ trunk/Tools/Scripts/webkitperl/FeatureList.pm 2022-05-29 07:57:37 UTC (rev 295010)
@@ -66,7 +66,6 @@
$contentExtensionsSupport,
$contentFilteringSupport,
$contextMenusSupport,
- $css3TextSupport,
$cssBoxDecorationBreakSupport,
$cssCompositingSupport,
$cssConicGradientsSupport,
@@ -236,9 +235,6 @@
{ option => "context-menus", desc => "Toggle Context Menu support",
define => "ENABLE_CONTEXT_MENUS", value => \$contextMenusSupport },
- { option => "css3-text", desc => "Toggle CSS3 Text support",
- define => "ENABLE_CSS3_TEXT", value => \$css3TextSupport },
-
{ option => "css-box-decoration-break", desc => "Toggle CSS box-decoration-break support",
define => "ENABLE_CSS_BOX_DECORATION_BREAK", value => \$cssBoxDecorationBreakSupport },
