Title: [269274] trunk/Source/WebCore
Revision
269274
Author
[email protected]
Date
2020-11-02 14:07:00 -0800 (Mon, 02 Nov 2020)

Log Message

Unreviewed, reverting r269245.

3 LFC tests asserting in
WebCore::Layout::LayoutContext::verifyAndOutputMismatchingLayoutTree

Reverted changeset:

"[LFC][IFC] Empty lines stay empty even when the imaginary
strut is present"
https://bugs.webkit.org/show_bug.cgi?id=218420
https://trac.webkit.org/changeset/269245

Modified Paths

Diff

Modified: trunk/Source/WebCore/ChangeLog (269273 => 269274)


--- trunk/Source/WebCore/ChangeLog	2020-11-02 21:53:51 UTC (rev 269273)
+++ trunk/Source/WebCore/ChangeLog	2020-11-02 22:07:00 UTC (rev 269274)
@@ -1,3 +1,17 @@
+2020-11-02  Alan Bujtas  <[email protected]>
+
+        Unreviewed, reverting r269245.
+
+        3 LFC tests asserting in
+        WebCore::Layout::LayoutContext::verifyAndOutputMismatchingLayoutTree
+
+        Reverted changeset:
+
+        "[LFC][IFC] Empty lines stay empty even when the imaginary
+        strut is present"
+        https://bugs.webkit.org/show_bug.cgi?id=218420
+        https://trac.webkit.org/changeset/269245
+
 2020-11-02  Antti Koivisto  <[email protected]>
 
         [LFC][Integration] RenderText::absoluteQuadsForRange should use iterator

Modified: trunk/Source/WebCore/layout/inlineformatting/InlineFormattingContextGeometry.cpp (269273 => 269274)


--- trunk/Source/WebCore/layout/inlineformatting/InlineFormattingContextGeometry.cpp	2020-11-02 21:53:51 UTC (rev 269273)
+++ trunk/Source/WebCore/layout/inlineformatting/InlineFormattingContextGeometry.cpp	2020-11-02 22:07:00 UTC (rev 269274)
@@ -208,7 +208,7 @@
         auto rootInlineBox = LineBox::InlineLevelBox::createRootInlineBox(rootBox(), horizontalAligmentOffset, lineBox.logicalWidth());
 
         auto lineHasImaginaryStrut = layoutState().inNoQuirksMode();
-        auto isInitiallyConsideredNonEmpty = lineHasImaginaryStrut && !runs.isEmpty();
+        auto isInitiallyConsideredNonEmpty = !lineBox.isLineVisuallyEmpty() && lineHasImaginaryStrut;
         if (isInitiallyConsideredNonEmpty)
             rootInlineBox->setIsNonEmpty();
         setVerticalGeometryForInlineBox(*rootInlineBox);
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to