<!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>[211292] trunk</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/211292">211292</a></dd>
<dt>Author</dt> <dd>zalan@apple.com</dd>
<dt>Date</dt> <dd>2017-01-27 11:24:26 -0800 (Fri, 27 Jan 2017)</dd>
</dl>
<h3>Log Message</h3>
<pre>Simple line layout: Do not bail out on -webkit-line-box-contain: block glyphs unless text overflows vertically.
https://bugs.webkit.org/show_bug.cgi?id=167481
<rdar://problem/30180150>
Reviewed by Antti Koivisto.
Source/WebCore:
Since -webkit-line-box-contain: glyphs requires variable line height support, we can use simple line layout
only when each line happen to have the same height ('block' property value is set, glyphs do not overflow the block line height).
Test: fast/text/simple-line-layout-line-box-contain-glyphs.html
* rendering/SimpleLineLayout.cpp:
(WebCore::SimpleLineLayout::canUseForText):
(WebCore::SimpleLineLayout::canUseForFontAndText):
(WebCore::SimpleLineLayout::canUseForStyle):
(WebCore::SimpleLineLayout::printReason):
LayoutTests:
* fast/text/simple-line-layout-line-box-contain-glyphs-expected.html: Added.
* fast/text/simple-line-layout-line-box-contain-glyphs.html: Added.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorerenderingSimpleLineLayoutcpp">trunk/Source/WebCore/rendering/SimpleLineLayout.cpp</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsfasttextsimplelinelayoutlineboxcontainglyphsexpectedhtml">trunk/LayoutTests/fast/text/simple-line-layout-line-box-contain-glyphs-expected.html</a></li>
<li><a href="#trunkLayoutTestsfasttextsimplelinelayoutlineboxcontainglyphshtml">trunk/LayoutTests/fast/text/simple-line-layout-line-box-contain-glyphs.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (211291 => 211292)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2017-01-27 19:14:57 UTC (rev 211291)
+++ trunk/LayoutTests/ChangeLog 2017-01-27 19:24:26 UTC (rev 211292)
</span><span class="lines">@@ -1,3 +1,14 @@
</span><ins>+2017-01-27 Zalan Bujtas <zalan@apple.com>
+
+ Simple line layout: Do not bail out on -webkit-line-box-contain: block glyphs unless text overflows vertically.
+ https://bugs.webkit.org/show_bug.cgi?id=167481
+ <rdar://problem/30180150>
+
+ Reviewed by Antti Koivisto.
+
+ * fast/text/simple-line-layout-line-box-contain-glyphs-expected.html: Added.
+ * fast/text/simple-line-layout-line-box-contain-glyphs.html: Added.
+
</ins><span class="cx"> 2017-01-27 Devin Rousso <dcrousso+webkit@gmail.com>
</span><span class="cx">
</span><span class="cx"> Styles should not show background-repeat-x/y, or -webkit-mask-repeat-x/y
</span></span></pre></div>
<a id="trunkLayoutTestsfasttextsimplelinelayoutlineboxcontainglyphsexpectedhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/text/simple-line-layout-line-box-contain-glyphs-expected.html (0 => 211292)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/text/simple-line-layout-line-box-contain-glyphs-expected.html (rev 0)
+++ trunk/LayoutTests/fast/text/simple-line-layout-line-box-contain-glyphs-expected.html 2017-01-27 19:24:26 UTC (rev 211292)
</span><span class="lines">@@ -0,0 +1,19 @@
</span><ins>+<!doctype html>
+<html>
+<head>
+<title>This tests that we don't use simple line layout when webkit-line-box-contain: glyphs is set and the glyphs overflow the line vertically.</title>
+<style>
+div {
+ -webkit-line-box-contain: glyphs;
+ line-height: 10px;
+}
+</style>
+<script>
+ if (window.internals)
+ internals.settings.setSimpleLineLayoutDebugBordersEnabled(false);
+</script>
+</head>
+<body>
+<div>foobar</div>
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkLayoutTestsfasttextsimplelinelayoutlineboxcontainglyphshtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/text/simple-line-layout-line-box-contain-glyphs.html (0 => 211292)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/text/simple-line-layout-line-box-contain-glyphs.html (rev 0)
+++ trunk/LayoutTests/fast/text/simple-line-layout-line-box-contain-glyphs.html 2017-01-27 19:24:26 UTC (rev 211292)
</span><span class="lines">@@ -0,0 +1,19 @@
</span><ins>+<!doctype html>
+<html>
+<head>
+<title>This tests that we don't use simple line layout when webkit-line-box-contain: glyphs is set and the glyphs overflow the line vertically.</title>
+<style>
+div {
+ -webkit-line-box-contain: glyphs;
+ line-height: 10px;
+}
+</style>
+<script>
+ if (window.internals)
+ internals.settings.setSimpleLineLayoutDebugBordersEnabled(true);
+</script>
+</head>
+<body>
+<div>foobar</div>
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (211291 => 211292)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2017-01-27 19:14:57 UTC (rev 211291)
+++ trunk/Source/WebCore/ChangeLog 2017-01-27 19:24:26 UTC (rev 211292)
</span><span class="lines">@@ -1,3 +1,22 @@
</span><ins>+2017-01-27 Zalan Bujtas <zalan@apple.com>
+
+ Simple line layout: Do not bail out on -webkit-line-box-contain: block glyphs unless text overflows vertically.
+ https://bugs.webkit.org/show_bug.cgi?id=167481
+ <rdar://problem/30180150>
+
+ Reviewed by Antti Koivisto.
+
+ Since -webkit-line-box-contain: glyphs requires variable line height support, we can use simple line layout
+ only when each line happen to have the same height ('block' property value is set, glyphs do not overflow the block line height).
+
+ Test: fast/text/simple-line-layout-line-box-contain-glyphs.html
+
+ * rendering/SimpleLineLayout.cpp:
+ (WebCore::SimpleLineLayout::canUseForText):
+ (WebCore::SimpleLineLayout::canUseForFontAndText):
+ (WebCore::SimpleLineLayout::canUseForStyle):
+ (WebCore::SimpleLineLayout::printReason):
+
</ins><span class="cx"> 2017-01-27 Chris Dumez <cdumez@apple.com>
</span><span class="cx">
</span><span class="cx"> Fix PageCache diagnostic logging
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingSimpleLineLayoutcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/SimpleLineLayout.cpp (211291 => 211292)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/SimpleLineLayout.cpp 2017-01-27 19:14:57 UTC (rev 211291)
+++ trunk/Source/WebCore/rendering/SimpleLineLayout.cpp 2017-01-27 19:24:26 UTC (rev 211292)
</span><span class="lines">@@ -112,7 +112,8 @@
</span><span class="cx"> FlowHasNoChild = 1LLU << 46,
</span><span class="cx"> FlowChildIsSelected = 1LLU << 47,
</span><span class="cx"> FlowHasHangingPunctuation = 1LLU << 48,
</span><del>- EndOfReasons = 1LLU << 49
</del><ins>+ FlowFontHasOverflowGlyph = 1LLU << 49,
+ EndOfReasons = 1LLU << 50
</ins><span class="cx"> };
</span><span class="cx"> const unsigned NoReason = 0;
</span><span class="cx">
</span><span class="lines">@@ -136,7 +137,8 @@
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> template <typename CharacterType>
</span><del>-static AvoidanceReasonFlags canUseForText(const CharacterType* text, unsigned length, const Font& font, bool textIsJustified, IncludeReasons includeReasons)
</del><ins>+static AvoidanceReasonFlags canUseForText(const CharacterType* text, unsigned length, const Font& font, std::optional<float> lineHeightConstraint,
+ bool textIsJustified, IncludeReasons includeReasons)
</ins><span class="cx"> {
</span><span class="cx"> AvoidanceReasonFlags reasons = { };
</span><span class="cx"> // FIXME: <textarea maxlength=0> generates empty text node.
</span><span class="lines">@@ -166,17 +168,20 @@
</span><span class="cx"> || direction == U_POP_DIRECTIONAL_FORMAT || direction == U_BOUNDARY_NEUTRAL)
</span><span class="cx"> SET_REASON_AND_RETURN_IF_NEEDED(FlowTextHasDirectionCharacter, reasons, includeReasons);
</span><span class="cx">
</span><del>- if (!font.glyphForCharacter(character))
</del><ins>+ auto glyph = font.glyphForCharacter(character);
+ if (!glyph)
</ins><span class="cx"> SET_REASON_AND_RETURN_IF_NEEDED(FlowFontIsMissingGlyph, reasons, includeReasons);
</span><ins>+ if (lineHeightConstraint && font.boundsForGlyph(glyph).height() > *lineHeightConstraint)
+ SET_REASON_AND_RETURN_IF_NEEDED(FlowFontHasOverflowGlyph, reasons, includeReasons);
</ins><span class="cx"> }
</span><span class="cx"> return reasons;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static AvoidanceReasonFlags canUseForText(const RenderText& textRenderer, const Font& font, bool textIsJustified, IncludeReasons includeReasons)
</del><ins>+static AvoidanceReasonFlags canUseForText(const RenderText& textRenderer, const Font& font, std::optional<float> lineHeightConstraint, bool textIsJustified, IncludeReasons includeReasons)
</ins><span class="cx"> {
</span><span class="cx"> if (textRenderer.is8Bit())
</span><del>- return canUseForText(textRenderer.characters8(), textRenderer.textLength(), font, false, includeReasons);
- return canUseForText(textRenderer.characters16(), textRenderer.textLength(), font, textIsJustified, includeReasons);
</del><ins>+ return canUseForText(textRenderer.characters8(), textRenderer.textLength(), font, lineHeightConstraint, false, includeReasons);
+ return canUseForText(textRenderer.characters16(), textRenderer.textLength(), font, lineHeightConstraint, textIsJustified, includeReasons);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static AvoidanceReasonFlags canUseForFontAndText(const RenderBlockFlow& flow, IncludeReasons includeReasons)
</span><span class="lines">@@ -187,7 +192,9 @@
</span><span class="cx"> auto& primaryFont = style.fontCascade().primaryFont();
</span><span class="cx"> if (primaryFont.isLoading())
</span><span class="cx"> SET_REASON_AND_RETURN_IF_NEEDED(FlowIsMissingPrimaryFont, reasons, includeReasons);
</span><del>-
</del><ins>+ std::optional<float> lineHeightConstraint;
+ if (style.lineBoxContain() & LineBoxContainGlyphs)
+ lineHeightConstraint = lineHeightFromFlow(flow).toFloat();
</ins><span class="cx"> bool flowIsJustified = style.textAlign() == JUSTIFY;
</span><span class="cx"> for (const auto& textRenderer : childrenOfType<RenderText>(flow)) {
</span><span class="cx"> if (textRenderer.isCombineText())
</span><span class="lines">@@ -203,7 +210,7 @@
</span><span class="cx"> if (style.fontCascade().codePath(TextRun(textRenderer.text())) != FontCascade::Simple)
</span><span class="cx"> SET_REASON_AND_RETURN_IF_NEEDED(FlowFontIsNotSimple, reasons, includeReasons);
</span><span class="cx">
</span><del>- auto textReasons = canUseForText(textRenderer, primaryFont, flowIsJustified, includeReasons);
</del><ins>+ auto textReasons = canUseForText(textRenderer, primaryFont, lineHeightConstraint, flowIsJustified, includeReasons);
</ins><span class="cx"> if (textReasons != NoReason)
</span><span class="cx"> SET_REASON_AND_RETURN_IF_NEEDED(textReasons, reasons, includeReasons);
</span><span class="cx"> }
</span><span class="lines">@@ -222,7 +229,7 @@
</span><span class="cx"> SET_REASON_AND_RETURN_IF_NEEDED(FlowHasOverflowVisible, reasons, includeReasons);
</span><span class="cx"> if (!style.isLeftToRightDirection())
</span><span class="cx"> SET_REASON_AND_RETURN_IF_NEEDED(FlowIsNotLTR, reasons, includeReasons);
</span><del>- if (style.lineBoxContain() != RenderStyle::initialLineBoxContain())
</del><ins>+ if (!(style.lineBoxContain() & LineBoxContainBlock))
</ins><span class="cx"> SET_REASON_AND_RETURN_IF_NEEDED(FlowHasLineBoxContainProperty, reasons, includeReasons);
</span><span class="cx"> if (style.writingMode() != TopToBottomWritingMode)
</span><span class="cx"> SET_REASON_AND_RETURN_IF_NEEDED(FlowIsNotTopToBottom, reasons, includeReasons);
</span><span class="lines">@@ -977,7 +984,7 @@
</span><span class="cx"> stream << "dir is not LTR";
</span><span class="cx"> break;
</span><span class="cx"> case FlowHasLineBoxContainProperty:
</span><del>- stream << "line-box-contain property";
</del><ins>+ stream << "line-box-contain value indicates variable line height";
</ins><span class="cx"> break;
</span><span class="cx"> case FlowIsNotTopToBottom:
</span><span class="cx"> stream << "non top-to-bottom flow";
</span><span class="lines">@@ -1060,6 +1067,9 @@
</span><span class="cx"> case FlowChildIsSelected:
</span><span class="cx"> stream << "selected content";
</span><span class="cx"> break;
</span><ins>+ case FlowFontHasOverflowGlyph:
+ stream << "-webkit-line-box-contain: glyphs with overflowing text.";
+ break;
</ins><span class="cx"> case FlowTextIsEmpty:
</span><span class="cx"> case FlowHasNoChild:
</span><span class="cx"> case FlowHasNoParent:
</span></span></pre>
</div>
</div>
</body>
</html>