Diff
Modified: trunk/LayoutTests/ChangeLog (281313 => 281314)
--- trunk/LayoutTests/ChangeLog 2021-08-20 15:10:06 UTC (rev 281313)
+++ trunk/LayoutTests/ChangeLog 2021-08-20 15:24:44 UTC (rev 281314)
@@ -1,3 +1,16 @@
+2021-08-20 Commit Queue <commit-qu...@webkit.org>
+
+ Unreviewed, reverting r281307.
+ https://bugs.webkit.org/show_bug.cgi?id=229336
+
+ broke layout tests
+
+ Reverted changeset:
+
+ "[IFC][Integration] Enable non-auto line-break values"
+ https://bugs.webkit.org/show_bug.cgi?id=228842
+ https://commits.webkit.org/r281307
+
2021-08-20 Antti Koivisto <an...@apple.com>
[LFC][Integration] Enable full underline support
Modified: trunk/LayoutTests/TestExpectations (281313 => 281314)
--- trunk/LayoutTests/TestExpectations 2021-08-20 15:10:06 UTC (rev 281313)
+++ trunk/LayoutTests/TestExpectations 2021-08-20 15:24:44 UTC (rev 281314)
@@ -4377,7 +4377,9 @@
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 (281313 => 281314)
--- trunk/LayoutTests/platform/mac/fast/text/trailing-white-space-expected.txt 2021-08-20 15:10:06 UTC (rev 281313)
+++ trunk/LayoutTests/platform/mac/fast/text/trailing-white-space-expected.txt 2021-08-20 15:24:44 UTC (rev 281314)
@@ -4,20 +4,24 @@
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 185x46
+ RenderText {#text} at (0,0) size 191x46
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 186x46
+ RenderText {#text} at (7,0) size 192x46
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 (281313 => 281314)
--- trunk/Source/WebCore/ChangeLog 2021-08-20 15:10:06 UTC (rev 281313)
+++ trunk/Source/WebCore/ChangeLog 2021-08-20 15:24:44 UTC (rev 281314)
@@ -1,3 +1,16 @@
+2021-08-20 Commit Queue <commit-qu...@webkit.org>
+
+ Unreviewed, reverting r281307.
+ https://bugs.webkit.org/show_bug.cgi?id=229336
+
+ broke layout tests
+
+ Reverted changeset:
+
+ "[IFC][Integration] Enable non-auto line-break values"
+ https://bugs.webkit.org/show_bug.cgi?id=228842
+ https://commits.webkit.org/r281307
+
2021-08-20 Alan Bujtas <za...@apple.com>
[IFC] Undo incorrect InlineTextBox -> LegacyInlineTextBox renaming
Modified: trunk/Source/WebCore/layout/integration/LayoutIntegrationCoverage.cpp (281313 => 281314)
--- trunk/Source/WebCore/layout/integration/LayoutIntegrationCoverage.cpp 2021-08-20 15:10:06 UTC (rev 281313)
+++ trunk/Source/WebCore/layout/integration/LayoutIntegrationCoverage.cpp 2021-08-20 15:24:44 UTC (rev 281314)
@@ -168,6 +168,9 @@
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;
@@ -568,6 +571,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);
// 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 (281313 => 281314)
--- trunk/Source/WebCore/layout/integration/LayoutIntegrationCoverage.h 2021-08-20 15:10:06 UTC (rev 281313)
+++ trunk/Source/WebCore/layout/integration/LayoutIntegrationCoverage.h 2021-08-20 15:24:44 UTC (rev 281314)
@@ -66,7 +66,7 @@
FlowHasTextCombine = 1LLU << 26,
FlowHasTextFillBox = 1LLU << 27,
FlowHasBorderFitLines = 1LLU << 28,
- // Unused = 1LLU << 29,
+ FlowHasNonAutoLineBreak = 1LLU << 29,
FlowHasTextSecurity = 1LLU << 30,
FlowHasSVGFont = 1LLU << 31,
FlowTextHasDirectionCharacter = 1LLU << 32,
