Changeset 276503 in webkit

Timestamp:

Apr 23, 2021, 10:04:53 AM (5 years ago)

Author:

Russell Epstein

Message:

Apply patch. rdar://problem/76963029

File:

• branches/safari-611-branch/Source/WebCore/layout/inlineformatting/InlineContentBreaker.cpp (modified) (4 diffs)

branches/safari-611-branch/Source/WebCore/layout/inlineformatting/InlineContentBreaker.cpp

@@ -88 +88 @@
 }
 
-static inline bool isWrappingAllowed(const RenderStyle& style)
+static inline bool isWrappingAllowed(const InlineItem& inlineItem)
 {
     // Do not try to wrap overflown 'pre' and 'no-wrap' content to next line.
-    return style.whiteSpace() != WhiteSpace::Pre && style.whiteSpace() != WhiteSpace::NoWrap;
+    auto& styleToUse = inlineItem.isBox() ? inlineItem.layoutBox().parent().style() : inlineItem.layoutBox().style();
+    return styleToUse.whiteSpace() != WhiteSpace::Pre && styleToUse.whiteSpace() != WhiteSpace::NoWrap;
 }
 
@@ -103 +104 @@
     ASSERT(!runList.isEmpty());
     auto lastItemIndex = runList.size() - 1;
-    return isWrappingAllowed(runList[lastItemIndex].inlineItem.style()) ? makeOptional(lastItemIndex) : WTF::nullopt;
+    return isWrappingAllowed(runList[lastItemIndex].inlineItem) ? makeOptional(lastItemIndex) : WTF::nullopt;
 }
 
@@ -227 +228 @@
         // While the inline-block has pre-wrap which allows wrapping, the content lives in a nowrap context.
         if (lastInlineItem.isBox() || lastInlineItem.isInlineBoxStart() || lastInlineItem.isInlineBoxEnd())
-            return isWrappingAllowed(lastInlineItem.layoutBox().parent().style());
+            return isWrappingAllowed(lastInlineItem);
         if (lastInlineItem.isText()) {
             if (runs.size() == 1) {
                 // Fast path for the most common case of an individual text item.
-                return isWrappingAllowed(lastInlineItem.layoutBox().style());
+                return isWrappingAllowed(lastInlineItem);
             }
             for (auto& run : WTF::makeReversedRange(runs)) {
                 auto& inlineItem = run.inlineItem;
                 if (inlineItem.isInlineBoxStart() || inlineItem.isInlineBoxStart())
-                    return isWrappingAllowed(inlineItem.layoutBox().parent().style());
+                    return isWrappingAllowed(inlineItem);
                 ASSERT(!inlineItem.isBox());
             }
             // This must be a set of individual text runs. We could just check the last item.
-            return isWrappingAllowed(lastInlineItem.layoutBox().style());
+            return isWrappingAllowed(lastInlineItem);
         }
         ASSERT_NOT_REACHED();
@@ -262 +263 @@
         }
         // Check if this text run needs to stay on the current line.  
-        return isWrappingAllowed(run.inlineItem.style());
+        return isWrappingAllowed(run.inlineItem);
     };