Changeset 238399 in webkit

Timestamp:

Nov 20, 2018 7:48:14 AM (5 years ago)

Author:

Alan Bujtas

Message:

[LFC][IFC] InlineRunProvider::append() should just take const InlineItem&.
​https://bugs.webkit.org/show_bug.cgi?id=191837

Reviewed by Antti Koivisto.

This allows us to remove the InlineFormattingState dependency as well.

• layout/inlineformatting/InlineFormattingContext.cpp:

(WebCore::Layout::InlineFormattingContext::collectInlineContentForSubtree const):
(WebCore::Layout::InlineFormattingContext::instrinsicWidthConstraints const):

• layout/inlineformatting/InlineRunProvider.cpp:

(WebCore::Layout::InlineRunProvider::InlineRunProvider):
(WebCore::Layout::InlineRunProvider::append):

• layout/inlineformatting/InlineRunProvider.h:

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• layout/inlineformatting/InlineFormattingContext.cpp (modified) (4 diffs)
• layout/inlineformatting/InlineRunProvider.cpp (modified) (1 diff)
• layout/inlineformatting/InlineRunProvider.h (modified) (3 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2018-11-20  Zalan Bujjtas  <zalan@apple.com>
+
+        [LFC][IFC] InlineRunProvider::append() should just take const InlineItem&.
+        https://bugs.webkit.org/show_bug.cgi?id=191837
+
+        Reviewed by Antti Koivisto.
+
+        This allows us to remove the InlineFormattingState dependency as well.
+
+        * layout/inlineformatting/InlineFormattingContext.cpp:
+        (WebCore::Layout::InlineFormattingContext::collectInlineContentForSubtree const):
+        (WebCore::Layout::InlineFormattingContext::instrinsicWidthConstraints const):
+        * layout/inlineformatting/InlineRunProvider.cpp:
+        (WebCore::Layout::InlineRunProvider::InlineRunProvider):
+        (WebCore::Layout::InlineRunProvider::append):
+        * layout/inlineformatting/InlineRunProvider.h:
+
 2018-11-20  Thibault Saunier  <tsaunier@igalia.com>
 

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

@@ -59 +59 @@
     LOG_WITH_STREAM(FormattingContextLayout, stream << "[Start] -> inline formatting context -> formatting root(" << &root() << ")");
 
-    InlineRunProvider inlineRunProvider(inlineFormattingState());
+    InlineRunProvider inlineRunProvider;
     collectInlineContent(inlineRunProvider);
     // Compute width/height for non-text content.
@@ -453 +453 @@
     auto& inlineFormattingState = this->inlineFormattingState();
 
+    auto createAndAppendInlineItem = [&] {
+        auto inlineItem = std::make_unique<InlineItem>(root);
+        inlineRunProvider.append(*inlineItem);
+        inlineFormattingState.inlineContent().add(WTFMove(inlineItem));
+    };
+
     if (root.establishesFormattingContext() && &root != &(this->root())) {
+        createAndAppendInlineItem();
         // Skip formatting root subtree. They are not part of this inline formatting context.
-        inlineRunProvider.append(root);
         inlineFormattingState.setDetachingRules(root, { InlineFormattingState::DetachingRule::BreakAtStart, InlineFormattingState::DetachingRule::BreakAtEnd });
         return;
@@ -461 +467 @@
 
     if (!is<Container>(root)) {
-        inlineRunProvider.append(root);
+        createAndAppendInlineItem();
         return;
     }
@@ -518 +524 @@
 
     auto& inlineFormattingState = this->inlineFormattingState();
-    InlineRunProvider inlineRunProvider(inlineFormattingState);
+    InlineRunProvider inlineRunProvider;
     collectInlineContent(inlineRunProvider);
 

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

@@ -38 +38 @@
 WTF_MAKE_ISO_ALLOCATED_IMPL(InlineRunProvider);
 
-InlineRunProvider::InlineRunProvider(InlineFormattingState& inlineFormattingState)
-    : m_inlineFormattingState(inlineFormattingState)
+InlineRunProvider::InlineRunProvider()
 {
 }
 
-void InlineRunProvider::append(const Box& layoutBox)
+void InlineRunProvider::append(const InlineItem& inlineItem)
 {
-    auto inlineItem = std::make_unique<InlineItem>(layoutBox);
-
-    // Special case text item. Texts can overlap multiple items. <span>foo</span><span>bar</span>
-    switch (inlineItem->type()) {
+    switch (inlineItem.type()) {
     case InlineItem::Type::Text:
-        processInlineTextItem(*inlineItem);
+        // Special case text content. They can overlap multiple items. <span>foo</span><span>bar</span>
+        processInlineTextItem(inlineItem);
         break;
     case InlineItem::Type::HardLineBreak:
-        m_inlineRuns.append(InlineRunProvider::Run::createHardLineBreakRun(*inlineItem));
+        m_inlineRuns.append(InlineRunProvider::Run::createHardLineBreakRun(inlineItem));
         break;
     case InlineItem::Type::InlineBox:
-        m_inlineRuns.append(InlineRunProvider::Run::createBoxRun(*inlineItem));
+        m_inlineRuns.append(InlineRunProvider::Run::createBoxRun(inlineItem));
         break;
     case InlineItem::Type::Float:
-        m_inlineRuns.append(InlineRunProvider::Run::createFloatRun(*inlineItem));
+        m_inlineRuns.append(InlineRunProvider::Run::createFloatRun(inlineItem));
         break;
     default:
         ASSERT_NOT_IMPLEMENTED_YET();
     }
-
-    m_inlineFormattingState.inlineContent().add(WTFMove(inlineItem));
 }
 

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

@@ -35 +35 @@
 namespace Layout {
 
-class InlineFormattingState;
-
 using ItemPosition = unsigned;
 
@@ -42 +40 @@
     WTF_MAKE_ISO_ALLOCATED(InlineRunProvider);
 public:
-    InlineRunProvider(InlineFormattingState&);
+    InlineRunProvider();
 
-    void append(const Box&);
+    void append(const InlineItem&);
     void insertBefore(const Box&, const Box& before);
     void remove(const Box&);
@@ -118 +116 @@
     LazyLineBreakIterator m_lineBreakIterator;
 
-    InlineFormattingState& m_inlineFormattingState;
     Vector<InlineRunProvider::Run> m_inlineRuns;
 };