Diff
Modified: trunk/LayoutTests/ChangeLog (293520 => 293521)
--- trunk/LayoutTests/ChangeLog 2022-04-27 18:37:45 UTC (rev 293520)
+++ trunk/LayoutTests/ChangeLog 2022-04-27 18:56:04 UTC (rev 293521)
@@ -1,3 +1,25 @@
+2022-04-27 Tim Nguyen <[email protected]>
+
+ [css-text] Make word-wrap CSS property an alias of overflow-wrap
+ https://bugs.webkit.org/show_bug.cgi?id=166782
+
+ Reviewed by Antti Koivisto.
+
+ This follows the spec, and fixes cascade issues when applying both properties (see bug 239579).
+
+ Relevant WPT expectations updated to pass.
+
+ * fast/css/getComputedStyle/computed-style-expected.txt:
+ * fast/css/getComputedStyle/computed-style-without-renderer-expected.txt:
+ * platform/gtk/imported/w3c/web-platform-tests/css/css-cascade/all-prop-initial-xml-expected.txt:
+ * platform/gtk/imported/w3c/web-platform-tests/css/cssom/getComputedStyle-detached-subtree-expected.txt:
+ * platform/ios/imported/w3c/web-platform-tests/css/css-cascade/all-prop-initial-xml-expected.txt:
+ * platform/ios/imported/w3c/web-platform-tests/css/cssom/getComputedStyle-detached-subtree-expected.txt:
+ * platform/mac-wk1/imported/w3c/web-platform-tests/css/css-cascade/all-prop-revert-layer-expected.txt:
+ * platform/wpe/imported/w3c/web-platform-tests/css/css-cascade/all-prop-initial-xml-expected.txt:
+ * platform/wpe/imported/w3c/web-platform-tests/css/cssom/getComputedStyle-detached-subtree-expected.txt:
+ * svg/css/getComputedStyle-basic-expected.txt:
+
2022-04-27 Truitt Savell <[email protected]>
Cleanup expectations for 7 imported/w3c/web-platform-tests/html/semantics/interactive-elements/ tests
Modified: trunk/LayoutTests/fast/css/getComputedStyle/computed-style-expected.txt (293520 => 293521)
--- trunk/LayoutTests/fast/css/getComputedStyle/computed-style-expected.txt 2022-04-27 18:37:45 UTC (rev 293520)
+++ trunk/LayoutTests/fast/css/getComputedStyle/computed-style-expected.txt 2022-04-27 18:56:04 UTC (rev 293521)
@@ -203,7 +203,6 @@
will-change: auto;
word-break: normal;
word-spacing: 0px;
-word-wrap: normal;
writing-mode: horizontal-tb;
z-index: auto;
zoom: 1;
Modified: trunk/LayoutTests/fast/css/getComputedStyle/computed-style-without-renderer-expected.txt (293520 => 293521)
--- trunk/LayoutTests/fast/css/getComputedStyle/computed-style-without-renderer-expected.txt 2022-04-27 18:37:45 UTC (rev 293520)
+++ trunk/LayoutTests/fast/css/getComputedStyle/computed-style-without-renderer-expected.txt 2022-04-27 18:56:04 UTC (rev 293521)
@@ -202,7 +202,6 @@
will-change: auto
word-break: normal
word-spacing: 0px
-word-wrap: normal
writing-mode: horizontal-tb
z-index: auto
zoom: 1
Modified: trunk/LayoutTests/imported/w3c/ChangeLog (293520 => 293521)
--- trunk/LayoutTests/imported/w3c/ChangeLog 2022-04-27 18:37:45 UTC (rev 293520)
+++ trunk/LayoutTests/imported/w3c/ChangeLog 2022-04-27 18:56:04 UTC (rev 293521)
@@ -1,3 +1,19 @@
+2022-04-27 Tim Nguyen <[email protected]>
+
+ [css-text] Make word-wrap CSS property an alias of overflow-wrap
+ https://bugs.webkit.org/show_bug.cgi?id=166782
+
+ Reviewed by Antti Koivisto.
+
+ This follows the spec, and fixes cascade issues when applying both properties (see bug 239579).
+
+ Relevant WPT expectations updated to pass.
+
+ * web-platform-tests/css/css-cascade/all-prop-initial-xml-expected.txt:
+ * web-platform-tests/css/css-cascade/all-prop-revert-layer-expected.txt:
+ * web-platform-tests/css/css-text/overflow-wrap/word-wrap-alias-expected.txt:
+ * web-platform-tests/css/cssom/getComputedStyle-detached-subtree-expected.txt:
+
2022-04-27 Ziran Sun <[email protected]>
[css-ui] Remove some unimplemented -webkit-appearance keywords
Modified: trunk/LayoutTests/imported/w3c/web-platform-tests/css/css-cascade/all-prop-initial-xml-expected.txt (293520 => 293521)
--- trunk/LayoutTests/imported/w3c/web-platform-tests/css/css-cascade/all-prop-initial-xml-expected.txt 2022-04-27 18:37:45 UTC (rev 293520)
+++ trunk/LayoutTests/imported/w3c/web-platform-tests/css/css-cascade/all-prop-initial-xml-expected.txt 2022-04-27 18:56:04 UTC (rev 293521)
@@ -332,7 +332,6 @@
PASS will-change
PASS word-break
PASS word-spacing
-PASS word-wrap
PASS writing-mode
PASS x
PASS y
Modified: trunk/LayoutTests/imported/w3c/web-platform-tests/css/css-cascade/all-prop-revert-layer-expected.txt (293520 => 293521)
--- trunk/LayoutTests/imported/w3c/web-platform-tests/css/css-cascade/all-prop-revert-layer-expected.txt 2022-04-27 18:37:45 UTC (rev 293520)
+++ trunk/LayoutTests/imported/w3c/web-platform-tests/css/css-cascade/all-prop-revert-layer-expected.txt 2022-04-27 18:56:04 UTC (rev 293521)
@@ -216,7 +216,7 @@
PASS outline-offset
PASS outline-style
PASS outline-width
-FAIL overflow-wrap assert_not_equals: Should get a different computed value. got disallowed value "normal"
+PASS overflow-wrap
PASS overflow-x
PASS overflow-y
PASS overscroll-behavior-x
@@ -327,7 +327,6 @@
PASS will-change
PASS word-break
PASS word-spacing
-PASS word-wrap
PASS writing-mode
PASS x
PASS y
Modified: trunk/LayoutTests/imported/w3c/web-platform-tests/css/css-text/overflow-wrap/word-wrap-alias-expected.txt (293520 => 293521)
--- trunk/LayoutTests/imported/w3c/web-platform-tests/css/css-text/overflow-wrap/word-wrap-alias-expected.txt 2022-04-27 18:37:45 UTC (rev 293520)
+++ trunk/LayoutTests/imported/w3c/web-platform-tests/css/css-text/overflow-wrap/word-wrap-alias-expected.txt 2022-04-27 18:56:04 UTC (rev 293521)
@@ -1,3 +1,3 @@
-FAIL word-wrap should be defined as an alias of overflow-wrap assert_equals: Only overflow-wrap should appear when serializing the declaration. expected "overflow-wrap: break-word;" but got "word-wrap: break-word; overflow-wrap: break-word;"
+PASS word-wrap should be defined as an alias of overflow-wrap
Modified: trunk/LayoutTests/imported/w3c/web-platform-tests/css/cssom/getComputedStyle-detached-subtree-expected.txt (293520 => 293521)
--- trunk/LayoutTests/imported/w3c/web-platform-tests/css/cssom/getComputedStyle-detached-subtree-expected.txt 2022-04-27 18:37:45 UTC (rev 293520)
+++ trunk/LayoutTests/imported/w3c/web-platform-tests/css/cssom/getComputedStyle-detached-subtree-expected.txt 2022-04-27 18:56:04 UTC (rev 293521)
@@ -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 400
-FAIL getComputedStyle returns no style for element in non-rendered iframe (display: none) from iframe's window assert_equals: expected 0 but got 400
-FAIL getComputedStyle returns no style for element outside the flat tree assert_equals: expected 0 but got 400
-FAIL getComputedStyle returns no style for descendant outside the flat tree assert_equals: expected 0 but got 400
+FAIL getComputedStyle returns no style for element in non-rendered iframe (display: none) assert_equals: expected 0 but got 399
+FAIL getComputedStyle returns no style for element in non-rendered iframe (display: none) from iframe's window assert_equals: expected 0 but got 399
+FAIL getComputedStyle returns no style for element outside the flat tree assert_equals: expected 0 but got 399
+FAIL getComputedStyle returns no style for descendant outside the flat tree assert_equals: expected 0 but got 399
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 (293520 => 293521)
--- trunk/LayoutTests/platform/gtk/imported/w3c/web-platform-tests/css/css-cascade/all-prop-initial-xml-expected.txt 2022-04-27 18:37:45 UTC (rev 293520)
+++ trunk/LayoutTests/platform/gtk/imported/w3c/web-platform-tests/css/css-cascade/all-prop-initial-xml-expected.txt 2022-04-27 18:56:04 UTC (rev 293521)
@@ -332,7 +332,6 @@
PASS will-change
PASS word-break
PASS word-spacing
-PASS word-wrap
PASS writing-mode
PASS x
PASS y
Modified: trunk/LayoutTests/platform/gtk/imported/w3c/web-platform-tests/css/cssom/getComputedStyle-detached-subtree-expected.txt (293520 => 293521)
--- trunk/LayoutTests/platform/gtk/imported/w3c/web-platform-tests/css/cssom/getComputedStyle-detached-subtree-expected.txt 2022-04-27 18:37:45 UTC (rev 293520)
+++ trunk/LayoutTests/platform/gtk/imported/w3c/web-platform-tests/css/cssom/getComputedStyle-detached-subtree-expected.txt 2022-04-27 18:56:04 UTC (rev 293521)
@@ -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 398
-FAIL getComputedStyle returns no style for element in non-rendered iframe (display: none) from iframe's window assert_equals: expected 0 but got 398
-FAIL getComputedStyle returns no style for element outside the flat tree assert_equals: expected 0 but got 398
-FAIL getComputedStyle returns no style for descendant outside the flat tree assert_equals: expected 0 but got 398
+FAIL getComputedStyle returns no style for element in non-rendered iframe (display: none) assert_equals: expected 0 but got 397
+FAIL getComputedStyle returns no style for element in non-rendered iframe (display: none) from iframe's window assert_equals: expected 0 but got 397
+FAIL getComputedStyle returns no style for element outside the flat tree assert_equals: expected 0 but got 397
+FAIL getComputedStyle returns no style for descendant outside the flat tree assert_equals: expected 0 but got 397
PASS getComputedStyle returns no style for shadow tree outside of flattened tree
Modified: trunk/LayoutTests/platform/ios/imported/w3c/web-platform-tests/css/css-cascade/all-prop-initial-xml-expected.txt (293520 => 293521)
--- trunk/LayoutTests/platform/ios/imported/w3c/web-platform-tests/css/css-cascade/all-prop-initial-xml-expected.txt 2022-04-27 18:37:45 UTC (rev 293520)
+++ trunk/LayoutTests/platform/ios/imported/w3c/web-platform-tests/css/css-cascade/all-prop-initial-xml-expected.txt 2022-04-27 18:56:04 UTC (rev 293521)
@@ -300,7 +300,6 @@
PASS will-change
PASS word-break
PASS word-spacing
-PASS word-wrap
PASS writing-mode
PASS x
PASS y
Modified: trunk/LayoutTests/platform/ios/imported/w3c/web-platform-tests/css/cssom/getComputedStyle-detached-subtree-expected.txt (293520 => 293521)
--- trunk/LayoutTests/platform/ios/imported/w3c/web-platform-tests/css/cssom/getComputedStyle-detached-subtree-expected.txt 2022-04-27 18:37:45 UTC (rev 293520)
+++ trunk/LayoutTests/platform/ios/imported/w3c/web-platform-tests/css/cssom/getComputedStyle-detached-subtree-expected.txt 2022-04-27 18:56:04 UTC (rev 293521)
@@ -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 402
-FAIL getComputedStyle returns no style for element in non-rendered iframe (display: none) from iframe's window assert_equals: expected 0 but got 402
-FAIL getComputedStyle returns no style for element outside the flat tree assert_equals: expected 0 but got 402
-FAIL getComputedStyle returns no style for descendant outside the flat tree assert_equals: expected 0 but got 402
+FAIL getComputedStyle returns no style for element in non-rendered iframe (display: none) assert_equals: expected 0 but got 401
+FAIL getComputedStyle returns no style for element in non-rendered iframe (display: none) from iframe's window assert_equals: expected 0 but got 401
+FAIL getComputedStyle returns no style for element outside the flat tree assert_equals: expected 0 but got 401
+FAIL getComputedStyle returns no style for descendant outside the flat tree assert_equals: expected 0 but got 401
PASS getComputedStyle returns no style for shadow tree outside of flattened tree
Modified: trunk/LayoutTests/platform/mac-wk1/imported/w3c/web-platform-tests/css/css-cascade/all-prop-revert-layer-expected.txt (293520 => 293521)
--- trunk/LayoutTests/platform/mac-wk1/imported/w3c/web-platform-tests/css/css-cascade/all-prop-revert-layer-expected.txt 2022-04-27 18:37:45 UTC (rev 293520)
+++ trunk/LayoutTests/platform/mac-wk1/imported/w3c/web-platform-tests/css/css-cascade/all-prop-revert-layer-expected.txt 2022-04-27 18:56:04 UTC (rev 293521)
@@ -216,7 +216,7 @@
PASS outline-offset
PASS outline-style
PASS outline-width
-FAIL overflow-wrap assert_not_equals: Should get a different computed value. got disallowed value "normal"
+PASS overflow-wrap
PASS overflow-x
PASS overflow-y
PASS overscroll-behavior-x
@@ -326,7 +326,6 @@
PASS will-change
PASS word-break
PASS word-spacing
-PASS word-wrap
PASS writing-mode
PASS x
PASS y
Modified: trunk/LayoutTests/platform/wpe/imported/w3c/web-platform-tests/css/css-cascade/all-prop-initial-xml-expected.txt (293520 => 293521)
--- trunk/LayoutTests/platform/wpe/imported/w3c/web-platform-tests/css/css-cascade/all-prop-initial-xml-expected.txt 2022-04-27 18:37:45 UTC (rev 293520)
+++ trunk/LayoutTests/platform/wpe/imported/w3c/web-platform-tests/css/css-cascade/all-prop-initial-xml-expected.txt 2022-04-27 18:56:04 UTC (rev 293521)
@@ -332,7 +332,6 @@
PASS will-change
PASS word-break
PASS word-spacing
-PASS word-wrap
PASS writing-mode
PASS x
PASS y
Modified: trunk/LayoutTests/platform/wpe/imported/w3c/web-platform-tests/css/cssom/getComputedStyle-detached-subtree-expected.txt (293520 => 293521)
--- trunk/LayoutTests/platform/wpe/imported/w3c/web-platform-tests/css/cssom/getComputedStyle-detached-subtree-expected.txt 2022-04-27 18:37:45 UTC (rev 293520)
+++ trunk/LayoutTests/platform/wpe/imported/w3c/web-platform-tests/css/cssom/getComputedStyle-detached-subtree-expected.txt 2022-04-27 18:56:04 UTC (rev 293521)
@@ -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 397
-FAIL getComputedStyle returns no style for element in non-rendered iframe (display: none) from iframe's window assert_equals: expected 0 but got 397
-FAIL getComputedStyle returns no style for element outside the flat tree assert_equals: expected 0 but got 397
-FAIL getComputedStyle returns no style for descendant outside the flat tree assert_equals: expected 0 but got 397
+FAIL getComputedStyle returns no style for element in non-rendered iframe (display: none) assert_equals: expected 0 but got 396
+FAIL getComputedStyle returns no style for element in non-rendered iframe (display: none) from iframe's window assert_equals: expected 0 but got 396
+FAIL getComputedStyle returns no style for element outside the flat tree assert_equals: expected 0 but got 396
+FAIL getComputedStyle returns no style for descendant outside the flat tree assert_equals: expected 0 but got 396
PASS getComputedStyle returns no style for shadow tree outside of flattened tree
Modified: trunk/LayoutTests/svg/css/getComputedStyle-basic-expected.txt (293520 => 293521)
--- trunk/LayoutTests/svg/css/getComputedStyle-basic-expected.txt 2022-04-27 18:37:45 UTC (rev 293520)
+++ trunk/LayoutTests/svg/css/getComputedStyle-basic-expected.txt 2022-04-27 18:56:04 UTC (rev 293521)
@@ -404,8 +404,6 @@
rect: style.getPropertyCSSValue(word-break) : [object CSSPrimitiveValue]
rect: style.getPropertyValue(word-spacing) : 0px
rect: style.getPropertyCSSValue(word-spacing) : [object CSSPrimitiveValue]
-rect: style.getPropertyValue(word-wrap) : normal
-rect: style.getPropertyCSSValue(word-wrap) : [object CSSPrimitiveValue]
rect: style.getPropertyValue(writing-mode) : horizontal-tb
rect: style.getPropertyCSSValue(writing-mode) : [object CSSPrimitiveValue]
rect: style.getPropertyValue(z-index) : auto
@@ -918,8 +916,6 @@
g: style.getPropertyCSSValue(word-break) : [object CSSPrimitiveValue]
g: style.getPropertyValue(word-spacing) : 0px
g: style.getPropertyCSSValue(word-spacing) : [object CSSPrimitiveValue]
-g: style.getPropertyValue(word-wrap) : normal
-g: style.getPropertyCSSValue(word-wrap) : [object CSSPrimitiveValue]
g: style.getPropertyValue(writing-mode) : horizontal-tb
g: style.getPropertyCSSValue(writing-mode) : [object CSSPrimitiveValue]
g: style.getPropertyValue(z-index) : auto
Modified: trunk/Source/WebCore/ChangeLog (293520 => 293521)
--- trunk/Source/WebCore/ChangeLog 2022-04-27 18:37:45 UTC (rev 293520)
+++ trunk/Source/WebCore/ChangeLog 2022-04-27 18:56:04 UTC (rev 293521)
@@ -1,3 +1,29 @@
+2022-04-27 Tim Nguyen <[email protected]>
+
+ [css-text] Make word-wrap CSS property an alias of overflow-wrap
+ https://bugs.webkit.org/show_bug.cgi?id=166782
+
+ Reviewed by Antti Koivisto.
+
+ This follows the spec, and fixes cascade issues when applying both properties (see bug 239579).
+
+ Relevant WPT expectations updated to pass.
+
+ * animation/CSSPropertyAnimation.cpp:
+ (WebCore::CSSPropertyAnimationWrapperMap::CSSPropertyAnimationWrapperMap):
+ * css/CSSComputedStyleDeclaration.cpp:
+ (WebCore::ComputedStyleExtractor::valueForPropertyInStyle):
+ * css/CSSProperties.json:
+ * css/parser/CSSParserFastPaths.cpp:
+ (WebCore::CSSParserFastPaths::isValidKeywordPropertyAndValue):
+ (WebCore::CSSParserFastPaths::isKeywordPropertyID):
+ * editing/Editor.cpp:
+ (WebCore::Editor::applyEditingStyleToBodyElement const):
+ * html/HTMLElement.cpp:
+ (WebCore::HTMLElement::collectPresentationalHintsForAttribute):
+ * html/HTMLTextAreaElement.cpp:
+ (WebCore::HTMLTextAreaElement::collectPresentationalHintsForAttribute):
+
2022-04-27 Youenn Fablet <[email protected]>
[Mac] http/tests/media/user-gesture-preserved-across-xmlhttprequest.html is a flaky fail/crash/timeout
Modified: trunk/Source/WebCore/animation/CSSPropertyAnimation.cpp (293520 => 293521)
--- trunk/Source/WebCore/animation/CSSPropertyAnimation.cpp 2022-04-27 18:37:45 UTC (rev 293520)
+++ trunk/Source/WebCore/animation/CSSPropertyAnimation.cpp 2022-04-27 18:56:04 UTC (rev 293521)
@@ -3587,7 +3587,6 @@
case CSSPropertyUnicodeBidi:
case CSSPropertyUnicodeRange:
case CSSPropertyWillChange:
- case CSSPropertyWordWrap:
#if ENABLE(APPLE_PAY)
case CSSPropertyApplePayButtonStyle:
case CSSPropertyApplePayButtonType:
Modified: trunk/Source/WebCore/css/CSSComputedStyleDeclaration.cpp (293520 => 293521)
--- trunk/Source/WebCore/css/CSSComputedStyleDeclaration.cpp 2022-04-27 18:37:45 UTC (rev 293520)
+++ trunk/Source/WebCore/css/CSSComputedStyleDeclaration.cpp 2022-04-27 18:56:04 UTC (rev 293521)
@@ -3673,8 +3673,6 @@
return cssValuePool.createValue(style.wordBreak());
case CSSPropertyWordSpacing:
return zoomAdjustedPixelValue(style.fontCascade().wordSpacing(), style);
- case CSSPropertyWordWrap:
- return cssValuePool.createValue(style.overflowWrap());
case CSSPropertyLineBreak:
return cssValuePool.createValue(style.lineBreak());
case CSSPropertyWebkitNbspMode:
Modified: trunk/Source/WebCore/css/CSSProperties.json (293520 => 293521)
--- trunk/Source/WebCore/css/CSSProperties.json 2022-04-27 18:37:45 UTC (rev 293520)
+++ trunk/Source/WebCore/css/CSSProperties.json 2022-04-27 18:56:04 UTC (rev 293521)
@@ -3816,9 +3816,16 @@
}
},
"overflow-wrap": {
+ "codegen-properties": {
+ "aliases": [
+ "word-wrap"
+ ]
+ },
+ "inherited": true,
"values": [
"normal",
- "break-word"
+ "break-word",
+ "anywhere"
],
"specification": {
"category": "css-text",
@@ -5086,24 +5093,6 @@
"url": "https://www.w3.org/TR/CSS22/text.html#propdef-word-spacing"
}
},
- "word-wrap": {
- "inherited": true,
- "values": [
- "normal",
- "break-word"
- ],
- "codegen-properties": {
- "name-for-methods": "OverflowWrap"
- },
- "status": {
- "status": "obsolete",
- "comment": "Replaced by overflow-wrap"
- },
- "specification": {
- "category": "css-text",
- "url": "https://www.w3.org/TR/css-text-3/#overflow-wrap"
- }
- },
"x": {
"codegen-properties": {
"initial": "initialZeroLength",
Modified: trunk/Source/WebCore/css/parser/CSSParserFastPaths.cpp (293520 => 293521)
--- trunk/Source/WebCore/css/parser/CSSParserFastPaths.cpp 2022-04-27 18:37:45 UTC (rev 293520)
+++ trunk/Source/WebCore/css/parser/CSSParserFastPaths.cpp 2022-04-27 18:56:04 UTC (rev 293521)
@@ -673,7 +673,6 @@
// case CSSPropertyOverflowAnchor:
// return valueID == CSSValueNone || valueID == CSSValueAuto;
case CSSPropertyOverflowWrap: // normal | break-word | anywhere
- case CSSPropertyWordWrap:
return valueID == CSSValueNormal || valueID == CSSValueBreakWord || valueID == CSSValueAnywhere;
case CSSPropertyOverflowX: // visible | hidden | scroll | auto | overlay (overlay is a synonym for auto)
if (context.overflowClipEnabled && valueID == CSSValueClip)
@@ -993,7 +992,6 @@
case CSSPropertyUserSelect:
case CSSPropertyWhiteSpace:
case CSSPropertyWordBreak:
- case CSSPropertyWordWrap:
// SVG CSS properties from SVG 1.1, Appendix N: Property Index.
case CSSPropertyAlignmentBaseline:
Modified: trunk/Source/WebCore/editing/Editor.cpp (293520 => 293521)
--- trunk/Source/WebCore/editing/Editor.cpp 2022-04-27 18:37:45 UTC (rev 293520)
+++ trunk/Source/WebCore/editing/Editor.cpp 2022-04-27 18:56:04 UTC (rev 293521)
@@ -3495,7 +3495,7 @@
RefPtr body { document().body() };
if (!body)
return;
- body->setInlineStyleProperty(CSSPropertyWordWrap, CSSValueBreakWord);
+ body->setInlineStyleProperty(CSSPropertyOverflowWrap, CSSValueBreakWord);
body->setInlineStyleProperty(CSSPropertyWebkitNbspMode, CSSValueSpace);
body->setInlineStyleProperty(CSSPropertyLineBreak, CSSValueAfterWhiteSpace);
}
Modified: trunk/Source/WebCore/html/HTMLElement.cpp (293520 => 293521)
--- trunk/Source/WebCore/html/HTMLElement.cpp 2022-04-27 18:37:45 UTC (rev 293520)
+++ trunk/Source/WebCore/html/HTMLElement.cpp 2022-04-27 18:56:04 UTC (rev 293521)
@@ -200,7 +200,7 @@
userModifyValue = CSSValueReadWritePlaintextOnly;
FALLTHROUGH;
case ContentEditableType::True:
- addPropertyToPresentationalHintStyle(style, CSSPropertyWordWrap, CSSValueBreakWord);
+ addPropertyToPresentationalHintStyle(style, CSSPropertyOverflowWrap, CSSValueBreakWord);
addPropertyToPresentationalHintStyle(style, CSSPropertyWebkitNbspMode, CSSValueSpace);
addPropertyToPresentationalHintStyle(style, CSSPropertyLineBreak, CSSValueAfterWhiteSpace);
#if PLATFORM(IOS_FAMILY)
Modified: trunk/Source/WebCore/html/HTMLTextAreaElement.cpp (293520 => 293521)
--- trunk/Source/WebCore/html/HTMLTextAreaElement.cpp 2022-04-27 18:37:45 UTC (rev 293520)
+++ trunk/Source/WebCore/html/HTMLTextAreaElement.cpp 2022-04-27 18:56:04 UTC (rev 293521)
@@ -157,10 +157,10 @@
if (name == wrapAttr) {
if (shouldWrapText()) {
addPropertyToPresentationalHintStyle(style, CSSPropertyWhiteSpace, CSSValuePreWrap);
- addPropertyToPresentationalHintStyle(style, CSSPropertyWordWrap, CSSValueBreakWord);
+ addPropertyToPresentationalHintStyle(style, CSSPropertyOverflowWrap, CSSValueBreakWord);
} else {
addPropertyToPresentationalHintStyle(style, CSSPropertyWhiteSpace, CSSValuePre);
- addPropertyToPresentationalHintStyle(style, CSSPropertyWordWrap, CSSValueNormal);
+ addPropertyToPresentationalHintStyle(style, CSSPropertyOverflowWrap, CSSValueNormal);
}
} else
HTMLTextFormControlElement::collectPresentationalHintsForAttribute(name, value, style);
