<!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>[201418] 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/201418">201418</a></dd>
<dt>Author</dt> <dd>fred.wang@free.fr</dd>
<dt>Date</dt> <dd>2016-05-26 02:14:20 -0700 (Thu, 26 May 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Small improvements to RenderBox/LayoutUnit casting in MathML
https://bugs.webkit.org/show_bug.cgi?id=157943
Patch by Frederic Wang <fwang@igalia.com> on 2016-05-26
Reviewed by Darin Adler.
This is a small follow-up of the RenderMathMLRow/RenderMathMLUnderOver/RenderMathMLFraction
refactoring. Since these MathML renderers can only contain other MathML renderers, we can
just considerer RenderBox children and avoid unnecessary casts. Similarly, when the two
arguments of std::max are LayoutUnit's, we do not need to specialize to std::max<LayoutUnit>.
No new tests, behavior is not changed.
* rendering/mathml/RenderMathMLFraction.cpp:
(WebCore::RenderMathMLFraction::layoutBlock): Do not to specialize to std::max<LayoutUnit>.
* rendering/mathml/RenderMathMLRow.cpp:
(WebCore::RenderMathMLRow::updateOperatorProperties): Browse the list of RenderBox children
and use auto*.
(WebCore::RenderMathMLRow::computeLineVerticalStretch): Do not to specialize to std::max<LayoutUnit>.
* rendering/mathml/RenderMathMLUnderOver.cpp:
(WebCore::RenderMathMLUnderOver::unembellishedOperator): Get the RenderBox child and use auto*.
(WebCore::RenderMathMLUnderOver::computeOperatorsHorizontalStretch): Browse the list of
RenderBox children, use auto* and remove unnecessary casts. Do not to specialize to
std::max<LayoutUnit>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorerenderingmathmlRenderMathMLFractioncpp">trunk/Source/WebCore/rendering/mathml/RenderMathMLFraction.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingmathmlRenderMathMLRowcpp">trunk/Source/WebCore/rendering/mathml/RenderMathMLRow.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingmathmlRenderMathMLUnderOvercpp">trunk/Source/WebCore/rendering/mathml/RenderMathMLUnderOver.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (201417 => 201418)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-05-26 07:54:41 UTC (rev 201417)
+++ trunk/Source/WebCore/ChangeLog 2016-05-26 09:14:20 UTC (rev 201418)
</span><span class="lines">@@ -1,3 +1,29 @@
</span><ins>+2016-05-26 Frederic Wang <fwang@igalia.com>
+
+ Small improvements to RenderBox/LayoutUnit casting in MathML
+ https://bugs.webkit.org/show_bug.cgi?id=157943
+
+ Reviewed by Darin Adler.
+
+ This is a small follow-up of the RenderMathMLRow/RenderMathMLUnderOver/RenderMathMLFraction
+ refactoring. Since these MathML renderers can only contain other MathML renderers, we can
+ just considerer RenderBox children and avoid unnecessary casts. Similarly, when the two
+ arguments of std::max are LayoutUnit's, we do not need to specialize to std::max<LayoutUnit>.
+
+ No new tests, behavior is not changed.
+
+ * rendering/mathml/RenderMathMLFraction.cpp:
+ (WebCore::RenderMathMLFraction::layoutBlock): Do not to specialize to std::max<LayoutUnit>.
+ * rendering/mathml/RenderMathMLRow.cpp:
+ (WebCore::RenderMathMLRow::updateOperatorProperties): Browse the list of RenderBox children
+ and use auto*.
+ (WebCore::RenderMathMLRow::computeLineVerticalStretch): Do not to specialize to std::max<LayoutUnit>.
+ * rendering/mathml/RenderMathMLUnderOver.cpp:
+ (WebCore::RenderMathMLUnderOver::unembellishedOperator): Get the RenderBox child and use auto*.
+ (WebCore::RenderMathMLUnderOver::computeOperatorsHorizontalStretch): Browse the list of
+ RenderBox children, use auto* and remove unnecessary casts. Do not to specialize to
+ std::max<LayoutUnit>.
+
</ins><span class="cx"> 2016-05-26 Chris Fleizach <cfleizach@apple.com>
</span><span class="cx">
</span><span class="cx"> AX: crash at AccessibilityRenderObject::remoteSVGRootElement const
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingmathmlRenderMathMLFractioncpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/mathml/RenderMathMLFraction.cpp (201417 => 201418)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/mathml/RenderMathMLFraction.cpp 2016-05-26 07:54:41 UTC (rev 201417)
+++ trunk/Source/WebCore/rendering/mathml/RenderMathMLFraction.cpp 2016-05-26 09:14:20 UTC (rev 201418)
</span><span class="lines">@@ -187,7 +187,7 @@
</span><span class="cx"> numerator().layoutIfNeeded();
</span><span class="cx"> denominator().layoutIfNeeded();
</span><span class="cx">
</span><del>- setLogicalWidth(std::max<LayoutUnit>(numerator().logicalWidth(), denominator().logicalWidth()));
</del><ins>+ setLogicalWidth(std::max(numerator().logicalWidth(), denominator().logicalWidth()));
</ins><span class="cx">
</span><span class="cx"> LayoutPoint numeratorLocation(horizontalOffset(numerator(), m_numeratorAlign), verticalOffset);
</span><span class="cx"> numerator().setLocation(numeratorLocation);
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingmathmlRenderMathMLRowcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/mathml/RenderMathMLRow.cpp (201417 => 201418)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/mathml/RenderMathMLRow.cpp 2016-05-26 07:54:41 UTC (rev 201417)
+++ trunk/Source/WebCore/rendering/mathml/RenderMathMLRow.cpp 2016-05-26 09:14:20 UTC (rev 201418)
</span><span class="lines">@@ -51,7 +51,7 @@
</span><span class="cx">
</span><span class="cx"> void RenderMathMLRow::updateOperatorProperties()
</span><span class="cx"> {
</span><del>- for (RenderObject* child = firstChild(); child; child = child->nextSibling()) {
</del><ins>+ for (auto* child = firstChildBox(); child; child = child->nextSiblingBox()) {
</ins><span class="cx"> if (is<RenderMathMLBlock>(*child)) {
</span><span class="cx"> if (auto* renderOperator = downcast<RenderMathMLBlock>(*child).unembellishedOperator())
</span><span class="cx"> renderOperator->updateOperatorProperties();
</span><span class="lines">@@ -84,8 +84,8 @@
</span><span class="cx"> LayoutUnit childHeightAboveBaseline = ascentForChild(*child);
</span><span class="cx"> LayoutUnit childDepthBelowBaseline = child->logicalHeight() - childHeightAboveBaseline;
</span><span class="cx">
</span><del>- ascent = std::max<LayoutUnit>(ascent, childHeightAboveBaseline);
- descent = std::max<LayoutUnit>(descent, childDepthBelowBaseline);
</del><ins>+ ascent = std::max(ascent, childHeightAboveBaseline);
+ descent = std::max(descent, childDepthBelowBaseline);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // We ensure a minimal stretch size.
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingmathmlRenderMathMLUnderOvercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/mathml/RenderMathMLUnderOver.cpp (201417 => 201418)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/mathml/RenderMathMLUnderOver.cpp 2016-05-26 07:54:41 UTC (rev 201417)
+++ trunk/Source/WebCore/rendering/mathml/RenderMathMLUnderOver.cpp 2016-05-26 09:14:20 UTC (rev 201418)
</span><span class="lines">@@ -55,7 +55,7 @@
</span><span class="cx">
</span><span class="cx"> RenderMathMLOperator* RenderMathMLUnderOver::unembellishedOperator()
</span><span class="cx"> {
</span><del>- RenderObject* base = firstChild();
</del><ins>+ auto* base = firstChildBox();
</ins><span class="cx"> if (!is<RenderMathMLBlock>(base))
</span><span class="cx"> return nullptr;
</span><span class="cx"> return downcast<RenderMathMLBlock>(*base).unembellishedOperator();
</span><span class="lines">@@ -75,7 +75,7 @@
</span><span class="cx"> LayoutUnit stretchWidth = 0;
</span><span class="cx"> Vector<RenderMathMLOperator*, 2> renderOperators;
</span><span class="cx">
</span><del>- for (RenderObject* child = firstChild(); child; child = child->nextSibling()) {
</del><ins>+ for (auto* child = firstChildBox(); child; child = child->nextSiblingBox()) {
</ins><span class="cx"> if (child->needsLayout()) {
</span><span class="cx"> if (is<RenderMathMLBlock>(child)) {
</span><span class="cx"> if (auto renderOperator = downcast<RenderMathMLBlock>(*child).unembellishedOperator()) {
</span><span class="lines">@@ -86,13 +86,12 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>- downcast<RenderElement>(*child).layout();
</del><ins>+ child->layout();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // Skipping the embellished op does not work for nested structures like
</span><span class="cx"> // <munder><mover><mo>_</mo>...</mover> <mo>_</mo></munder>.
</span><del>- if (is<RenderBox>(*child))
- stretchWidth = std::max<LayoutUnit>(stretchWidth, downcast<RenderBox>(*child).logicalWidth());
</del><ins>+ stretchWidth = std::max(stretchWidth, child->logicalWidth());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // Set the sizes of (possibly embellished) stretchy operator children.
</span></span></pre>
</div>
</div>
</body>
</html>