Changeset 246475 in webkit

Timestamp:

Jun 16, 2019, 12:28:14 PM (7 years ago)

Author:

Alan Bujtas

Message:

[LFC][IFC] Use the borderBox rect consistently to size the inline box.
​https://bugs.webkit.org/show_bug.cgi?id=198899

Reviewed by Antti Koivisto.
<rdar://problem/51781969>

Use the margin box height (when applicable) to adjust the line height and use the borderBox rect (or font size) height to size the inline box.

• layout/displaytree/DisplayBox.h:

(WebCore::Display::Box::borderBoxHeight const):
(WebCore::Display::Box::marginBoxHeight const):

• layout/inlineformatting/InlineLine.cpp:

(WebCore::Layout::Line::appendInlineContainerStart):
(WebCore::Layout::Line::appendTextContent):
(WebCore::Layout::Line::appendNonReplacedInlineBox):
(WebCore::Layout::Line::inlineItemContentHeight const):
(WebCore::Layout::Line::inlineItemHeight const): Deleted.

• layout/inlineformatting/InlineLine.h:

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• layout/displaytree/DisplayBox.h (modified) (1 diff)
• layout/inlineformatting/InlineLine.cpp (modified) (6 diffs)
• layout/inlineformatting/InlineLine.h (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2019-06-16  Zalan Bujtas  <zalan@apple.com>
+
+        [LFC][IFC] Use the borderBox rect consistently to size the inline box.
+        https://bugs.webkit.org/show_bug.cgi?id=198899
+
+        Reviewed by Antti Koivisto.
+        <rdar://problem/51781969>
+
+        Use the margin box height (when applicable) to adjust the line height and use the borderBox rect (or font size) height to size the inline box.
+
+        * layout/displaytree/DisplayBox.h:
+        (WebCore::Display::Box::borderBoxHeight const):
+        (WebCore::Display::Box::marginBoxHeight const):
+        * layout/inlineformatting/InlineLine.cpp:
+        (WebCore::Layout::Line::appendInlineContainerStart):
+        (WebCore::Layout::Line::appendTextContent):
+        (WebCore::Layout::Line::appendNonReplacedInlineBox):
+        (WebCore::Layout::Line::inlineItemContentHeight const):
+        (WebCore::Layout::Line::inlineItemHeight const): Deleted.
+        * layout/inlineformatting/InlineLine.h:
+
 2019-06-15  Simon Fraser  <simon.fraser@apple.com>
 

trunk/Source/WebCore/layout/displaytree/DisplayBox.h

@@ -120 +120 @@
     LayoutUnit paddingBoxWidth() const { return paddingLeft().valueOr(0) + contentBoxWidth() + paddingRight().valueOr(0); }
 
+    LayoutUnit borderBoxHeight() const { return borderTop() + paddingBoxHeight() + borderBottom(); }
     LayoutUnit borderBoxWidth() const { return borderLeft() + paddingBoxWidth() + borderRight(); }
+    LayoutUnit marginBoxHeight() const { return marginBefore() + borderBoxHeight() + marginAfter(); }
     LayoutUnit marginBoxWidth() const { return marginStart() + borderBoxWidth() + marginEnd(); }
 

trunk/Source/WebCore/layout/inlineformatting/InlineLine.cpp

@@ -178 +178 @@
 
     if (!m_skipVerticalAligment) {
-        auto logicalHeight = inlineItemHeight(inlineItem);
+        auto logicalHeight = inlineItemContentHeight(inlineItem);
         adjustBaselineAndLineHeight(inlineItem, logicalHeight);
         logicalRect.setHeight(logicalHeight);
@@ -225 +225 @@
     logicalRect.setWidth(logicalWidth);
     if (!m_skipVerticalAligment)
-        logicalRect.setHeight(inlineItemHeight(inlineItem));
+        logicalRect.setHeight(inlineItemContentHeight(inlineItem));
 
     auto textContext = Content::Run::TextContext { inlineItem.start(), inlineItem.isCollapsed() ? 1 : inlineItem.length() };
@@ -245 +245 @@
     logicalRect.setWidth(logicalWidth);
     if (!m_skipVerticalAligment) {
-        auto logicalHeight = inlineItemHeight(inlineItem);
-        adjustBaselineAndLineHeight(inlineItem, logicalHeight);
-        logicalRect.setHeight(logicalHeight);
+        adjustBaselineAndLineHeight(inlineItem, displayBox.marginBoxHeight());
+        logicalRect.setHeight(inlineItemContentHeight(inlineItem));
     }
 
@@ -321 +320 @@
 }
 
-LayoutUnit Line::inlineItemHeight(const InlineItem& inlineItem) const
+LayoutUnit Line::inlineItemContentHeight(const InlineItem& inlineItem) const
 {
     ASSERT(!m_skipVerticalAligment);
@@ -333 +332 @@
 
     if (layoutBox.isFloatingPositioned())
-        return displayBox.marginBox().height();
+        return displayBox.borderBoxHeight();
 
     if (layoutBox.isReplaced())
-        return displayBox.height();
+        return displayBox.borderBoxHeight();
 
     if (inlineItem.isContainerStart() || inlineItem.isContainerEnd())
@@ -342 +341 @@
 
     // Non-replaced inline box (e.g. inline-block)
-    return displayBox.marginBox().height();
+    return displayBox.borderBoxHeight();
 }
 

trunk/Source/WebCore/layout/inlineformatting/InlineLine.h

@@ -123 +123 @@
 
     void adjustBaselineAndLineHeight(const InlineItem&, LayoutUnit runHeight);
-    LayoutUnit inlineItemHeight(const InlineItem&) const;
+    LayoutUnit inlineItemContentHeight(const InlineItem&) const;
     bool isVisuallyEmpty() const;