Changeset 238420 in webkit

Timestamp:

Nov 21, 2018 9:36:32 AM (5 years ago)

Author:

Alan Bujtas

Message:

[LFC][IFC] Use contains and containsAll in InlineFormattingContext::splitInlineRunIfNeeded consistently
​https://bugs.webkit.org/show_bug.cgi?id=191890

Rearrange the comment numbers to match the logic below.

Reviewed by Antti Koivisto.

• layout/inlineformatting/InlineFormattingContext.cpp:

(WebCore::Layout::InlineFormattingContext::splitInlineRunIfNeeded const):

Location:

trunk/Source/WebCore

Files:

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

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2018-11-21  Zalan Bujtas  <zalan@apple.com>
+
+        [LFC][IFC] Use contains and containsAll in InlineFormattingContext::splitInlineRunIfNeeded consistently
+        https://bugs.webkit.org/show_bug.cgi?id=191890
+
+        Rearrange the comment numbers to match the logic below.
+
+        Reviewed by Antti Koivisto.
+
+        * layout/inlineformatting/InlineFormattingContext.cpp:
+        (WebCore::Layout::InlineFormattingContext::splitInlineRunIfNeeded const):
+
 2018-11-20  Dean Jackson  <dino@apple.com>
 

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

@@ -180 +180 @@
         };
 
-        // 1. Inline element does not require run breaking -> add current inline element to uncommitted. Jump to the next element.
+        // 1. Break before/after -> requires dedicated run -> commit what we've got so far and also commit the current inline element as a separate inline run.
         // 2. Break at the beginning of the inline element -> commit what we've got so far. Current element becomes the first uncommitted.
         // 3. Break at the end of the inline element -> commit what we've got so far including the current element.
-        // 4. Break before/after -> requires dedicated run -> commit what we've got so far and also commit the current inline element as a separate inline run.
+        // 4. Inline element does not require run breaking -> add current inline element to uncommitted. Jump to the next element.
         auto detachingRules = inlineItem.detachingRules();
 
-        // #4
+        // #1
         if (detachingRules.containsAll({ InlineItem::DetachingRule::BreakAtStart, InlineItem::DetachingRule::BreakAtEnd })) {
             commit();
@@ -195 +195 @@
 
         // #2
-        if (detachingRules == InlineItem::DetachingRule::BreakAtStart)
+        if (detachingRules.contains(InlineItem::DetachingRule::BreakAtStart))
             commit();
 
         // Add current inline item to uncommitted.
+        // #3 and #4
         if (!uncommitted)
             uncommitted = Uncommitted { &inlineItem, &inlineItem, 0 };
@@ -205 +206 @@
 
         // #3
-        if (detachingRules == InlineItem::DetachingRule::BreakAtEnd)
+        if (detachingRules.contains(InlineItem::DetachingRule::BreakAtEnd))
             commit();
     }