<!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>[198998] 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/198998">198998</a></dd>
<dt>Author</dt> <dd>fred.wang@free.fr</dd>
<dt>Date</dt> <dd>2016-04-04 01:25:37 -0700 (Mon, 04 Apr 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Refactor RenderMathMLRow layout functions to avoid using flexbox
https://bugs.webkit.org/show_bug.cgi?id=153208
Patch by Frederic Wang <fwang@igalia.com> on 2016-04-04
Reviewed by Martin Robinson.
Source/WebCore:
This is the first patch to rewrite MathML layout without relying on
flexboxes or anonymous renderers.
We have done some temporary changes to allow overriding of
layoutBlock and to implement paintChildren, but this will be remove in a
follow-up patch. We also implement firstLineBaseline,
computePreferredLogicalWidths and layoutBlock of RenderMathMLRow without
using any flexbox functions. We adjust a bit the MathML CSS to take into
account these changes. Finally, we delete the unused helper function to
create anonymous RenderMathMLRow.
* css/mathml.css:
(ms, mtext, mi, mn, mo, annotation, mtd): Prevent linebreaking inside token elements and table cells, otherwise this cause test failures with the new implementation of RenderMathMLRow.
(math, mrow, mfenced, merror, mphantom, mstyle, menclose): Deleted. We no longer rely on flexbox for baseline alignment of RenderMathMLRow.
* rendering/RenderFlexibleBox.h: Allow overrider of the LayoutBlock for the moment.
* rendering/RenderObject.h:
(WebCore::RenderObject::isRenderMathMLMenclose): Add helper function.
* rendering/mathml/RenderMathMLMenclose.h: ditto.
* rendering/mathml/RenderMathMLBlock.h:
(WebCore::ascentForChild): Add helper function to easily compute the ascent of a child.
* rendering/mathml/RenderMathMLRow.cpp: Reimplement the class without using the flexbox layout.
(WebCore::RenderMathMLRow::firstLineBaseline): Implement the function to determine the baseline.
(WebCore::RenderMathMLRow::computeLineVerticalStretch): Add a function that browses non-stretchy children to determine the desired vertical stretch metrics.
(WebCore::RenderMathMLRow::computePreferredLogicalWidths): Implement the function to determine the preferred widths of the RenderMathMLRow.
(WebCore::RenderMathMLRow::layoutRowItems): Helper function that layouts children (stretching vertical operators if needed), calculate the exact logical width and position children.
(WebCore::RenderMathMLRow::layoutBlock): Implement the function to do the actual layout, which essentially calls layoutRowItems.
(WebCore::RenderMathMLRow::paintChildren): Temporarily implement this function, which just calls paintChild on each child.
(WebCore::RenderMathMLRow::createAnonymousWithParentRenderer): Deleted. We actually don't create anonymous RenderMathMLRow at the moment.
(WebCore::RenderMathMLRow::layout): Deleted.
* rendering/mathml/RenderMathMLRow.h: Update declarations of functions.
LayoutTests:
Apply some small adjustments to MathML tests after the refactoring of RenderMathMLRow.
* TestExpectations: Skip fractions-positions reftest for now. The small difference will be fixed after refactoring completely RenderMathMLFraction.
We also ignore a test for margin/padding on MathML renderers.
* platform/gtk/mathml/opentype/opentype-stretchy-horizontal-expected.png: Update reference to take into account small changes in stretch size.
The intended test behavior (reading variants and construction from the MATH table) is preserved.
* platform/gtk/mathml/opentype/opentype-stretchy-horizontal-expected.txt: ditto.
* platform/mac/mathml/opentype/opentype-stretchy-horizontal-expected.png: ditto.
* platform/mac/mathml/opentype/opentype-stretchy-horizontal-expected.txt: ditto.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsTestExpectations">trunk/LayoutTests/TestExpectations</a></li>
<li><a href="#trunkLayoutTestsplatformgtkmathmlopentypeopentypestretchyhorizontalexpectedpng">trunk/LayoutTests/platform/gtk/mathml/opentype/opentype-stretchy-horizontal-expected.png</a></li>
<li><a href="#trunkLayoutTestsplatformgtkmathmlopentypeopentypestretchyhorizontalexpectedtxt">trunk/LayoutTests/platform/gtk/mathml/opentype/opentype-stretchy-horizontal-expected.txt</a></li>
<li><a href="#trunkLayoutTestsplatformmacmathmlopentypeopentypestretchyhorizontalexpectedpng">trunk/LayoutTests/platform/mac/mathml/opentype/opentype-stretchy-horizontal-expected.png</a></li>
<li><a href="#trunkLayoutTestsplatformmacmathmlopentypeopentypestretchyhorizontalexpectedtxt">trunk/LayoutTests/platform/mac/mathml/opentype/opentype-stretchy-horizontal-expected.txt</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorecssmathmlcss">trunk/Source/WebCore/css/mathml.css</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderFlexibleBoxh">trunk/Source/WebCore/rendering/RenderFlexibleBox.h</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderObjecth">trunk/Source/WebCore/rendering/RenderObject.h</a></li>
<li><a href="#trunkSourceWebCorerenderingmathmlRenderMathMLBlockh">trunk/Source/WebCore/rendering/mathml/RenderMathMLBlock.h</a></li>
<li><a href="#trunkSourceWebCorerenderingmathmlRenderMathMLMencloseh">trunk/Source/WebCore/rendering/mathml/RenderMathMLMenclose.h</a></li>
<li><a href="#trunkSourceWebCorerenderingmathmlRenderMathMLRowcpp">trunk/Source/WebCore/rendering/mathml/RenderMathMLRow.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingmathmlRenderMathMLRowh">trunk/Source/WebCore/rendering/mathml/RenderMathMLRow.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (198997 => 198998)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2016-04-04 07:53:40 UTC (rev 198997)
+++ trunk/LayoutTests/ChangeLog 2016-04-04 08:25:37 UTC (rev 198998)
</span><span class="lines">@@ -1,3 +1,20 @@
</span><ins>+2016-04-04 Frederic Wang <fwang@igalia.com>
+
+ Refactor RenderMathMLRow layout functions to avoid using flexbox
+ https://bugs.webkit.org/show_bug.cgi?id=153208
+
+ Reviewed by Martin Robinson.
+
+ Apply some small adjustments to MathML tests after the refactoring of RenderMathMLRow.
+
+ * TestExpectations: Skip fractions-positions reftest for now. The small difference will be fixed after refactoring completely RenderMathMLFraction.
+ We also ignore a test for margin/padding on MathML renderers.
+ * platform/gtk/mathml/opentype/opentype-stretchy-horizontal-expected.png: Update reference to take into account small changes in stretch size.
+ The intended test behavior (reading variants and construction from the MATH table) is preserved.
+ * platform/gtk/mathml/opentype/opentype-stretchy-horizontal-expected.txt: ditto.
+ * platform/mac/mathml/opentype/opentype-stretchy-horizontal-expected.png: ditto.
+ * platform/mac/mathml/opentype/opentype-stretchy-horizontal-expected.txt: ditto.
+
</ins><span class="cx"> 2016-04-04 Hunseop Jeong <hs85.jeong@samsung.com>
</span><span class="cx">
</span><span class="cx"> [EFL] Unreviewed EFL Gardening on 4th Apr.
</span></span></pre></div>
<a id="trunkLayoutTestsTestExpectations"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/TestExpectations (198997 => 198998)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/TestExpectations 2016-04-04 07:53:40 UTC (rev 198997)
+++ trunk/LayoutTests/TestExpectations 2016-04-04 08:25:37 UTC (rev 198998)
</span><span class="lines">@@ -112,6 +112,12 @@
</span><span class="cx"> # This test verifies dynamic manipulation of the mroot and msqrt elements.
</span><span class="cx"> mathml/roots-removeChild.html [ ImageOnlyFailure ]
</span><span class="cx">
</span><ins>+# There is a small 1px size difference but this will be fixed when we refactor completely RenderMathMLFraction.
+mathml/presentation/fractions-positions.html [ Skip ]
+
+# For now we ignore margin/padding/border properties of MathML renderers.
+mathml/presentation/bug97990.html [ Skip ]
+
</ins><span class="cx"> # This test verifies that a mismatch reftest will fail as intended if both results are same. (introduced in r93187)
</span><span class="cx"> fast/harness/sample-fail-mismatch-reftest.html [ WontFix ImageOnlyFailure ]
</span><span class="cx">
</span></span></pre></div>
<a id="trunkLayoutTestsplatformgtkmathmlopentypeopentypestretchyhorizontalexpectedpng"></a>
<div class="binary"><h4>Modified: trunk/LayoutTests/platform/gtk/mathml/opentype/opentype-stretchy-horizontal-expected.png</h4>
<pre class="diff"><span>
<span class="cx">(Binary files differ)
</span></span></pre></div>
<a id="trunkLayoutTestsplatformgtkmathmlopentypeopentypestretchyhorizontalexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/gtk/mathml/opentype/opentype-stretchy-horizontal-expected.txt (198997 => 198998)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/gtk/mathml/opentype/opentype-stretchy-horizontal-expected.txt 2016-04-04 07:53:40 UTC (rev 198997)
+++ trunk/LayoutTests/platform/gtk/mathml/opentype/opentype-stretchy-horizontal-expected.txt 2016-04-04 08:25:37 UTC (rev 198998)
</span><span class="lines">@@ -4,35 +4,35 @@
</span><span class="cx"> RenderBlock {HTML} at (0,0) size 800x157
</span><span class="cx"> RenderBody {BODY} at (8,16) size 784x125
</span><span class="cx"> RenderBlock {P} at (0,0) size 784x25
</span><del>- RenderMathMLMath {math} at (0,2) size 18x23 [padding: 0 1 0 1]
- RenderMathMLRow {mstyle} at (1,0) size 16x23
- RenderMathMLUnderOver {mover} at (0,0) size 16x23
- RenderMathMLOperator {mo} at (0,1) size 16x22
</del><ins>+ RenderMathMLMath {math} at (0,2) size 10x23 [padding: 0 1 0 1]
+ RenderMathMLRow {mstyle} at (1,0) size 8x23
+ RenderMathMLUnderOver {mover} at (0,0) size 8x23
+ RenderMathMLOperator {mo} at (-5,1) size 17x22
</ins><span class="cx"> RenderMathMLBlock (anonymous, flex) at (2,0) size 11x4
</span><span class="cx"> RenderBlock (anonymous) at (0,0) size 1x4
</span><span class="cx"> RenderText at (0,-3) size 1x0
</span><span class="cx"> text run at (0,-3) width 1: "\x{219C}"
</span><del>- RenderMathMLSpace {mspace} at (4,0) size 8x1
</del><ins>+ RenderMathMLSpace {mspace} at (0,0) size 8x1
</ins><span class="cx"> RenderText {#text} at (0,0) size 0x0
</span><span class="cx"> RenderBlock {P} at (0,41) size 784x25
</span><del>- RenderMathMLMath {math} at (0,2) size 28x23 [padding: 0 1 0 1]
- RenderMathMLRow {mstyle} at (1,0) size 26x23
- RenderMathMLUnderOver {mover} at (0,0) size 26x23
- RenderMathMLOperator {mo} at (0,1) size 26x22
</del><ins>+ RenderMathMLMath {math} at (0,2) size 17x23 [padding: 0 1 0 1]
+ RenderMathMLRow {mstyle} at (1,0) size 15x23
+ RenderMathMLUnderOver {mover} at (0,0) size 15x23
+ RenderMathMLOperator {mo} at (-6,1) size 27x22
</ins><span class="cx"> RenderMathMLBlock (anonymous, flex) at (2,0) size 21x4
</span><span class="cx"> RenderBlock (anonymous) at (0,0) size 1x4
</span><span class="cx"> RenderText at (0,-3) size 1x0
</span><span class="cx"> text run at (0,-3) width 1: "\x{219C}"
</span><del>- RenderMathMLSpace {mspace} at (5,0) size 16x1
</del><ins>+ RenderMathMLSpace {mspace} at (0,0) size 15x1
</ins><span class="cx"> RenderText {#text} at (0,0) size 0x0
</span><span class="cx"> RenderBlock {P} at (0,82) size 784x43
</span><del>- RenderMathMLMath {math} at (0,0) size 158x43 [padding: 0 1 0 1]
- RenderMathMLRow {mstyle} at (1,0) size 156x43
- RenderMathMLUnderOver {mover} at (0,0) size 156x43
- RenderMathMLOperator {mo} at (0,1) size 156x42
</del><ins>+ RenderMathMLMath {math} at (0,0) size 152x43 [padding: 0 1 0 1]
+ RenderMathMLRow {mstyle} at (1,0) size 150x43
+ RenderMathMLUnderOver {mover} at (0,0) size 150x43
+ RenderMathMLOperator {mo} at (-3,1) size 156x42
</ins><span class="cx"> RenderMathMLBlock (anonymous, flex) at (2,0) size 151x4
</span><span class="cx"> RenderBlock (anonymous) at (0,0) size 1x4
</span><span class="cx"> RenderText at (0,-3) size 1x0
</span><span class="cx"> text run at (0,-3) width 1: "\x{219C}"
</span><del>- RenderMathMLSpace {mspace} at (2,0) size 151x1
</del><ins>+ RenderMathMLSpace {mspace} at (0,0) size 150x1
</ins><span class="cx"> RenderText {#text} at (0,0) size 0x0
</span></span></pre></div>
<a id="trunkLayoutTestsplatformmacmathmlopentypeopentypestretchyhorizontalexpectedpng"></a>
<div class="binary"><h4>Modified: trunk/LayoutTests/platform/mac/mathml/opentype/opentype-stretchy-horizontal-expected.png</h4>
<pre class="diff"><span>
<span class="cx">(Binary files differ)
</span></span></pre></div>
<a id="trunkLayoutTestsplatformmacmathmlopentypeopentypestretchyhorizontalexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/mac/mathml/opentype/opentype-stretchy-horizontal-expected.txt (198997 => 198998)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac/mathml/opentype/opentype-stretchy-horizontal-expected.txt 2016-04-04 07:53:40 UTC (rev 198997)
+++ trunk/LayoutTests/platform/mac/mathml/opentype/opentype-stretchy-horizontal-expected.txt 2016-04-04 08:25:37 UTC (rev 198998)
</span><span class="lines">@@ -4,35 +4,35 @@
</span><span class="cx"> RenderBlock {HTML} at (0,0) size 800x153
</span><span class="cx"> RenderBody {BODY} at (8,16) size 784x121
</span><span class="cx"> RenderBlock {P} at (0,0) size 784x24
</span><del>- RenderMathMLMath {math} at (0,3) size 18x22 [padding: 0 1 0 1]
- RenderMathMLRow {mstyle} at (1,0) size 16x22
- RenderMathMLUnderOver {mover} at (0,0) size 16x22
- RenderMathMLOperator {mo} at (0,1) size 16x21
</del><ins>+ RenderMathMLMath {math} at (0,3) size 10x22 [padding: 0 1 0 1]
+ RenderMathMLRow {mstyle} at (1,0) size 8x22
+ RenderMathMLUnderOver {mover} at (0,0) size 8x22
+ RenderMathMLOperator {mo} at (-5,1) size 17x21
</ins><span class="cx"> RenderMathMLBlock (anonymous, flex) at (2,0) size 11x4
</span><span class="cx"> RenderBlock (anonymous) at (0,0) size 2x4
</span><span class="cx"> RenderText at (0,-3) size 2x0
</span><span class="cx"> text run at (0,-3) width 2: "\x{219C}"
</span><del>- RenderMathMLSpace {mspace} at (4,0) size 8x1
</del><ins>+ RenderMathMLSpace {mspace} at (0,0) size 8x1
</ins><span class="cx"> RenderText {#text} at (0,0) size 0x0
</span><span class="cx"> RenderBlock {P} at (0,40) size 784x24
</span><del>- RenderMathMLMath {math} at (0,3) size 28x22 [padding: 0 1 0 1]
- RenderMathMLRow {mstyle} at (1,0) size 26x22
- RenderMathMLUnderOver {mover} at (0,0) size 26x22
- RenderMathMLOperator {mo} at (0,1) size 26x21
</del><ins>+ RenderMathMLMath {math} at (0,3) size 17x22 [padding: 0 1 0 1]
+ RenderMathMLRow {mstyle} at (1,0) size 15x22
+ RenderMathMLUnderOver {mover} at (0,0) size 15x22
+ RenderMathMLOperator {mo} at (-6,1) size 27x21
</ins><span class="cx"> RenderMathMLBlock (anonymous, flex) at (2,0) size 22x4
</span><span class="cx"> RenderBlock (anonymous) at (0,0) size 2x4
</span><span class="cx"> RenderText at (0,-3) size 2x0
</span><span class="cx"> text run at (0,-3) width 2: "\x{219C}"
</span><del>- RenderMathMLSpace {mspace} at (5,0) size 16x1
</del><ins>+ RenderMathMLSpace {mspace} at (0,0) size 15x1
</ins><span class="cx"> RenderText {#text} at (0,0) size 0x0
</span><span class="cx"> RenderBlock {P} at (0,80) size 784x41
</span><del>- RenderMathMLMath {math} at (0,0) size 158x42 [padding: 0 1 0 1]
- RenderMathMLRow {mstyle} at (1,0) size 156x42
- RenderMathMLUnderOver {mover} at (0,0) size 156x42
- RenderMathMLOperator {mo} at (0,1) size 156x41
</del><ins>+ RenderMathMLMath {math} at (0,0) size 152x42 [padding: 0 1 0 1]
+ RenderMathMLRow {mstyle} at (1,0) size 150x42
+ RenderMathMLUnderOver {mover} at (0,0) size 150x42
+ RenderMathMLOperator {mo} at (-3,1) size 156x41
</ins><span class="cx"> RenderMathMLBlock (anonymous, flex) at (2,0) size 151x4
</span><span class="cx"> RenderBlock (anonymous) at (0,0) size 2x4
</span><span class="cx"> RenderText at (0,-3) size 2x0
</span><span class="cx"> text run at (0,-3) width 2: "\x{219C}"
</span><del>- RenderMathMLSpace {mspace} at (2,0) size 151x1
</del><ins>+ RenderMathMLSpace {mspace} at (0,0) size 150x1
</ins><span class="cx"> RenderText {#text} at (0,0) size 0x0
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (198997 => 198998)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-04-04 07:53:40 UTC (rev 198997)
+++ trunk/Source/WebCore/ChangeLog 2016-04-04 08:25:37 UTC (rev 198998)
</span><span class="lines">@@ -1,3 +1,40 @@
</span><ins>+2016-04-04 Frederic Wang <fwang@igalia.com>
+
+ Refactor RenderMathMLRow layout functions to avoid using flexbox
+ https://bugs.webkit.org/show_bug.cgi?id=153208
+
+ Reviewed by Martin Robinson.
+
+ This is the first patch to rewrite MathML layout without relying on
+ flexboxes or anonymous renderers.
+ We have done some temporary changes to allow overriding of
+ layoutBlock and to implement paintChildren, but this will be remove in a
+ follow-up patch. We also implement firstLineBaseline,
+ computePreferredLogicalWidths and layoutBlock of RenderMathMLRow without
+ using any flexbox functions. We adjust a bit the MathML CSS to take into
+ account these changes. Finally, we delete the unused helper function to
+ create anonymous RenderMathMLRow.
+
+ * css/mathml.css:
+ (ms, mtext, mi, mn, mo, annotation, mtd): Prevent linebreaking inside token elements and table cells, otherwise this cause test failures with the new implementation of RenderMathMLRow.
+ (math, mrow, mfenced, merror, mphantom, mstyle, menclose): Deleted. We no longer rely on flexbox for baseline alignment of RenderMathMLRow.
+ * rendering/RenderFlexibleBox.h: Allow overrider of the LayoutBlock for the moment.
+ * rendering/RenderObject.h:
+ (WebCore::RenderObject::isRenderMathMLMenclose): Add helper function.
+ * rendering/mathml/RenderMathMLMenclose.h: ditto.
+ * rendering/mathml/RenderMathMLBlock.h:
+ (WebCore::ascentForChild): Add helper function to easily compute the ascent of a child.
+ * rendering/mathml/RenderMathMLRow.cpp: Reimplement the class without using the flexbox layout.
+ (WebCore::RenderMathMLRow::firstLineBaseline): Implement the function to determine the baseline.
+ (WebCore::RenderMathMLRow::computeLineVerticalStretch): Add a function that browses non-stretchy children to determine the desired vertical stretch metrics.
+ (WebCore::RenderMathMLRow::computePreferredLogicalWidths): Implement the function to determine the preferred widths of the RenderMathMLRow.
+ (WebCore::RenderMathMLRow::layoutRowItems): Helper function that layouts children (stretching vertical operators if needed), calculate the exact logical width and position children.
+ (WebCore::RenderMathMLRow::layoutBlock): Implement the function to do the actual layout, which essentially calls layoutRowItems.
+ (WebCore::RenderMathMLRow::paintChildren): Temporarily implement this function, which just calls paintChild on each child.
+ (WebCore::RenderMathMLRow::createAnonymousWithParentRenderer): Deleted. We actually don't create anonymous RenderMathMLRow at the moment.
+ (WebCore::RenderMathMLRow::layout): Deleted.
+ * rendering/mathml/RenderMathMLRow.h: Update declarations of functions.
+
</ins><span class="cx"> 2016-04-04 Chris Fleizach <cfleizach@apple.com>
</span><span class="cx">
</span><span class="cx"> AX: Consolidate radio button group member code with that in HTMLElement derivatives
</span></span></pre></div>
<a id="trunkSourceWebCorecssmathmlcss"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/mathml.css (198997 => 198998)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/mathml.css 2016-04-04 07:53:40 UTC (rev 198997)
+++ trunk/Source/WebCore/css/mathml.css 2016-04-04 08:25:37 UTC (rev 198998)
</span><span class="lines">@@ -40,8 +40,8 @@
</span><span class="cx"> display: -webkit-inline-flex !important;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-math, mrow, mfenced, merror, mphantom, mstyle, menclose {
- align-items: baseline;
</del><ins>+ms, mtext, mi, mn, mo, annotation, mtd {
+ white-space: nowrap !important;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> mo, mfrac, munder, mover, munderover {
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderFlexibleBoxh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderFlexibleBox.h (198997 => 198998)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderFlexibleBox.h 2016-04-04 07:53:40 UTC (rev 198997)
+++ trunk/Source/WebCore/rendering/RenderFlexibleBox.h 2016-04-04 08:25:37 UTC (rev 198998)
</span><span class="lines">@@ -46,7 +46,7 @@
</span><span class="cx">
</span><span class="cx"> bool avoidsFloats() const final { return true; }
</span><span class="cx"> bool canDropAnonymousBlockChild() const final { return false; }
</span><del>- void layoutBlock(bool relayoutChildren, LayoutUnit pageLogicalHeight = 0) final;
</del><ins>+ void layoutBlock(bool relayoutChildren, LayoutUnit pageLogicalHeight = 0) override;
</ins><span class="cx">
</span><span class="cx"> int baselinePosition(FontBaseline, bool firstLine, LineDirectionMode, LinePositionMode = PositionOnContainingLine) const override;
</span><span class="cx"> Optional<int> firstLineBaseline() const override;
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderObjecth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderObject.h (198997 => 198998)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderObject.h 2016-04-04 07:53:40 UTC (rev 198997)
+++ trunk/Source/WebCore/rendering/RenderObject.h 2016-04-04 08:25:37 UTC (rev 198998)
</span><span class="lines">@@ -388,6 +388,7 @@
</span><span class="cx"> virtual bool isRenderMathMLRadicalOperator() const { return false; }
</span><span class="cx"> virtual bool isRenderMathMLRow() const { return false; }
</span><span class="cx"> virtual bool isRenderMathMLMath() const { return false; }
</span><ins>+ virtual bool isRenderMathMLMenclose() const { return false; }
</ins><span class="cx"> virtual bool isRenderMathMLFenced() const { return false; }
</span><span class="cx"> virtual bool isRenderMathMLFraction() const { return false; }
</span><span class="cx"> virtual bool isRenderMathMLRoot() const { return false; }
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingmathmlRenderMathMLBlockh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/mathml/RenderMathMLBlock.h (198997 => 198998)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/mathml/RenderMathMLBlock.h 2016-04-04 07:53:40 UTC (rev 198997)
+++ trunk/Source/WebCore/rendering/mathml/RenderMathMLBlock.h 2016-04-04 08:25:37 UTC (rev 198998)
</span><span class="lines">@@ -64,6 +64,12 @@
</span><span class="cx"> // Create a new RenderMathMLBlock, with a new style inheriting from this->style().
</span><span class="cx"> RenderPtr<RenderMathMLBlock> createAnonymousMathMLBlock();
</span><span class="cx">
</span><ins>+protected:
+ static LayoutUnit ascentForChild(const RenderBox& child)
+ {
+ return child.firstLineBaseline().valueOr(child.logicalHeight());
+ }
+
</ins><span class="cx"> private:
</span><span class="cx"> bool isRenderMathMLBlock() const final { return true; }
</span><span class="cx"> const char* renderName() const override;
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingmathmlRenderMathMLMencloseh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/mathml/RenderMathMLMenclose.h (198997 => 198998)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/mathml/RenderMathMLMenclose.h 2016-04-04 07:53:40 UTC (rev 198997)
+++ trunk/Source/WebCore/rendering/mathml/RenderMathMLMenclose.h 2016-04-04 08:25:37 UTC (rev 198998)
</span><span class="lines">@@ -36,15 +36,18 @@
</span><span class="cx"> RenderMathMLMenclose(Element&, Ref<RenderStyle>&&);
</span><span class="cx">
</span><span class="cx"> private:
</span><del>- const char* renderName() const override { return "RenderMathMLMenclose"; }
- void paint(PaintInfo&, const LayoutPoint&) override;
</del><ins>+ bool isRenderMathMLMenclose() const final { return true; }
+ const char* renderName() const final { return "RenderMathMLMenclose"; }
+ void paint(PaintInfo&, const LayoutPoint&) final;
</ins><span class="cx"> void updateLogicalHeight() override;
</span><span class="cx"> void addChild(RenderObject* newChild, RenderObject* beforeChild = nullptr) override;
</span><del>- void computePreferredLogicalWidths() override;
</del><ins>+ void computePreferredLogicalWidths() final;
</ins><span class="cx"> bool checkNotationalValuesValidity(const Vector<String>&) const;
</span><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+SPECIALIZE_TYPE_TRAITS_RENDER_OBJECT(RenderMathMLMenclose, isRenderMathMLMenclose())
+
</ins><span class="cx"> #endif // ENABLE(MATHML)
</span><span class="cx"> #endif // RenderMathMLMenclose_h
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingmathmlRenderMathMLRowcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/mathml/RenderMathMLRow.cpp (198997 => 198998)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/mathml/RenderMathMLRow.cpp 2016-04-04 07:53:40 UTC (rev 198997)
+++ trunk/Source/WebCore/rendering/mathml/RenderMathMLRow.cpp 2016-04-04 08:25:37 UTC (rev 198998)
</span><span class="lines">@@ -1,5 +1,6 @@
</span><span class="cx"> /*
</span><span class="cx"> * Copyright (C) 2010 Alex Milowski (alex@milowski.com). All rights reserved.
</span><ins>+ * Copyright (C) 2016 Igalia S.L.
</ins><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</span><span class="cx"> * modification, are permitted provided that the following conditions
</span><span class="lines">@@ -48,13 +49,6 @@
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><del>-RenderPtr<RenderMathMLRow> RenderMathMLRow::createAnonymousWithParentRenderer(RenderMathMLRoot& parent)
-{
- RenderPtr<RenderMathMLRow> newMRow = createRenderer<RenderMathMLRow>(parent.document(), RenderStyle::createAnonymousStyleWithDisplay(&parent.style(), FLEX));
- newMRow->initializeStyle();
- return newMRow;
-}
-
</del><span class="cx"> void RenderMathMLRow::updateOperatorProperties()
</span><span class="cx"> {
</span><span class="cx"> for (RenderObject* child = firstChild(); child; child = child->nextSibling()) {
</span><span class="lines">@@ -66,46 +60,152 @@
</span><span class="cx"> setNeedsLayoutAndPrefWidthsRecalc();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void RenderMathMLRow::layout()
</del><ins>+
+Optional<int> RenderMathMLRow::firstLineBaseline() const
</ins><span class="cx"> {
</span><del>- int stretchHeightAboveBaseline = 0, stretchDepthBelowBaseline = 0;
- for (RenderObject* child = firstChild(); child; child = child->nextSibling()) {
- if (child->needsLayout())
- downcast<RenderElement>(*child).layout();
- if (is<RenderMathMLBlock>(*child)) {
- // We skip the stretchy operators as they must not be included in the computation of the stretch size.
- auto* renderOperator = downcast<RenderMathMLBlock>(*child).unembellishedOperator();
</del><ins>+ RenderBox* baselineChild = firstChildBox();
+ if (!baselineChild)
+ return Optional<int>();
+
+ return Optional<int>(static_cast<int>(lroundf(ascentForChild(*baselineChild) + baselineChild->logicalTop())));
+}
+
+void RenderMathMLRow::computeLineVerticalStretch(int& stretchHeightAboveBaseline, int& stretchDepthBelowBaseline)
+{
+ for (RenderBox* child = firstChildBox(); child; child = child->nextSiblingBox()) {
+ if (is<RenderMathMLBlock>(child)) {
+ auto* renderOperator = downcast<RenderMathMLBlock>(child)->unembellishedOperator();
</ins><span class="cx"> if (renderOperator && renderOperator->hasOperatorFlag(MathMLOperatorDictionary::Stretchy))
</span><span class="cx"> continue;
</span><span class="cx"> }
</span><del>- LayoutUnit childHeightAboveBaseline = 0, childDepthBelowBaseline = 0;
- if (is<RenderMathMLBlock>(*child)) {
- RenderMathMLBlock& mathmlChild = downcast<RenderMathMLBlock>(*child);
- childHeightAboveBaseline = mathmlChild.firstLineBaseline().valueOr(mathmlChild.logicalHeight());
- childDepthBelowBaseline = mathmlChild.logicalHeight() - childHeightAboveBaseline;
- } else if (is<RenderMathMLTable>(*child)) {
- RenderMathMLTable& tableChild = downcast<RenderMathMLTable>(*child);
- childHeightAboveBaseline = tableChild.firstLineBaseline().valueOr(-1);
- childDepthBelowBaseline = tableChild.logicalHeight() - childHeightAboveBaseline;
- } else if (is<RenderBox>(*child)) {
- childHeightAboveBaseline = downcast<RenderBox>(*child).logicalHeight();
- childDepthBelowBaseline = 0;
- }
</del><ins>+
+ child->layoutIfNeeded();
+
+ LayoutUnit childHeightAboveBaseline = ascentForChild(*child);
+ LayoutUnit childDepthBelowBaseline = child->logicalHeight() - childHeightAboveBaseline;
+
</ins><span class="cx"> stretchHeightAboveBaseline = std::max<LayoutUnit>(stretchHeightAboveBaseline, childHeightAboveBaseline);
</span><span class="cx"> stretchDepthBelowBaseline = std::max<LayoutUnit>(stretchDepthBelowBaseline, childDepthBelowBaseline);
</span><span class="cx"> }
</span><del>- if (stretchHeightAboveBaseline + stretchDepthBelowBaseline <= 0)
</del><ins>+
+ // We ensure a minimal stretch size.
+ if (stretchHeightAboveBaseline + stretchDepthBelowBaseline <= 0) {
</ins><span class="cx"> stretchHeightAboveBaseline = style().fontSize();
</span><del>-
- // Set the sizes of (possibly embellished) stretchy operator children.
- for (auto& child : childrenOfType<RenderMathMLBlock>(*this)) {
- if (auto renderOperator = child.unembellishedOperator())
- renderOperator->stretchTo(stretchHeightAboveBaseline, stretchDepthBelowBaseline);
</del><ins>+ stretchDepthBelowBaseline = 0;
</ins><span class="cx"> }
</span><ins>+}
</ins><span class="cx">
</span><del>- RenderMathMLBlock::layout();
</del><ins>+void RenderMathMLRow::computePreferredLogicalWidths()
+{
+ ASSERT(preferredLogicalWidthsDirty());
+
+ m_minPreferredLogicalWidth = m_maxPreferredLogicalWidth = 0;
+
+ LayoutUnit preferredWidth = 0;
+ for (RenderBox* child = firstChildBox(); child; child = child->nextSiblingBox())
+ preferredWidth += child->maxPreferredLogicalWidth() + child->marginLogicalWidth();
+
+ m_minPreferredLogicalWidth = m_maxPreferredLogicalWidth = preferredWidth + borderAndPaddingLogicalWidth();
+
+ setPreferredLogicalWidthsDirty(false);
</ins><span class="cx"> }
</span><span class="cx">
</span><ins>+void RenderMathMLRow::layoutRowItems(int stretchHeightAboveBaseline, int stretchDepthBelowBaseline)
+{
+ // We first stretch the vertical operators.
+ // For inline formulas, we can then calculate the logical width.
+ LayoutUnit width = borderAndPaddingStart();
+ for (RenderBox* child = firstChildBox(); child; child = child->nextSiblingBox()) {
+ if (child->isOutOfFlowPositioned())
+ continue;
+
+ if (is<RenderMathMLBlock>(child)) {
+ if (auto renderOperator = downcast<RenderMathMLBlock>(child)->unembellishedOperator())
+ renderOperator->stretchTo(stretchHeightAboveBaseline, stretchDepthBelowBaseline);
+ }
+
+ child->layoutIfNeeded();
+
+ width += child->marginStart() + child->logicalWidth() + child->marginEnd();
+ }
+
+ width += borderEnd() + paddingEnd();
+ // FIXME: RenderMathMLRoot and RenderMathMLEnclose classes should also recalculate the exact logical width instead of using the preferred width.
+ // See https://bugs.webkit.org/show_bug.cgi?id=130326
+ if ((!isRenderMathMLMath() || style().display() == INLINE) && !isRenderMathMLRoot() && !isRenderMathMLMenclose())
+ setLogicalWidth(width);
+
+ LayoutUnit verticalOffset = borderTop() + paddingTop();
+ LayoutUnit maxAscent = 0, maxDescent = 0; // Used baseline alignment.
+ LayoutUnit horizontalOffset = borderAndPaddingStart();
+ bool shouldFlipHorizontal = !style().isLeftToRightDirection();
+ for (RenderBox* child = firstChildBox(); child; child = child->nextSiblingBox()) {
+ if (child->isOutOfFlowPositioned()) {
+ child->containingBlock()->insertPositionedObject(*child);
+ continue;
+ }
+ LayoutUnit childHorizontalExtent = child->logicalWidth();
+ LayoutUnit ascent = ascentForChild(*child);
+ LayoutUnit descent = child->verticalMarginExtent() + child->logicalHeight() - ascent;
+ maxAscent = std::max(maxAscent, ascent);
+ maxDescent = std::max(maxDescent, descent);
+ LayoutUnit childVerticalMarginBoxExtent = maxAscent + maxDescent;
+
+ horizontalOffset += child->marginStart();
+
+ setLogicalHeight(std::max(logicalHeight(), verticalOffset + borderBottom() + paddingBottom() + childVerticalMarginBoxExtent + horizontalScrollbarHeight()));
+
+ LayoutPoint childLocation(shouldFlipHorizontal ? logicalWidth() - horizontalOffset - childHorizontalExtent : horizontalOffset, verticalOffset + child->marginTop());
+ child->setLocation(childLocation);
+
+ horizontalOffset += childHorizontalExtent + child->marginEnd();
+ }
+
+ LayoutUnit centerBlockOffset = 0;
+ // FIXME: Remove the FLEX when it is not required by the css.
+ if (style().display() == BLOCK || style().display() == FLEX)
+ centerBlockOffset = std::max<LayoutUnit>(0, (logicalWidth() - (horizontalOffset + borderEnd() + paddingEnd())) / 2);
+
+ if (shouldFlipHorizontal && centerBlockOffset > 0)
+ centerBlockOffset = -centerBlockOffset;
+
+ for (RenderBox* child = firstChildBox(); child; child = child->nextSiblingBox()) {
+ LayoutUnit ascent = ascentForChild(*child);
+ LayoutUnit startOffset = maxAscent - ascent;
+ child->setLocation(child->location() + LayoutPoint(centerBlockOffset, startOffset));
+ }
</ins><span class="cx"> }
</span><span class="cx">
</span><ins>+void RenderMathMLRow::layoutBlock(bool relayoutChildren, LayoutUnit)
+{
+ ASSERT(needsLayout());
+
+ if (!relayoutChildren && simplifiedLayout())
+ return;
+
+ int stretchHeightAboveBaseline = 0;
+ int stretchDepthBelowBaseline = 0;
+ computeLineVerticalStretch(stretchHeightAboveBaseline, stretchDepthBelowBaseline);
+
+ recomputeLogicalWidth();
+
+ setLogicalHeight(borderAndPaddingLogicalHeight() + scrollbarLogicalHeight());
+
+ layoutRowItems(stretchHeightAboveBaseline, stretchDepthBelowBaseline);
+
+ updateLogicalHeight();
+
+ clearNeedsLayout();
+}
+
+void RenderMathMLRow::paintChildren(PaintInfo& paintInfo, const LayoutPoint& paintOffset, PaintInfo& paintInfoForChild, bool usePrintRect)
+{
+ for (RenderBox* child = firstChildBox(); child; child = child->nextSiblingBox()) {
+ if (!paintChild(*child, paintInfo, paintOffset, paintInfoForChild, usePrintRect, PaintAsInlineBlock))
+ return;
+ }
+}
+
+}
+
</ins><span class="cx"> #endif // ENABLE(MATHML)
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingmathmlRenderMathMLRowh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/mathml/RenderMathMLRow.h (198997 => 198998)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/mathml/RenderMathMLRow.h 2016-04-04 07:53:40 UTC (rev 198997)
+++ trunk/Source/WebCore/rendering/mathml/RenderMathMLRow.h 2016-04-04 08:25:37 UTC (rev 198998)
</span><span class="lines">@@ -1,5 +1,6 @@
</span><span class="cx"> /*
</span><span class="cx"> * Copyright (C) 2010 Alex Milowski (alex@milowski.com). All rights reserved.
</span><ins>+ * Copyright (C) 2016 Igalia S.L.
</ins><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</span><span class="cx"> * modification, are permitted provided that the following conditions
</span><span class="lines">@@ -39,15 +40,19 @@
</span><span class="cx"> RenderMathMLRow(Element&, Ref<RenderStyle>&&);
</span><span class="cx"> RenderMathMLRow(Document&, Ref<RenderStyle>&&);
</span><span class="cx">
</span><del>- static RenderPtr<RenderMathMLRow> createAnonymousWithParentRenderer(RenderMathMLRoot&);
</del><span class="cx"> void updateOperatorProperties();
</span><span class="cx">
</span><del>-protected:
- void layout() override;
</del><ins>+ void layoutBlock(bool relayoutChildren, LayoutUnit pageLogicalHeight = 0) final;
+ void paintChildren(PaintInfo& forSelf, const LayoutPoint&, PaintInfo& forChild, bool usePrintRect) final;
+ Optional<int> firstLineBaseline() const final;
</ins><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> bool isRenderMathMLRow() const final { return true; }
</span><span class="cx"> const char* renderName() const override { return isAnonymous() ? "RenderMathMLRow (anonymous)" : "RenderMathMLRow"; }
</span><ins>+
+ void layoutRowItems(int stretchHeightAboveBaseline, int stretchDepthBelowBaseline);
+ void computeLineVerticalStretch(int& stretchHeightAboveBaseline, int& stretchDepthBelowBaseline);
+ void computePreferredLogicalWidths() override;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span></span></pre>
</div>
</div>
</body>
</html>