<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[282725] trunk/Source/WebCore</title>
</head>
<body>

<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt;  }
#msg dl a { font-weight: bold}
#msg dl a:link    { color:#fc3; }
#msg dl a:active  { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff  {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/282725">282725</a></dd>
<dt>Author</dt> <dd>zalan@apple.com</dd>
<dt>Date</dt> <dd>2021-09-18 06:29:40 -0700 (Sat, 18 Sep 2021)</dd>
</dl>

<h3>Log Message</h3>
<pre>[LFC][IFC] Add skeleton implementation for fallback font support
https://bugs.webkit.org/show_bug.cgi?id=230433

Reviewed by Antti Koivisto.

This is in preparation for supporting inline box stretching glyphs coming from fallback fonts.

* layout/formattingContexts/inline/InlineLineBoxBuilder.cpp:
(WebCore::Layout::LineBoxBuilder::adjustVerticalGeometryForInlineBoxWithFallbackFonts const):
(WebCore::Layout::LineBoxBuilder::setInitialVerticalGeometryForInlineBox const):
(WebCore::Layout::LineBoxBuilder::constructAndAlignInlineLevelBoxes):
(WebCore::Layout::LineBoxBuilder::setVerticalGeometryForInlineBox const): Deleted.
* layout/formattingContexts/inline/InlineLineBoxBuilder.h:
* layout/formattingContexts/inline/text/TextUtil.cpp:
(WebCore::Layout::TextUtil::fallbackFontsForRun):
* layout/formattingContexts/inline/text/TextUtil.h:</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorelayoutformattingContextsinlineInlineLineBoxBuildercpp">trunk/Source/WebCore/layout/formattingContexts/inline/InlineLineBoxBuilder.cpp</a></li>
<li><a href="#trunkSourceWebCorelayoutformattingContextsinlineInlineLineBoxBuilderh">trunk/Source/WebCore/layout/formattingContexts/inline/InlineLineBoxBuilder.h</a></li>
<li><a href="#trunkSourceWebCorelayoutformattingContextsinlinetextTextUtilcpp">trunk/Source/WebCore/layout/formattingContexts/inline/text/TextUtil.cpp</a></li>
<li><a href="#trunkSourceWebCorelayoutformattingContextsinlinetextTextUtilh">trunk/Source/WebCore/layout/formattingContexts/inline/text/TextUtil.h</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (282724 => 282725)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog   2021-09-18 13:29:11 UTC (rev 282724)
+++ trunk/Source/WebCore/ChangeLog      2021-09-18 13:29:40 UTC (rev 282725)
</span><span class="lines">@@ -1,5 +1,24 @@
</span><span class="cx"> 2021-09-18  Alan Bujtas  <zalan@apple.com>
</span><span class="cx"> 
</span><ins>+        [LFC][IFC] Add skeleton implementation for fallback font support
+        https://bugs.webkit.org/show_bug.cgi?id=230433
+
+        Reviewed by Antti Koivisto.
+
+        This is in preparation for supporting inline box stretching glyphs coming from fallback fonts.
+
+        * layout/formattingContexts/inline/InlineLineBoxBuilder.cpp:
+        (WebCore::Layout::LineBoxBuilder::adjustVerticalGeometryForInlineBoxWithFallbackFonts const):
+        (WebCore::Layout::LineBoxBuilder::setInitialVerticalGeometryForInlineBox const):
+        (WebCore::Layout::LineBoxBuilder::constructAndAlignInlineLevelBoxes):
+        (WebCore::Layout::LineBoxBuilder::setVerticalGeometryForInlineBox const): Deleted.
+        * layout/formattingContexts/inline/InlineLineBoxBuilder.h:
+        * layout/formattingContexts/inline/text/TextUtil.cpp:
+        (WebCore::Layout::TextUtil::fallbackFontsForRun):
+        * layout/formattingContexts/inline/text/TextUtil.h:
+
+2021-09-18  Alan Bujtas  <zalan@apple.com>
+
</ins><span class="cx">         [IFC][Integration] Enable surrogate pairs
</span><span class="cx">         https://bugs.webkit.org/show_bug.cgi?id=229434
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkSourceWebCorelayoutformattingContextsinlineInlineLineBoxBuildercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/layout/formattingContexts/inline/InlineLineBoxBuilder.cpp (282724 => 282725)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/layout/formattingContexts/inline/InlineLineBoxBuilder.cpp   2021-09-18 13:29:11 UTC (rev 282724)
+++ trunk/Source/WebCore/layout/formattingContexts/inline/InlineLineBoxBuilder.cpp      2021-09-18 13:29:40 UTC (rev 282725)
</span><span class="lines">@@ -158,8 +158,15 @@
</span><span class="cx">     return { lineBox, lineGeometry() };
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-void LineBoxBuilder::setVerticalGeometryForInlineBox(InlineLevelBox& inlineLevelBox) const
</del><ins>+void LineBoxBuilder::adjustVerticalGeometryForInlineBoxWithFallbackFonts(InlineLevelBox& parentInlineBox, const Line::Run& textRun, const TextUtil::FallbackFontList& fallbackFonts) const
</ins><span class="cx"> {
</span><ins>+    UNUSED_PARAM(parentInlineBox);
+    UNUSED_PARAM(textRun);
+    UNUSED_PARAM(fallbackFonts);
+}
+
+void LineBoxBuilder::setInitialVerticalGeometryForInlineBox(InlineLevelBox& inlineLevelBox) const
+{
</ins><span class="cx">     ASSERT(inlineLevelBox.isInlineBox() || inlineLevelBox.isLineBreakBox());
</span><span class="cx">     auto& fontMetrics = inlineLevelBox.style().fontMetrics();
</span><span class="cx">     InlineLayoutUnit ascent = fontMetrics.ascent();
</span><span class="lines">@@ -195,7 +202,7 @@
</span><span class="cx"> InlineLayoutUnit LineBoxBuilder::constructAndAlignInlineLevelBoxes(LineBox& lineBox, const Line::RunList& runs)
</span><span class="cx"> {
</span><span class="cx">     auto& rootInlineBox = lineBox.rootInlineBox();
</span><del>-    setVerticalGeometryForInlineBox(rootInlineBox);
</del><ins>+    setInitialVerticalGeometryForInlineBox(rootInlineBox);
</ins><span class="cx"> 
</span><span class="cx">     // FIXME: Add fast path support for line-height content.
</span><span class="cx">     // FIXME: We should always be able to exercise the fast path when the line has no content at all, even in non-standards mode or with line-height set.
</span><span class="lines">@@ -236,7 +243,7 @@
</span><span class="cx">         // Construct the missing LineBox::InlineBoxes starting with the topmost layout box.
</span><span class="cx">         for (auto* layoutBox : WTF::makeReversedRange(layoutBoxesWithoutInlineBoxes)) {
</span><span class="cx">             auto inlineBox = InlineLevelBox::createInlineBox(*layoutBox, rootInlineBox.logicalLeft(), rootInlineBox.logicalWidth(), InlineLevelBox::LineSpanningInlineBox::Yes);
</span><del>-            setVerticalGeometryForInlineBox(inlineBox);
</del><ins>+            setInitialVerticalGeometryForInlineBox(inlineBox);
</ins><span class="cx">             updateCanUseSimplifiedAlignment(inlineBox);
</span><span class="cx">             lineBox.addInlineLevelBox(WTFMove(inlineBox));
</span><span class="cx">         }
</span><span class="lines">@@ -303,7 +310,7 @@
</span><span class="cx">             auto initialLogicalWidth = rootInlineBox.logicalWidth() - (run.logicalLeft() + marginStart);
</span><span class="cx">             ASSERT(initialLogicalWidth >= 0);
</span><span class="cx">             auto inlineBox = InlineLevelBox::createInlineBox(layoutBox, logicalLeft + marginStart, initialLogicalWidth);
</span><del>-            setVerticalGeometryForInlineBox(inlineBox);
</del><ins>+            setInitialVerticalGeometryForInlineBox(inlineBox);
</ins><span class="cx">             updateCanUseSimplifiedAlignment(inlineBox);
</span><span class="cx">             lineBox.addInlineLevelBox(WTFMove(inlineBox));
</span><span class="cx">             continue;
</span><span class="lines">@@ -324,14 +331,24 @@
</span><span class="cx">             updateCanUseSimplifiedAlignment(inlineBox);
</span><span class="cx">             continue;
</span><span class="cx">         }
</span><del>-        if (run.isText() || run.isSoftLineBreak()) {
-            // FIXME: Adjust non-empty inline box height when glyphs from the non-primary font stretch the box.
</del><ins>+        if (run.isText()) {
+            auto& parentInlineBox = lineBox.inlineLevelBoxForLayoutBox(layoutBox.parent());
+            parentInlineBox.setHasContent();
+            auto fallbackFonts = TextUtil::fallbackFontsForRun(run);
+            if (!fallbackFonts.isEmpty()) {
+                // Adjust non-empty inline box height when glyphs from the non-primary font stretch the box.
+                adjustVerticalGeometryForInlineBoxWithFallbackFonts(parentInlineBox, run, fallbackFonts);
+                updateCanUseSimplifiedAlignment(parentInlineBox);
+            }
+            continue;
+        }
+        if (run.isSoftLineBreak()) {
</ins><span class="cx">             lineBox.inlineLevelBoxForLayoutBox(layoutBox.parent()).setHasContent();
</span><span class="cx">             continue;
</span><span class="cx">         }
</span><span class="cx">         if (run.isHardLineBreak()) {
</span><span class="cx">             auto lineBreakBox = InlineLevelBox::createLineBreakBox(layoutBox, logicalLeft);
</span><del>-            setVerticalGeometryForInlineBox(lineBreakBox);
</del><ins>+            setInitialVerticalGeometryForInlineBox(lineBreakBox);
</ins><span class="cx">             updateCanUseSimplifiedAlignment(lineBreakBox);
</span><span class="cx">             lineBox.addInlineLevelBox(WTFMove(lineBreakBox));
</span><span class="cx">             continue;
</span></span></pre></div>
<a id="trunkSourceWebCorelayoutformattingContextsinlineInlineLineBoxBuilderh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/layout/formattingContexts/inline/InlineLineBoxBuilder.h (282724 => 282725)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/layout/formattingContexts/inline/InlineLineBoxBuilder.h     2021-09-18 13:29:11 UTC (rev 282724)
+++ trunk/Source/WebCore/layout/formattingContexts/inline/InlineLineBoxBuilder.h        2021-09-18 13:29:40 UTC (rev 282725)
</span><span class="lines">@@ -31,6 +31,7 @@
</span><span class="cx"> #include "InlineLineBox.h"
</span><span class="cx"> #include "InlineLineBuilder.h"
</span><span class="cx"> #include "InlineLineGeometry.h"
</span><ins>+#include "TextUtil.h"
</ins><span class="cx"> 
</span><span class="cx"> namespace WebCore {
</span><span class="cx"> namespace Layout {
</span><span class="lines">@@ -50,7 +51,8 @@
</span><span class="cx">     LineBoxAndGeometry build(const LineBuilder::LineContent&);
</span><span class="cx"> 
</span><span class="cx"> private:
</span><del>-    void setVerticalGeometryForInlineBox(InlineLevelBox&) const;
</del><ins>+    void setInitialVerticalGeometryForInlineBox(InlineLevelBox&) const;
+    void adjustVerticalGeometryForInlineBoxWithFallbackFonts(InlineLevelBox&, const Line::Run&, const TextUtil::FallbackFontList&) const;
</ins><span class="cx">     InlineLayoutUnit constructAndAlignInlineLevelBoxes(LineBox&, const Line::RunList&);
</span><span class="cx"> 
</span><span class="cx">     const InlineFormattingContext& formattingContext() const { return m_inlineFormattingContext; }
</span></span></pre></div>
<a id="trunkSourceWebCorelayoutformattingContextsinlinetextTextUtilcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/layout/formattingContexts/inline/text/TextUtil.cpp (282724 => 282725)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/layout/formattingContexts/inline/text/TextUtil.cpp  2021-09-18 13:29:11 UTC (rev 282724)
+++ trunk/Source/WebCore/layout/formattingContexts/inline/text/TextUtil.cpp     2021-09-18 13:29:40 UTC (rev 282725)
</span><span class="lines">@@ -84,6 +84,13 @@
</span><span class="cx">     return std::isnan(width) ? 0.0f : std::isinf(width) ? maxInlineLayoutUnit() : width;
</span><span class="cx"> }
</span><span class="cx"> 
</span><ins>+TextUtil::FallbackFontList TextUtil::fallbackFontsForRun(const Line::Run& run)
+{
+    UNUSED_PARAM(run);
+
+    return { };
+}
+
</ins><span class="cx"> TextUtil::MidWordBreak TextUtil::midWordBreak(const InlineTextItem& inlineTextItem, InlineLayoutUnit textWidth, InlineLayoutUnit availableWidth, InlineLayoutUnit contentLogicalLeft)
</span><span class="cx"> {
</span><span class="cx">     ASSERT(availableWidth >= 0);
</span></span></pre></div>
<a id="trunkSourceWebCorelayoutformattingContextsinlinetextTextUtilh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/layout/formattingContexts/inline/text/TextUtil.h (282724 => 282725)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/layout/formattingContexts/inline/text/TextUtil.h    2021-09-18 13:29:11 UTC (rev 282724)
+++ trunk/Source/WebCore/layout/formattingContexts/inline/text/TextUtil.h       2021-09-18 13:29:40 UTC (rev 282725)
</span><span class="lines">@@ -27,7 +27,9 @@
</span><span class="cx"> 
</span><span class="cx"> #if ENABLE(LAYOUT_FORMATTING_CONTEXT)
</span><span class="cx"> 
</span><ins>+#include "Font.h"
</ins><span class="cx"> #include "InlineItem.h"
</span><ins>+#include "InlineLine.h"
</ins><span class="cx"> #include "LayoutUnits.h"
</span><span class="cx"> #include <wtf/text/TextBreakIterator.h>
</span><span class="cx"> 
</span><span class="lines">@@ -46,6 +48,9 @@
</span><span class="cx">     static InlineLayoutUnit width(const InlineTextItem&, unsigned from, unsigned to, InlineLayoutUnit contentLogicalLeft);
</span><span class="cx">     static InlineLayoutUnit width(const InlineTextBox&, unsigned from, unsigned to, InlineLayoutUnit contentLogicalLeft);
</span><span class="cx"> 
</span><ins>+    using FallbackFontList = HashSet<const Font*>;
+    static FallbackFontList fallbackFontsForRun(const Line::Run&);
+
</ins><span class="cx">     struct MidWordBreak {
</span><span class="cx">         size_t start { 0 };
</span><span class="cx">         size_t length { 0 };
</span></span></pre>
</div>
</div>

</body>
</html>