Changeset 246478 in webkit

Timestamp:

Jun 16, 2019, 12:32:52 PM (7 years ago)

Author:

Alan Bujtas

Message:

[LFC][IFC] Remove Line::Content::isVisuallyEmpty
​https://bugs.webkit.org/show_bug.cgi?id=198892
<rdar://problem/51780345>

Reviewed by Antti Koivisto.

Instead of setting the isVisuallyEmpty flag, reset the line height to 0.

• layout/inlineformatting/InlineFormattingContextLineLayout.cpp:

(WebCore::Layout::InlineFormattingContext::LineLayout::createDisplayRuns const):

• layout/inlineformatting/InlineLine.cpp:

(WebCore::Layout::Line::close):

• layout/inlineformatting/InlineLine.h:

(WebCore::Layout::Line::Content::isEmpty const):
(WebCore::Layout::Line::Content::setBaseline):
(WebCore::Layout::Line::Content::isVisuallyEmpty const): Deleted.
(WebCore::Layout::Line::Content::setIsVisuallyEmpty): Deleted.

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• layout/inlineformatting/InlineFormattingContextLineLayout.cpp (modified) (2 diffs)
• layout/inlineformatting/InlineLine.cpp (modified) (2 diffs)
• layout/inlineformatting/InlineLine.h (modified) (3 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2019-06-16  Zalan Bujtas  <zalan@apple.com>
+
+        [LFC][IFC] Remove Line::Content::isVisuallyEmpty
+        https://bugs.webkit.org/show_bug.cgi?id=198892
+        <rdar://problem/51780345>
+
+        Reviewed by Antti Koivisto.
+
+        Instead of setting the isVisuallyEmpty flag, reset the line height to 0. 
+
+        * layout/inlineformatting/InlineFormattingContextLineLayout.cpp:
+        (WebCore::Layout::InlineFormattingContext::LineLayout::createDisplayRuns const):
+        * layout/inlineformatting/InlineLine.cpp:
+        (WebCore::Layout::Line::close):
+        * layout/inlineformatting/InlineLine.h:
+        (WebCore::Layout::Line::Content::isEmpty const):
+        (WebCore::Layout::Line::Content::setBaseline):
+        (WebCore::Layout::Line::Content::isVisuallyEmpty const): Deleted.
+        (WebCore::Layout::Line::Content::setIsVisuallyEmpty): Deleted.
+
 2019-06-16  Zalan Bujtas  <zalan@apple.com>
 

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

@@ -312 +312 @@
 
     // Ignore the initial strut.
-    auto lineBox = Display::Rect { lineContent.logicalTop(), lineContent.logicalLeft(), 0, !lineContent.isVisuallyEmpty() ? lineContent.logicalHeight() : LayoutUnit { } };
+    auto lineBox = Display::Rect { lineContent.logicalTop(), lineContent.logicalLeft(), 0, lineContent.logicalHeight()};
     // Create final display runs.
     auto& lineRuns = lineContent.runs();
@@ -394 +394 @@
     // FIXME linebox needs to be ajusted after content alignment.
     m_formattingState.addLineBox({ lineBox, lineContent.baseline() });
-    if (!lineContent.isVisuallyEmpty())
-        alignRuns(m_formattingRoot.style().textAlign(), previousLineLastRunIndex.valueOr(-1) + 1, widthConstraint - lineContent.logicalWidth());
+    alignRuns(m_formattingRoot.style().textAlign(), previousLineLastRunIndex.valueOr(-1) + 1, widthConstraint - lineContent.logicalWidth());
 }
 

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

@@ -87 +87 @@
     removeTrailingTrimmableContent();
     if (!m_skipVerticalAligment) {
+        if (isVisuallyEmpty()) {
+            m_baseline = { };
+            m_contentLogicalHeight = { };
+        }
+
         for (auto& run : m_content->runs()) {
             LayoutUnit logicalTop;
@@ -122 +127 @@
         }
     }
-    m_content->setIsVisuallyEmpty(isVisuallyEmpty());
     m_content->setLogicalRect({ logicalTop(), logicalLeft(), contentLogicalWidth(), logicalHeight() });
     m_content->setBaseline(m_baseline);

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

@@ -61 +61 @@
         const Runs& runs() const { return m_runs; }
         bool isEmpty() const { return m_runs.isEmpty(); }
-        // Not in painting sense though.
-        bool isVisuallyEmpty() const { return m_isVisuallyEmpty; }
 
         LayoutUnit logicalTop() const { return m_logicalRect.top(); }
@@ -77 +75 @@
         void setLogicalRect(const Display::Rect& logicalRect) { m_logicalRect = logicalRect; }
         void setBaseline(LineBox::Baseline baseline) { m_baseline = baseline; }
-        void setIsVisuallyEmpty(bool isVisuallyEmpty) { m_isVisuallyEmpty = isVisuallyEmpty; }
         Runs& runs() { return m_runs; }
 
@@ -83 +80 @@
         LineBox::Baseline m_baseline;
         Runs m_runs;
-        bool m_isVisuallyEmpty { true };
     };
     std::unique_ptr<Content> close();