Changeset 277325 in webkit

Timestamp:

May 11, 2021, 8:33:13 AM (5 years ago)

Author:

Alan Bujtas

Message:

REGRESSION(r275515): wpt/quirks/blocks-ignore-line-height.html
​https://bugs.webkit.org/show_bug.cgi?id=225591
<rdar://problem/77766308>

Reviewed by Antti Koivisto.

Source/WebCore:

Replace the generic line height quirk with a list-item specific one.
The original quirk was added to cover fast/lists/list-item-line-height.html but it looks like
it only needs a list-item specific quirk. This is copied from legacy line layout (see InlineFlowBox c'tor).

Test: fast/inline/line-height-in-non-standards-mode.html

• layout/formattingContexts/inline/InlineFormattingContextQuirks.cpp:

(WebCore::Layout::InlineFormattingContext::Quirks::inlineLevelBoxAffectsLineBox const):

• layout/integration/LayoutIntegrationBoxTree.cpp:

(WebCore::LayoutIntegration::rootBoxStyle):

• rendering/style/RenderStyle.h:

(WebCore::RenderStyle::isOriginalDisplayListItemType const):
(WebCore::RenderStyle::isDisplayListItemType):

LayoutTests:

• fast/inline/incorrect-middle-baseline-alignment-with-line-height-expected.html: progression.
• fast/inline/line-height-in-non-standards-mode-expected.html: Added.
• fast/inline/line-height-in-non-standards-mode.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/inline/incorrect-middle-baseline-alignment-with-line-height-expected.html (modified) (1 diff)
• LayoutTests/fast/inline/line-height-in-non-standards-mode-expected.html (added)
• LayoutTests/fast/inline/line-height-in-non-standards-mode.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/layout/formattingContexts/inline/InlineFormattingContextQuirks.cpp (modified) (1 diff)
• Source/WebCore/layout/integration/LayoutIntegrationBoxTree.cpp (modified) (1 diff)
• Source/WebCore/rendering/style/RenderStyle.h (modified) (3 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2021-05-11  Zalan Bujtas  <zalan@apple.com>
+
+        REGRESSION(r275515): wpt/quirks/blocks-ignore-line-height.html
+        https://bugs.webkit.org/show_bug.cgi?id=225591
+        <rdar://problem/77766308>
+
+        Reviewed by Antti Koivisto.
+
+        * fast/inline/incorrect-middle-baseline-alignment-with-line-height-expected.html: progression.
+        * fast/inline/line-height-in-non-standards-mode-expected.html: Added.
+        * fast/inline/line-height-in-non-standards-mode.html: Added.
+
 2021-05-11  Cathie Chen  <cathiechen@igalia.com>
 

trunk/LayoutTests/fast/inline/incorrect-middle-baseline-alignment-with-line-height-expected.html

@@ -4 +4 @@
   font-size: 20px;
   background-color: green;
-  height: 112px;
+  height: 110px;
   padding-top: 90px; 
 }

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2021-05-11  Zalan Bujtas  <zalan@apple.com>
+
+        REGRESSION(r275515): wpt/quirks/blocks-ignore-line-height.html
+        https://bugs.webkit.org/show_bug.cgi?id=225591
+        <rdar://problem/77766308>
+
+        Reviewed by Antti Koivisto.
+
+        Replace the generic line height quirk with a list-item specific one.
+        The original quirk was added to cover fast/lists/list-item-line-height.html but it looks like
+        it only needs a list-item specific quirk. This is copied from legacy line layout (see InlineFlowBox c'tor).
+
+        Test: fast/inline/line-height-in-non-standards-mode.html
+
+        * layout/formattingContexts/inline/InlineFormattingContextQuirks.cpp:
+        (WebCore::Layout::InlineFormattingContext::Quirks::inlineLevelBoxAffectsLineBox const):
+        * layout/integration/LayoutIntegrationBoxTree.cpp:
+        (WebCore::LayoutIntegration::rootBoxStyle):
+        * rendering/style/RenderStyle.h:
+        (WebCore::RenderStyle::isOriginalDisplayListItemType const):
+        (WebCore::RenderStyle::isDisplayListItemType):
+
 2021-05-11  Zalan Bujtas  <zalan@apple.com>
 

trunk/Source/WebCore/layout/formattingContexts/inline/InlineFormattingContextQuirks.cpp

@@ -74 +74 @@
             return true;
         if (inlineLevelBox.isRootInlineBox()) {
-            auto shouldRootInlineBoxWithNoContentStretchLineBox = [&] {
-                if (inlineLevelBox.layoutBox().style().lineHeight().isNegative())
-                    return false;
-                // The root inline box with non-initial line height value stretches the line box even when root has no content
-                // but there's at least one inline box with content.
-                // e.g. <div style="line-height: 100px;"><span>content</span></div>
-                if (!lineBox.hasInlineBox())
-                    return false;
-                for (auto& inlineLevelBox : lineBox.nonRootInlineLevelBoxes()) {
-                    if (!inlineLevelBox.isInlineBox())
-                        continue;
-                    if (inlineLevelBox.hasContent())
-                        return true;
-                }
-                return false;
-            };
-            return shouldRootInlineBoxWithNoContentStretchLineBox();
+            // This root inline box has no direct text content and we are in non-standards mode.
+            // Now according to legacy line layout, we need to apply the following list-item specific quirk:
+            // We do not create markers for list items when the list-style-type is none, while other browsers do.
+            // The side effect of having no marker is that in quirks mode we have to specifically check for list-item
+            // and make sure it is treated as if it had content and stretched the line.
+            // see InlineFlowBox c'tor.
+            return inlineLevelBox.layoutBox().style().isOriginalDisplayListItemType();
         }
         // Non-root inline boxes (e.g. <span>).

trunk/Source/WebCore/layout/integration/LayoutIntegrationBoxTree.cpp

@@ -47 +47 @@
 {
     auto clonedStyle = RenderStyle::clone(style);
-    clonedStyle.setDisplay(DisplayType::Block);
+    clonedStyle.setEffectiveDisplay(DisplayType::Block);
     return clonedStyle;
 }

trunk/Source/WebCore/rendering/style/RenderStyle.h

@@ -1501 +1501 @@
     bool isDisplayFlexibleOrGridBox() const { return isDisplayFlexibleOrGridBox(display()); }
     bool isDisplayRegionType() const;
+    bool isOriginalDisplayListItemType() const { return isDisplayListItemType(originalDisplay()); }
 
     bool setWritingMode(WritingMode);
@@ -1966 +1967 @@
     static bool isDisplayGridBox(DisplayType);
     static bool isDisplayFlexibleOrGridBox(DisplayType);
+    static bool isDisplayListItemType(DisplayType);
 
     static LayoutBoxExtent shadowExtent(const ShadowData*);
@@ -2369 +2371 @@
 }
 
+inline bool RenderStyle::isDisplayListItemType(DisplayType display)
+{
+    return display == DisplayType::ListItem;
+}
+
 inline bool RenderStyle::hasAnyPublicPseudoStyles() const
 {