Title: [281356] trunk
Revision
281356
Author
[email protected]
Date
2021-08-20 18:13:06 -0700 (Fri, 20 Aug 2021)

Log Message

[IFC][Integration] Enable non-auto line-break values
https://bugs.webkit.org/show_bug.cgi?id=228842

Reviewed by Antti Koivisto.

Source/WebCore:

IFC already supports line-break (except after-white-space).

* layout/integration/LayoutIntegrationCoverage.cpp:
(WebCore::LayoutIntegration::canUseForStyle):

LayoutTests:

* TestExpectations: progressions
* platform/mac/fast/text/trailing-white-space-expected.txt: collapsed trailing whitespace cleanup.

Modified Paths

Diff

Modified: trunk/LayoutTests/ChangeLog (281355 => 281356)


--- trunk/LayoutTests/ChangeLog	2021-08-21 00:54:50 UTC (rev 281355)
+++ trunk/LayoutTests/ChangeLog	2021-08-21 01:13:06 UTC (rev 281356)
@@ -1,3 +1,13 @@
+2021-08-20  Alan Bujtas  <[email protected]>
+
+        [IFC][Integration] Enable non-auto line-break values
+        https://bugs.webkit.org/show_bug.cgi?id=228842
+
+        Reviewed by Antti Koivisto.
+
+        * TestExpectations: progressions
+        * platform/mac/fast/text/trailing-white-space-expected.txt: collapsed trailing whitespace cleanup.
+
 2021-08-20  Patrick Angle  <[email protected]>
 
         Web Inspector: Style rules declared after a rule whose selector has over 8192 components are not shown correctly

Modified: trunk/LayoutTests/TestExpectations (281355 => 281356)


--- trunk/LayoutTests/TestExpectations	2021-08-21 00:54:50 UTC (rev 281355)
+++ trunk/LayoutTests/TestExpectations	2021-08-21 01:13:06 UTC (rev 281356)
@@ -4377,9 +4377,7 @@
 webkit.org/b/214290 imported/w3c/web-platform-tests/css/css-text/line-break/line-break-anywhere-overrides-uax-behavior-010.html [ ImageOnlyFailure ]
 webkit.org/b/214290 imported/w3c/web-platform-tests/css/css-text/line-break/line-break-loose-hyphens-001.html [ ImageOnlyFailure ]
 webkit.org/b/214290 imported/w3c/web-platform-tests/css/css-text/line-break/line-break-loose-hyphens-002.html [ ImageOnlyFailure ]
-webkit.org/b/214290 imported/w3c/web-platform-tests/css/css-text/line-break/line-break-normal-hyphens-002.html [ ImageOnlyFailure ]
 webkit.org/b/214290 imported/w3c/web-platform-tests/css/css-text/line-break/line-break-shaping-001.html [ ImageOnlyFailure ]
-webkit.org/b/214290 imported/w3c/web-platform-tests/css/css-text/line-break/line-break-strict-hyphens-002.html [ ImageOnlyFailure ]
 webkit.org/b/214290 imported/w3c/web-platform-tests/css/css-text/line-breaking/line-breaking-014.html [ ImageOnlyFailure ]
 webkit.org/b/214290 imported/w3c/web-platform-tests/css/css-text/line-breaking/line-breaking-016.html [ ImageOnlyFailure ]
 webkit.org/b/214290 imported/w3c/web-platform-tests/css/css-text/line-breaking/line-breaking-017.html [ ImageOnlyFailure ]

Modified: trunk/Source/WebCore/ChangeLog (281355 => 281356)


--- trunk/Source/WebCore/ChangeLog	2021-08-21 00:54:50 UTC (rev 281355)
+++ trunk/Source/WebCore/ChangeLog	2021-08-21 01:13:06 UTC (rev 281356)
@@ -1,3 +1,15 @@
+2021-08-20  Alan Bujtas  <[email protected]>
+
+        [IFC][Integration] Enable non-auto line-break values
+        https://bugs.webkit.org/show_bug.cgi?id=228842
+
+        Reviewed by Antti Koivisto.
+
+        IFC already supports line-break (except after-white-space).
+
+        * layout/integration/LayoutIntegrationCoverage.cpp:
+        (WebCore::LayoutIntegration::canUseForStyle):
+
 2021-08-20  Patrick Angle  <[email protected]>
 
         Web Inspector: Style rules declared after a rule whose selector has over 8192 components are not shown correctly

Modified: trunk/Source/WebCore/layout/integration/LayoutIntegrationCoverage.cpp (281355 => 281356)


--- trunk/Source/WebCore/layout/integration/LayoutIntegrationCoverage.cpp	2021-08-21 00:54:50 UTC (rev 281355)
+++ trunk/Source/WebCore/layout/integration/LayoutIntegrationCoverage.cpp	2021-08-21 01:13:06 UTC (rev 281356)
@@ -165,8 +165,8 @@
     case AvoidanceReason::FlowHasBorderFitLines:
         stream << "-webkit-border-fit";
         break;
-    case AvoidanceReason::FlowHasNonAutoLineBreak:
-        stream << "line-break is not auto";
+    case AvoidanceReason::FlowHasAfterWhiteSpaceLineBreak:
+        stream << "line-break is after-white-space";
         break;
     case AvoidanceReason::FlowHasTextSecurity:
         stream << "text-security is not none";
@@ -554,8 +554,8 @@
         SET_REASON_AND_RETURN_IF_NEEDED(FlowHasTextFillBox, reasons, includeReasons);
     if (style.borderFit() == BorderFit::Lines)
         SET_REASON_AND_RETURN_IF_NEEDED(FlowHasBorderFitLines, reasons, includeReasons);
-    if (style.lineBreak() != LineBreak::Auto)
-        SET_REASON_AND_RETURN_IF_NEEDED(FlowHasNonAutoLineBreak, reasons, includeReasons);
+    if (style.lineBreak() == LineBreak::AfterWhiteSpace)
+        SET_REASON_AND_RETURN_IF_NEEDED(FlowHasAfterWhiteSpaceLineBreak, reasons, includeReasons);
     // Special handling of text-security:disc is not yet implemented in the simple line layout code path.
     // See RenderBlock::updateSecurityDiscCharacters.
     if (style.textSecurity() != TextSecurity::None)

Modified: trunk/Source/WebCore/layout/integration/LayoutIntegrationCoverage.h (281355 => 281356)


--- trunk/Source/WebCore/layout/integration/LayoutIntegrationCoverage.h	2021-08-21 00:54:50 UTC (rev 281355)
+++ trunk/Source/WebCore/layout/integration/LayoutIntegrationCoverage.h	2021-08-21 01:13:06 UTC (rev 281356)
@@ -66,7 +66,7 @@
     FlowHasTextCombine                           = 1LLU  << 26,
     FlowHasTextFillBox                           = 1LLU  << 27,
     FlowHasBorderFitLines                        = 1LLU  << 28,
-    FlowHasNonAutoLineBreak                      = 1LLU  << 29,
+    FlowHasAfterWhiteSpaceLineBreak              = 1LLU  << 29,
     FlowHasTextSecurity                          = 1LLU  << 30,
     FlowHasSVGFont                               = 1LLU  << 31,
     FlowTextHasDirectionCharacter                = 1LLU  << 32,
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to