[LFC][IFC] Add line logical top and bottom

[WebKit-https.git] / Source / WebCore / layout / inlineformatting / InlineFormattingContext.h

diff --git a/Source/WebCore/layout/inlineformatting/InlineFormattingContext.h b/Source/WebCore/layout/inlineformatting/InlineFormattingContext.h
index 0683f1c..8a80c39 100644 (file)
--- a/Source/WebCore/layout/inlineformatting/InlineFormattingContext.h
+++ b/Source/WebCore/layout/inlineformatting/InlineFormattingContext.h
@@ -27,6 +27,7 @@
 
 #if ENABLE(LAYOUT_FORMATTING_CONTEXT)
 
 
 #if ENABLE(LAYOUT_FORMATTING_CONTEXT)
 

+#include "DisplayBox.h"

 #include "FormattingContext.h"
 #include "InlineLineBreaker.h"
 #include <wtf/IsoMalloc.h>
 #include "FormattingContext.h"
 #include "InlineLineBreaker.h"
 #include <wtf/IsoMalloc.h>


@@ -51,15 +52,20 @@ private:
     public:
         Line(InlineFormattingState&, const Box& formattingRoot);
 
     public:
         Line(InlineFormattingState&, const Box& formattingRoot);
 

-        void init(LayoutUnit lineLogicalLeft, LayoutUnit availableWidth);
+        void init(const Display::Box::Rect&);
+

         void appendContent(const InlineLineBreaker::Run&);
         enum class LastLine { No, Yes };
         void close(LastLine = LastLine::No);
 
         bool hasContent() const { return m_firstRunIndex.has_value(); }
         void appendContent(const InlineLineBreaker::Run&);
         enum class LastLine { No, Yes };
         void close(LastLine = LastLine::No);
 
         bool hasContent() const { return m_firstRunIndex.has_value(); }

+        bool isFirstLine() const { return m_isFirstLine; }

         LayoutUnit contentLogicalRight();
         LayoutUnit availableWidth() const { return m_availableWidth; }
 
         LayoutUnit contentLogicalRight();
         LayoutUnit availableWidth() const { return m_availableWidth; }
 

+        LayoutUnit logicalTop() const { return m_logicalRect.top(); }
+        LayoutUnit logicalBottom() const { return m_logicalRect.bottom(); }
+

     private:
         void justifyRuns();
         void computeExpansionOpportunities(const InlineLineBreaker::Run&);
     private:
         void justifyRuns();
         void computeExpansionOpportunities(const InlineLineBreaker::Run&);


@@ -75,15 +81,16 @@ private:
         InlineFormattingState& m_formattingState;
         const Box& m_formattingRoot;
 
         InlineFormattingState& m_formattingState;
         const Box& m_formattingRoot;
 

-        LayoutUnit m_lineLogicalLeft;
+        Display::Box::Rect m_logicalRect;

         LayoutUnit m_availableWidth;
         LayoutUnit m_availableWidth;

-        LayoutUnit m_lineWidth;

 
         std::optional<unsigned> m_firstRunIndex;
         bool m_alignmentIsJustify { false };
 
         std::optional<unsigned> m_firstRunIndex;
         bool m_alignmentIsJustify { false };

+        bool m_isFirstLine { true };

     };
 
     void layoutInlineContent(const LayoutContext&, InlineFormattingState&, const InlineRunProvider&) const;
     };
 
     void layoutInlineContent(const LayoutContext&, InlineFormattingState&, const InlineRunProvider&) const;

+    void initializeNewLine(const LayoutContext&, Line&) const;

 
     void computeWidthAndHeight(const LayoutContext&, const Box&) const;
     void computeStaticPosition(const LayoutContext&, const Box&) const override;
 
     void computeWidthAndHeight(const LayoutContext&, const Box&) const;
     void computeStaticPosition(const LayoutContext&, const Box&) const override;