Changeset 238349 in webkit

Timestamp:

Nov 17, 2018 8:11:24 AM (5 years ago)

Author:

Alan Bujtas

Message:

[LFC][IFC] InlineFormattingState::addDetachingRule should accumulate rules.
​https://bugs.webkit.org/show_bug.cgi?id=191801

Reviewed by Antti Koivisto.

Source/WebCore:

before<span style="position: relative">positioned</span>after
In the example above the <positioned> inline box has both the BreakAtStart and the BreakAtEnd rules.
While walking through the inline tree, we add BreakAtStart first and when we figure it's the last child too,
we add BreakAtEnd as well. BreakAtEnd should not clear the BreakAtStart rule.

Test: fast/inline/simple-inline-with-out-of-flow-descendant2.html

• layout/inlineformatting/InlineFormattingContext.cpp:

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

• layout/inlineformatting/InlineFormattingState.cpp:

(WebCore::Layout::InlineFormattingState::addDetachingRule):

• layout/inlineformatting/InlineFormattingState.h:

(WebCore::Layout::InlineFormattingState::addDetachingRule): Deleted.

Tools:

• LayoutReloaded/misc/LFC-passing-tests.txt:

LayoutTests:

• fast/inline/simple-inline-with-out-of-flow-descendant2-expected.txt: Added.
• fast/inline/simple-inline-with-out-of-flow-descendant2.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/inline/simple-inline-with-out-of-flow-descendant2-expected.txt (added)
• LayoutTests/fast/inline/simple-inline-with-out-of-flow-descendant2.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/layout/inlineformatting/InlineFormattingContext.cpp (modified) (4 diffs)
• Source/WebCore/layout/inlineformatting/InlineFormattingState.cpp (modified) (1 diff)
• Source/WebCore/layout/inlineformatting/InlineFormattingState.h (modified) (2 diffs)
• Tools/ChangeLog (modified) (1 diff)
• Tools/LayoutReloaded/misc/LFC-passing-tests.txt (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2018-11-17  Zalan Bujtas  <zalan@apple.com>
+
+        [LFC][IFC] InlineFormattingState::addDetachingRule should accumulate rules.
+        https://bugs.webkit.org/show_bug.cgi?id=191801
+
+        Reviewed by Antti Koivisto.
+
+        * fast/inline/simple-inline-with-out-of-flow-descendant2-expected.txt: Added.
+        * fast/inline/simple-inline-with-out-of-flow-descendant2.html: Added.
+
 2018-11-17  Jonathan Hammer  <jonathan@e3software.com>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2018-11-17  Zalan Bujtas  <zalan@apple.com>
+
+        [LFC][IFC] InlineFormattingState::addDetachingRule should accumulate rules.
+        https://bugs.webkit.org/show_bug.cgi?id=191801
+
+        Reviewed by Antti Koivisto.
+
+        before<span style="position: relative">positioned</span>after
+        In the example above the <positioned> inline box has both the BreakAtStart and the BreakAtEnd rules.
+        While walking through the inline tree, we add BreakAtStart first and when we figure it's the last child too,
+        we add BreakAtEnd as well. BreakAtEnd should not clear the BreakAtStart rule.
+
+        Test: fast/inline/simple-inline-with-out-of-flow-descendant2.html
+
+        * layout/inlineformatting/InlineFormattingContext.cpp:
+        (WebCore::Layout::InlineFormattingContext::collectInlineContentForSubtree const):
+        * layout/inlineformatting/InlineFormattingState.cpp:
+        (WebCore::Layout::InlineFormattingState::addDetachingRule):
+        * layout/inlineformatting/InlineFormattingState.h:
+        (WebCore::Layout::InlineFormattingState::addDetachingRule): Deleted.
+
 2018-11-17  Jonathan Hammer  <jonathan@e3software.com>
 

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

@@ -176 +176 @@
 
         // #1
-        if (!detachingRules) {
+        if (detachingRules.isEmpty()) {
             uncommittedLength += currentLength();
             firstUncommittedInlineItem = !firstUncommittedInlineItem ? &inlineItem : firstUncommittedInlineItem;
@@ -195 +195 @@
 
         // #2
-        if (*detachingRules == InlineFormattingState::DetachingRule::BreakAtStart) {
+        if (detachingRules == InlineFormattingState::DetachingRule::BreakAtStart) {
             commit();
             firstUncommittedInlineItem = &inlineItem;
@@ -203 +203 @@
 
         // #3
-        if (*detachingRules == InlineFormattingState::DetachingRule::BreakAtEnd) {
+        if (detachingRules == InlineFormattingState::DetachingRule::BreakAtEnd) {
             ASSERT(firstUncommittedInlineItem);
             uncommittedLength += currentLength();
@@ -456 +456 @@
         // Skip formatting root subtree. They are not part of this inline formatting context.
         inlineRunProvider.append(root);
-        inlineFormattingState.addDetachingRule(root, { InlineFormattingState::DetachingRule::BreakAtStart, InlineFormattingState::DetachingRule::BreakAtEnd });
+        inlineFormattingState.setDetachingRules(root, { InlineFormattingState::DetachingRule::BreakAtStart, InlineFormattingState::DetachingRule::BreakAtEnd });
         return;
     }

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

@@ -51 +51 @@
 }
 
-std::optional<InlineFormattingState::DetachingRules> InlineFormattingState::detachingRules(const Box& layoutBox) const
+void InlineFormattingState::addDetachingRule(const Box& layoutBox, DetachingRule detachingRule)
+{
+    m_detachingRules.add(&layoutBox, DetachingRule { }).iterator->value.add(detachingRule);
+}
+
+OptionSet<InlineFormattingState::DetachingRule> InlineFormattingState::detachingRules(const Box& layoutBox) const
 {
     auto detachingRules = m_detachingRules.get(&layoutBox);

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

@@ -71 +71 @@
         BreakAtEnd = 1 << 1
     };
-    using DetachingRules = OptionSet<DetachingRule>;
-    std::optional<DetachingRules> detachingRules(const Box& layoutBox) const;
-    void addDetachingRule(const Box& layoutBox, DetachingRules detachingRules) { m_detachingRules.set(&layoutBox, detachingRules); }
+    void addDetachingRule(const Box& layoutBox, DetachingRule);
+
+    OptionSet<DetachingRule> detachingRules(const Box& layoutBox) const;
+    void setDetachingRules(const Box& layoutBox, OptionSet<DetachingRule> detachingRules) { m_detachingRules.set(&layoutBox, detachingRules); }
 
     // Temp
@@ -80 +81 @@
 
 private:
-    using DetachingRulesForInlineItems = HashMap<const Box*, DetachingRules>;
+    using DetachingRulesForInlineItems = HashMap<const Box*, OptionSet<DetachingRule>>;
 
     InlineContent m_inlineContent;

trunk/Tools/ChangeLog

@@ +1 @@
+2018-11-17  Zalan Bujtas  <zalan@apple.com>
+
+        [LFC][IFC] InlineFormattingState::addDetachingRule should accumulate rules.
+        https://bugs.webkit.org/show_bug.cgi?id=191801
+
+        Reviewed by Antti Koivisto.
+
+        * LayoutReloaded/misc/LFC-passing-tests.txt:
+
 2018-11-17  Jer Noble  <jer.noble@apple.com>
 

trunk/Tools/LayoutReloaded/misc/LFC-passing-tests.txt

@@ -72 +72 @@
 fast/inline/simple-inline-inflow-positioned.html
 fast/inline/simple-inline-with-out-of-flow-descendant.html
+fast/inline/simple-inline-with-out-of-flow-descendant2.html
 fast/block/basic/height-percentage-simple.html
 fast/block/basic/child-block-level-box-with-height-percent.html