Attachment 372213 Details for Bug 198900 – Patch

[patch] Patch

bug-198900-20190615201917.patch (text/plain), 2.05 KB, created by zalan on 2019-06-15 20:19:16 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: zalan

Created: 2019-06-15 20:19:16 PDT

Size: 2.05 KB

patch

obsolete

>Subversion Revision: 246468
>diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
>index 1ab2af960e3db027cbc8affff581ae42459eb7c1..3f4657138cc1940208b12f4eb4e7d9559e88b50d 100644
>--- a/Source/WebCore/ChangeLog
>+++ b/Source/WebCore/ChangeLog
>@@ -1,3 +1,15 @@
>+2019-06-15  Zalan Bujtas  <zalan@apple.com>
>+
>+        [LFC][IFC] Completely collapsed runs should not go to the trimmable run list.
>+        https://bugs.webkit.org/show_bug.cgi?id=198900
>+        <rdar://problem/51782156>
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        * layout/inlineformatting/InlineLine.cpp:
>+        (WebCore::Layout::Line::trailingTrimmableWidth const):
>+        (WebCore::Layout::Line::appendTextContent):
>+
> 2019-06-15  Zalan Bujtas  <zalan@apple.com>
> 
>         [LFC][IFC] Use the borderBox rect consistently to size the inline box.
>diff --git a/Source/WebCore/layout/inlineformatting/InlineLine.cpp b/Source/WebCore/layout/inlineformatting/InlineLine.cpp
>index 9aedab13a14c56b048e653a4e1cf7611156fdb2f..e8ee7afddbbadd7dd2e63fd4b0311fb207fd95ea 100644
>--- a/Source/WebCore/layout/inlineformatting/InlineLine.cpp
>+++ b/Source/WebCore/layout/inlineformatting/InlineLine.cpp
>@@ -183,8 +183,10 @@ void Line::moveLogicalRight(LayoutUnit delta)
> LayoutUnit Line::trailingTrimmableWidth() const
> {
>     LayoutUnit trimmableWidth;
>-    for (auto* trimmableRun : m_trimmableContent)
>+    for (auto* trimmableRun : m_trimmableContent) {
>+        ASSERT(!trimmableRun->isCollapsed);
>         trimmableWidth += trimmableRun->logicalRect.width();
>+    }
>     return trimmableWidth;
> }
> 
>@@ -252,7 +254,7 @@ void Line::appendTextContent(const InlineTextItem& inlineItem, LayoutUnit logica
> 
>     auto textContext = Content::Run::TextContext { inlineItem.start(), inlineItem.isCollapsed() ? 1 : inlineItem.length() };
>     auto lineItem = std::make_unique<Content::Run>(inlineItem, logicalRect, textContext, isCompletelyCollapsed, canBeExtended);
>-    if (isTrimmable)
>+    if (isTrimmable && !isCompletelyCollapsed)
>         m_trimmableContent.add(lineItem.get());
> 
>     m_content->runs().append(WTFMove(lineItem));

Actions: View | Formatted Diff | Diff

Attachments on bug 198900: 372213