Changeset 238449 in webkit

Timestamp:

Nov 22, 2018, 10:56:28 AM (8 years ago)

Author:

Alan Bujtas

Message:

[LFC][IFC] Merge addNonBreakableStart/NonBreakableEnd calls.
​https://bugs.webkit.org/show_bug.cgi?id=191903

Reviewed by Antti Koivisto.

• layout/inlineformatting/InlineFormattingContext.cpp:

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

Location:

trunk/Source/WebCore

Files:

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

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2018-11-22  Zalan Bujtas  <zalan@apple.com>
+
+        [LFC][IFC] Merge addNonBreakableStart/NonBreakableEnd calls.
+        https://bugs.webkit.org/show_bug.cgi?id=191903
+
+        Reviewed by Antti Koivisto.
+
+        * layout/inlineformatting/InlineFormattingContext.cpp:
+        (WebCore::Layout::InlineFormattingContext::collectInlineContentForSubtree const):
+
 2018-11-22  Zalan Bujtas  <zalan@apple.com>
 

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

@@ -500 +500 @@
         ASSERT(firstDescendantInlineBox);
         firstDescendantInlineBox->addDetachingRule(InlineItem::DetachingRule::BreakAtStart);
+        auto startOffset = border.horizontal.left + horizontalMargins.left;
         if (padding)
-            firstDescendantInlineBox->addNonBreakableStart(padding->horizontal.left);
-        firstDescendantInlineBox->addNonBreakableStart(border.horizontal.left);
-        firstDescendantInlineBox->addNonBreakableStart(horizontalMargins.left);
+            startOffset += padding->horizontal.left;
+        firstDescendantInlineBox->addNonBreakableStart(startOffset);
     }
 
     if (rootBreaksAtEnd()) {
         lastDescendantInlineBox->addDetachingRule(InlineItem::DetachingRule::BreakAtEnd);
+        auto endOffset = border.horizontal.right + horizontalMargins.right;
         if (padding)
-            lastDescendantInlineBox->addNonBreakableEnd(padding->horizontal.right);
-        lastDescendantInlineBox->addNonBreakableEnd(border.horizontal.right);
-        lastDescendantInlineBox->addNonBreakableEnd(horizontalMargins.right);
+            endOffset += padding->horizontal.right;
+        lastDescendantInlineBox->addNonBreakableEnd(endOffset);
     }
 }