<!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>[199771] 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/199771">199771</a></dd>
<dt>Author</dt> <dd>fred.wang@free.fr</dd>
<dt>Date</dt> <dd>2016-04-20 06:25:39 -0700 (Wed, 20 Apr 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Refactor RenderMathMLSpace to avoid using flexbox
https://bugs.webkit.org/show_bug.cgi?id=155168
Patch by Frederic Wang <fwang@igalia.com> on 2016-04-20
Reviewed by Martin Robinson.
Source/WebCore:
No new tests, already covered by existing tests. The behavior of mspace-prefered-width-expected is not specified by the MathML recommendation, we update that test to match our new behavior.
* rendering/mathml/RenderMathMLSpace.cpp: Implement layout functions without passing by flebox.
(WebCore::RenderMathMLSpace::computePreferredLogicalWidths): Implement this function.
(WebCore::RenderMathMLSpace::layoutBlock): Implement this function.
(WebCore::RenderMathMLSpace::computeIntrinsicLogicalWidths): Deleted.
(WebCore::RenderMathMLSpace::updateLogicalWidth): Deleted.
(WebCore::RenderMathMLSpace::updateLogicalHeight): Deleted.
* rendering/mathml/RenderMathMLSpace.h: Update function declarations.
LayoutTests:
* mathml/presentation/mspace-prefered-width-expected.html: Update the expectation so that the logical width and preferred width are both equal to the one specified by the width attribute.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsmathmlpresentationmspacepreferedwidthexpectedhtml">trunk/LayoutTests/mathml/presentation/mspace-prefered-width-expected.html</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorerenderingmathmlRenderMathMLSpacecpp">trunk/Source/WebCore/rendering/mathml/RenderMathMLSpace.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingmathmlRenderMathMLSpaceh">trunk/Source/WebCore/rendering/mathml/RenderMathMLSpace.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (199770 => 199771)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2016-04-20 09:06:00 UTC (rev 199770)
+++ trunk/LayoutTests/ChangeLog 2016-04-20 13:25:39 UTC (rev 199771)
</span><span class="lines">@@ -1,3 +1,12 @@
</span><ins>+2016-04-20 Frederic Wang <fwang@igalia.com>
+
+ Refactor RenderMathMLSpace to avoid using flexbox
+ https://bugs.webkit.org/show_bug.cgi?id=155168
+
+ Reviewed by Martin Robinson.
+
+ * mathml/presentation/mspace-prefered-width-expected.html: Update the expectation so that the logical width and preferred width are both equal to the one specified by the width attribute.
+
</ins><span class="cx"> 2016-04-20 Carlos Garcia Campos <cgarcia@igalia.com>
</span><span class="cx">
</span><span class="cx"> Unreviewed GTK+ gardening. Mark HLS tests release expectations as release only.
</span></span></pre></div>
<a id="trunkLayoutTestsmathmlpresentationmspacepreferedwidthexpectedhtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/mathml/presentation/mspace-prefered-width-expected.html (199770 => 199771)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/mathml/presentation/mspace-prefered-width-expected.html 2016-04-20 09:06:00 UTC (rev 199770)
+++ trunk/LayoutTests/mathml/presentation/mspace-prefered-width-expected.html 2016-04-20 13:25:39 UTC (rev 199771)
</span><span class="lines">@@ -14,10 +14,10 @@
</span><span class="cx"> <span style="display: inline-block; width: 50px; height: 10px; background:green;"></span>
</span><span class="cx"> </td>
</span><span class="cx"> <td>
</span><del>- <span style="display: inline-block; width: 50px; height: 10px; background:green; margin-right: 50px;"></span>
</del><ins>+ <span style="display: inline-block; width: 50px; height: 10px; background:green;"></span>
</ins><span class="cx"> </td>
</span><span class="cx"> <td>
</span><del>- <span style="display: inline-block; width: 50px; height: 10px; background:green; margin-right: -40px;"></span>
</del><ins>+ <span style="display: inline-block; width: 50px; height: 10px; background:green;"></span>
</ins><span class="cx"> </td>
</span><span class="cx"> </tr>
</span><span class="cx"> </table>
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (199770 => 199771)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-04-20 09:06:00 UTC (rev 199770)
+++ trunk/Source/WebCore/ChangeLog 2016-04-20 13:25:39 UTC (rev 199771)
</span><span class="lines">@@ -1,3 +1,20 @@
</span><ins>+2016-04-20 Frederic Wang <fwang@igalia.com>
+
+ Refactor RenderMathMLSpace to avoid using flexbox
+ https://bugs.webkit.org/show_bug.cgi?id=155168
+
+ Reviewed by Martin Robinson.
+
+ No new tests, already covered by existing tests. The behavior of mspace-prefered-width-expected is not specified by the MathML recommendation, we update that test to match our new behavior.
+
+ * rendering/mathml/RenderMathMLSpace.cpp: Implement layout functions without passing by flebox.
+ (WebCore::RenderMathMLSpace::computePreferredLogicalWidths): Implement this function.
+ (WebCore::RenderMathMLSpace::layoutBlock): Implement this function.
+ (WebCore::RenderMathMLSpace::computeIntrinsicLogicalWidths): Deleted.
+ (WebCore::RenderMathMLSpace::updateLogicalWidth): Deleted.
+ (WebCore::RenderMathMLSpace::updateLogicalHeight): Deleted.
+ * rendering/mathml/RenderMathMLSpace.h: Update function declarations.
+
</ins><span class="cx"> 2016-04-20 Carlos Garcia Campos <cgarcia@igalia.com>
</span><span class="cx">
</span><span class="cx"> [Cairo] Crash in GraphicsContext::drawFocusRing when painting is disabled
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingmathmlRenderMathMLSpacecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/mathml/RenderMathMLSpace.cpp (199770 => 199771)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/mathml/RenderMathMLSpace.cpp 2016-04-20 09:06:00 UTC (rev 199770)
+++ trunk/Source/WebCore/rendering/mathml/RenderMathMLSpace.cpp 2016-04-20 13:25:39 UTC (rev 199771)
</span><span class="lines">@@ -44,10 +44,13 @@
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void RenderMathMLSpace::computeIntrinsicLogicalWidths(LayoutUnit& minLogicalWidth, LayoutUnit& maxLogicalWidth) const
</del><ins>+void RenderMathMLSpace::computePreferredLogicalWidths()
</ins><span class="cx"> {
</span><del>- minLogicalWidth = m_width;
- maxLogicalWidth = m_width;
</del><ins>+ ASSERT(preferredLogicalWidthsDirty());
+
+ m_minPreferredLogicalWidth = m_maxPreferredLogicalWidth = m_width;
+
+ setPreferredLogicalWidthsDirty(false);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void RenderMathMLSpace::updateFromElement()
</span><span class="lines">@@ -75,14 +78,17 @@
</span><span class="cx"> setNeedsLayoutAndPrefWidthsRecalc();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void RenderMathMLSpace::updateLogicalWidth()
</del><ins>+void RenderMathMLSpace::layoutBlock(bool relayoutChildren, LayoutUnit)
</ins><span class="cx"> {
</span><ins>+ ASSERT(needsLayout());
+
+ if (!relayoutChildren && simplifiedLayout())
+ return;
+
</ins><span class="cx"> setLogicalWidth(m_width);
</span><del>-}
</del><ins>+ setLogicalHeight(m_height + m_depth);
</ins><span class="cx">
</span><del>-void RenderMathMLSpace::updateLogicalHeight()
-{
- setLogicalHeight(m_height + m_depth);
</del><ins>+ clearNeedsLayout();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void RenderMathMLSpace::styleDidChange(StyleDifference diff, const RenderStyle* oldStyle)
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingmathmlRenderMathMLSpaceh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/mathml/RenderMathMLSpace.h (199770 => 199771)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/mathml/RenderMathMLSpace.h 2016-04-20 09:06:00 UTC (rev 199770)
+++ trunk/Source/WebCore/rendering/mathml/RenderMathMLSpace.h 2016-04-20 13:25:39 UTC (rev 199771)
</span><span class="lines">@@ -39,15 +39,14 @@
</span><span class="cx"> MathMLTextElement& element() { return static_cast<MathMLTextElement&>(nodeForNonAnonymous()); }
</span><span class="cx">
</span><span class="cx"> private:
</span><del>- const char* renderName() const override { return isAnonymous() ? "RenderMathMLSpace (anonymous)" : "RenderMathMLSpace"; }
- bool isRenderMathMLSpace() const override { return true; }
- void styleDidChange(StyleDifference, const RenderStyle* oldStyle) override;
- bool isChildAllowed(const RenderObject&, const RenderStyle&) const override { return false; }
- void computeIntrinsicLogicalWidths(LayoutUnit& minLogicalWidth, LayoutUnit& maxLogicalWidth) const override;
- void updateFromElement() override;
- Optional<int> firstLineBaseline() const override;
- void updateLogicalWidth() override;
- void updateLogicalHeight() override;
</del><ins>+ const char* renderName() const final { return isAnonymous() ? "RenderMathMLSpace (anonymous)" : "RenderMathMLSpace"; }
+ bool isRenderMathMLSpace() const final { return true; }
+ void styleDidChange(StyleDifference, const RenderStyle* oldStyle) final;
+ bool isChildAllowed(const RenderObject&, const RenderStyle&) const final { return false; }
+ void updateFromElement() final;
+ void computePreferredLogicalWidths() final;
+ void layoutBlock(bool relayoutChildren, LayoutUnit pageLogicalHeight = 0) final;
+ Optional<int> firstLineBaseline() const final;
</ins><span class="cx">
</span><span class="cx"> LayoutUnit m_width;
</span><span class="cx"> LayoutUnit m_height;
</span></span></pre>
</div>
</div>
</body>
</html>