Title: [281307] trunk
Revision
281307
Author
[email protected]
Date
2021-08-20 05:44:29 -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.

* 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 (281306 => 281307)


--- trunk/LayoutTests/ChangeLog	2021-08-20 12:34:51 UTC (rev 281306)
+++ trunk/LayoutTests/ChangeLog	2021-08-20 12:44:29 UTC (rev 281307)
@@ -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  Philippe Normand  <[email protected]>
 
         REGRESSION(r280732) [GStreamer] fast/mediastream/getDisplayMedia-max-constraints1.html and other are failing

Modified: trunk/LayoutTests/TestExpectations (281306 => 281307)


--- trunk/LayoutTests/TestExpectations	2021-08-20 12:34:51 UTC (rev 281306)
+++ trunk/LayoutTests/TestExpectations	2021-08-20 12:44:29 UTC (rev 281307)
@@ -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/LayoutTests/platform/mac/fast/text/trailing-white-space-expected.txt (281306 => 281307)


--- trunk/LayoutTests/platform/mac/fast/text/trailing-white-space-expected.txt	2021-08-20 12:34:51 UTC (rev 281306)
+++ trunk/LayoutTests/platform/mac/fast/text/trailing-white-space-expected.txt	2021-08-20 12:44:29 UTC (rev 281307)
@@ -4,24 +4,20 @@
   RenderBlock {HTML} at (0,0) size 800x600
     RenderBody {BODY} at (8,8) size 784x584
       RenderBlock (floating) {DIV} at (8,8) size 200x46 [bgcolor=#FFFFE0]
-        RenderText {#text} at (0,0) size 191x46
+        RenderText {#text} at (0,0) size 185x46
           text run at (0,0) width 185: "Lorem ipsum dolor"
-          text run at (184,0) width 7: " "
           text run at (0,23) width 79: "sit amet"
       RenderBlock (floating) {DIV} at (224,8) size 200x46 [bgcolor=#FFFFE0]
-        RenderText {#text} at (7,0) size 192x46
+        RenderText {#text} at (7,0) size 186x46
           text run at (7,0) width 186: "Lorem ipsum dolor"
-          text run at (192,0) width 7: " "
           text run at (60,23) width 80: "sit amet"
       RenderBlock (floating) {DIV} at (440,8) size 200x46 [bgcolor=#FFFFE0]
         RenderText {#text} at (15,0) size 185x46
           text run at (15,0) width 185: "Lorem ipsum dolor"
-          text run at (200,0) width 0: " "
           text run at (121,23) width 79: "sit amet"
       RenderBlock (floating) {DIV} at (8,70) size 200x46 [bgcolor=#FFFFE0]
         RenderText {#text} at (0,0) size 200x46
           text run at (0,0) width 200: "Lorem ipsum dolor"
-          text run at (200,0) width 0: " "
           text run at (0,23) width 79: "sit amet"
       RenderBlock (floating) {DIV} at (224,70) size 200x46 [bgcolor=#FFFFE0]
         RenderText {#text} at (0,0) size 185x46

Modified: trunk/Source/WebCore/ChangeLog (281306 => 281307)


--- trunk/Source/WebCore/ChangeLog	2021-08-20 12:34:51 UTC (rev 281306)
+++ trunk/Source/WebCore/ChangeLog	2021-08-20 12:44:29 UTC (rev 281307)
@@ -1,5 +1,17 @@
 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.
+
+        * layout/integration/LayoutIntegrationCoverage.cpp:
+        (WebCore::LayoutIntegration::canUseForStyle):
+
+2021-08-20  Alan Bujtas  <[email protected]>
+
         [LFC][IFC] Add support for -webkit-nbsp-mode: space
         https://bugs.webkit.org/show_bug.cgi?id=228805
 

Modified: trunk/Source/WebCore/layout/integration/LayoutIntegrationCoverage.cpp (281306 => 281307)


--- trunk/Source/WebCore/layout/integration/LayoutIntegrationCoverage.cpp	2021-08-20 12:34:51 UTC (rev 281306)
+++ trunk/Source/WebCore/layout/integration/LayoutIntegrationCoverage.cpp	2021-08-20 12:44:29 UTC (rev 281307)
@@ -171,9 +171,6 @@
     case AvoidanceReason::FlowHasBorderFitLines:
         stream << "-webkit-border-fit";
         break;
-    case AvoidanceReason::FlowHasNonAutoLineBreak:
-        stream << "line-break is not auto";
-        break;
     case AvoidanceReason::FlowHasTextSecurity:
         stream << "text-security is not none";
         break;
@@ -576,8 +573,6 @@
         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);
     // 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 (281306 => 281307)


--- trunk/Source/WebCore/layout/integration/LayoutIntegrationCoverage.h	2021-08-20 12:34:51 UTC (rev 281306)
+++ trunk/Source/WebCore/layout/integration/LayoutIntegrationCoverage.h	2021-08-20 12:44:29 UTC (rev 281307)
@@ -66,7 +66,7 @@
     FlowHasTextCombine                           = 1LLU  << 26,
     FlowHasTextFillBox                           = 1LLU  << 27,
     FlowHasBorderFitLines                        = 1LLU  << 28,
-    FlowHasNonAutoLineBreak                      = 1LLU  << 29,
+    // Unused                                    = 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