<!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>[205098] 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/205098">205098</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2016-08-28 01:26:07 -0700 (Sun, 28 Aug 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>More cleanup for the mpadded implementation
https://bugs.webkit.org/show_bug.cgi?id=161136
Source/WebCore:
Patch by Frederic Wang <fwang@igalia.com> on 2016-08-28
Reviewed by Darin Adler.
We perform the following cleanup for the mpadded renderer class:
1) We do not store the ascent on the class. This may make update more reliable and will
help for general improvement of MathML ascents (bug 155879).
2) We split resolveWidth/resolveAttributes into smaller functions and improve the coding
style. This helps to calculate firstLineBaseline in 1).
3) We do not override updateFromElement and styleDidChange to perform setNeedsLayout calls.
These calls already seem unnecessary and can be removed even more safely after 1).
We add a test for style change. Change of attributes as well as metrics calcuation of empty
and non-empty mpadded elements are already covered by other tests.
Test: mathml/presentation/mpadded-style-change.html
* rendering/mathml/RenderMathMLPadded.cpp:
(WebCore::RenderMathMLPadded::voffset): New helper function to resolve voffset.
(WebCore::RenderMathMLPadded::lspace): Ditto for lspace.
(WebCore::RenderMathMLPadded::mpaddedWidth): Ditto for width.
(WebCore::RenderMathMLPadded::mpaddedHeight): Ditto for height.
(WebCore::RenderMathMLPadded::mpaddedDepth): Ditto for detph.
(WebCore::RenderMathMLPadded::computePreferredLogicalWidths): Use mpaddedWidth().
(WebCore::RenderMathMLPadded::layoutBlock): Use the new helper functions.
(WebCore::RenderMathMLPadded::firstLineBaseline): Use voffset or mpaddedHeight for baseline
calculation instead of m_padded.
(WebCore::RenderMathMLPadded::resolveWidth): Deleted. Renamed mpaddedWidth.
(WebCore::RenderMathMLPadded::resolveAttributes): Deleted. Split into smaller functions.
(WebCore::RenderMathMLPadded::updateFromElement): Deleted. We do not need to call
setNeedsLayout.
(WebCore::RenderMathMLPadded::styleDidChange): Deleted. Ditto.
* rendering/mathml/RenderMathMLPadded.h: Update function declaration and remove m_ascent.
LayoutTests:
We add a test for style change in mpadded.
Patch by Frederic Wang <fwang@igalia.com> on 2016-08-28
Reviewed by Darin Adler.
* mathml/presentation/mpadded-style-change-expected.html: Added.
* mathml/presentation/mpadded-style-change.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="#trunkSourceWebCorerenderingmathmlRenderMathMLPaddedcpp">trunk/Source/WebCore/rendering/mathml/RenderMathMLPadded.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingmathmlRenderMathMLPaddedh">trunk/Source/WebCore/rendering/mathml/RenderMathMLPadded.h</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsmathmlpresentationmpaddedstylechangeexpectedhtml">trunk/LayoutTests/mathml/presentation/mpadded-style-change-expected.html</a></li>
<li><a href="#trunkLayoutTestsmathmlpresentationmpaddedstylechangehtml">trunk/LayoutTests/mathml/presentation/mpadded-style-change.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (205097 => 205098)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2016-08-28 05:55:17 UTC (rev 205097)
+++ trunk/LayoutTests/ChangeLog 2016-08-28 08:26:07 UTC (rev 205098)
</span><span class="lines">@@ -1,3 +1,15 @@
</span><ins>+2016-08-28 Frederic Wang <fwang@igalia.com>
+
+ More cleanup for the mpadded implementation
+ https://bugs.webkit.org/show_bug.cgi?id=161136
+
+ We add a test for style change in mpadded.
+
+ Reviewed by Darin Adler.
+
+ * mathml/presentation/mpadded-style-change-expected.html: Added.
+ * mathml/presentation/mpadded-style-change.html: Added.
+
</ins><span class="cx"> 2016-08-27 Chris Dumez <cdumez@apple.com>
</span><span class="cx">
</span><span class="cx"> Update generated bindings to throw a SecurityError when denying cross-origin access to properties
</span></span></pre></div>
<a id="trunkLayoutTestsmathmlpresentationmpaddedstylechangeexpectedhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/mathml/presentation/mpadded-style-change-expected.html (0 => 205098)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/mathml/presentation/mpadded-style-change-expected.html (rev 0)
+++ trunk/LayoutTests/mathml/presentation/mpadded-style-change-expected.html 2016-08-28 08:26:07 UTC (rev 205098)
</span><span class="lines">@@ -0,0 +1,21 @@
</span><ins>+<!doctype html>
+<html class="reftest-wait">
+ <head>
+ <title>mpadded style change</title>
+ <meta charset="utf-8"/>
+ <style>
+ math.large { font-size: 2px; }
+ </style>
+ </head>
+ <body>
+ <math class="large">
+ <mspace width="10em" height="5em" depth="5em" mathbackground="green"/>
+ <mpadded mathbackground="blue"
+ width="40em" depth="30em" height="20em"
+ lspace="5em" voffset="-15em">
+ <mspace width="10em" height="5em" depth="5em" mathbackground="red"/>
+ </mpadded>
+ <mspace width="10em" height="5em" depth="5em" mathbackground="green"/>
+ </math>
+ </body>
+</html>
</ins></span></pre></div>
<a id="trunkLayoutTestsmathmlpresentationmpaddedstylechangehtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/mathml/presentation/mpadded-style-change.html (0 => 205098)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/mathml/presentation/mpadded-style-change.html (rev 0)
+++ trunk/LayoutTests/mathml/presentation/mpadded-style-change.html 2016-08-28 08:26:07 UTC (rev 205098)
</span><span class="lines">@@ -0,0 +1,29 @@
</span><ins>+<!doctype html>
+<html class="reftest-wait">
+ <head>
+ <title>mpadded style change</title>
+ <meta charset="utf-8"/>
+ <style>
+ math.normal { font-size: 1px; }
+ math.large { font-size: 2px; }
+ </style>
+ <script type="text/javascript">
+ function doTest() {
+ document.getElementById("math").setAttribute("class", "large")
+ document.documentElement.removeAttribute("class");
+ }
+ window.addEventListener("load", doTest, false);
+ </script>
+ </head>
+ <body>
+ <math id="math" class="normal">
+ <mspace width="10em" height="5em" depth="5em" mathbackground="green"/>
+ <mpadded mathbackground="blue"
+ width="40em" depth="30em" height="20em"
+ lspace="5em" voffset="-15em">
+ <mspace width="10em" height="5em" depth="5em" mathbackground="red"/>
+ </mpadded>
+ <mspace width="10em" height="5em" depth="5em" mathbackground="green"/>
+ </math>
+ </body>
+</html>
</ins></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (205097 => 205098)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-08-28 05:55:17 UTC (rev 205097)
+++ trunk/Source/WebCore/ChangeLog 2016-08-28 08:26:07 UTC (rev 205098)
</span><span class="lines">@@ -1,3 +1,40 @@
</span><ins>+2016-08-28 Frederic Wang <fwang@igalia.com>
+
+ More cleanup for the mpadded implementation
+ https://bugs.webkit.org/show_bug.cgi?id=161136
+
+ Reviewed by Darin Adler.
+
+ We perform the following cleanup for the mpadded renderer class:
+ 1) We do not store the ascent on the class. This may make update more reliable and will
+ help for general improvement of MathML ascents (bug 155879).
+ 2) We split resolveWidth/resolveAttributes into smaller functions and improve the coding
+ style. This helps to calculate firstLineBaseline in 1).
+ 3) We do not override updateFromElement and styleDidChange to perform setNeedsLayout calls.
+ These calls already seem unnecessary and can be removed even more safely after 1).
+
+ We add a test for style change. Change of attributes as well as metrics calcuation of empty
+ and non-empty mpadded elements are already covered by other tests.
+
+ Test: mathml/presentation/mpadded-style-change.html
+
+ * rendering/mathml/RenderMathMLPadded.cpp:
+ (WebCore::RenderMathMLPadded::voffset): New helper function to resolve voffset.
+ (WebCore::RenderMathMLPadded::lspace): Ditto for lspace.
+ (WebCore::RenderMathMLPadded::mpaddedWidth): Ditto for width.
+ (WebCore::RenderMathMLPadded::mpaddedHeight): Ditto for height.
+ (WebCore::RenderMathMLPadded::mpaddedDepth): Ditto for detph.
+ (WebCore::RenderMathMLPadded::computePreferredLogicalWidths): Use mpaddedWidth().
+ (WebCore::RenderMathMLPadded::layoutBlock): Use the new helper functions.
+ (WebCore::RenderMathMLPadded::firstLineBaseline): Use voffset or mpaddedHeight for baseline
+ calculation instead of m_padded.
+ (WebCore::RenderMathMLPadded::resolveWidth): Deleted. Renamed mpaddedWidth.
+ (WebCore::RenderMathMLPadded::resolveAttributes): Deleted. Split into smaller functions.
+ (WebCore::RenderMathMLPadded::updateFromElement): Deleted. We do not need to call
+ setNeedsLayout.
+ (WebCore::RenderMathMLPadded::styleDidChange): Deleted. Ditto.
+ * rendering/mathml/RenderMathMLPadded.h: Update function declaration and remove m_ascent.
+
</ins><span class="cx"> 2016-08-27 Alex Christensen <achristensen@webkit.org>
</span><span class="cx">
</span><span class="cx"> URLParser should parse relative URLs
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingmathmlRenderMathMLPaddedcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/mathml/RenderMathMLPadded.cpp (205097 => 205098)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/mathml/RenderMathMLPadded.cpp 2016-08-28 05:55:17 UTC (rev 205097)
+++ trunk/Source/WebCore/rendering/mathml/RenderMathMLPadded.cpp 2016-08-28 08:26:07 UTC (rev 205098)
</span><span class="lines">@@ -37,31 +37,33 @@
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void RenderMathMLPadded::resolveWidth(LayoutUnit& width)
</del><ins>+LayoutUnit RenderMathMLPadded::voffset() const
</ins><span class="cx"> {
</span><del>- auto& paddedElement = element();
- width = toUserUnits(paddedElement.width(), style(), width);
- if (width < 0)
- width = 0;
</del><ins>+ return toUserUnits(element().voffset(), style(), 0);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-void RenderMathMLPadded::resolveAttributes(LayoutUnit& width, LayoutUnit& height, LayoutUnit& depth, LayoutUnit& lspace, LayoutUnit& voffset)
</del><ins>+LayoutUnit RenderMathMLPadded::lspace() const
</ins><span class="cx"> {
</span><del>- resolveWidth(width);
- auto& paddedElement = element();
- height = toUserUnits(paddedElement.height(), style(), height);
- depth = toUserUnits(paddedElement.depth(), style(), depth);
- lspace = toUserUnits(paddedElement.lspace(), style(), lspace);
- voffset = toUserUnits(paddedElement.voffset(), style(), voffset);
- if (height < 0)
- height = 0;
- if (depth < 0)
- depth = 0;
</del><ins>+ LayoutUnit lspace = toUserUnits(element().lspace(), style(), 0);
</ins><span class="cx"> // FIXME: Negative lspace values are not supported yet (https://bugs.webkit.org/show_bug.cgi?id=85730).
</span><del>- if (lspace < 0)
- lspace = 0;
</del><ins>+ return std::max<LayoutUnit>(0, lspace);
</ins><span class="cx"> }
</span><span class="cx">
</span><ins>+LayoutUnit RenderMathMLPadded::mpaddedWidth(LayoutUnit contentWidth) const
+{
+ return std::max<LayoutUnit>(0, toUserUnits(element().width(), style(), contentWidth));
+}
+
+LayoutUnit RenderMathMLPadded::mpaddedHeight(LayoutUnit contentHeight) const
+{
+ return std::max<LayoutUnit>(0, toUserUnits(element().height(), style(), contentHeight));
+}
+
+LayoutUnit RenderMathMLPadded::mpaddedDepth(LayoutUnit contentDepth) const
+{
+ return std::max<LayoutUnit>(0, toUserUnits(element().depth(), style(), contentDepth));
+}
+
</ins><span class="cx"> void RenderMathMLPadded::computePreferredLogicalWidths()
</span><span class="cx"> {
</span><span class="cx"> ASSERT(preferredLogicalWidthsDirty());
</span><span class="lines">@@ -71,9 +73,8 @@
</span><span class="cx">
</span><span class="cx"> // Only the width attribute should modify the width.
</span><span class="cx"> // We parse it using the preferred width of the content as its default value.
</span><del>- LayoutUnit width = m_maxPreferredLogicalWidth;
- resolveWidth(width);
- m_minPreferredLogicalWidth = m_maxPreferredLogicalWidth = width;
</del><ins>+ m_maxPreferredLogicalWidth = mpaddedWidth(m_maxPreferredLogicalWidth);
+ m_minPreferredLogicalWidth = m_maxPreferredLogicalWidth;
</ins><span class="cx">
</span><span class="cx"> setPreferredLogicalWidthsDirty(false);
</span><span class="cx"> }
</span><span class="lines">@@ -93,41 +94,31 @@
</span><span class="cx"> contentWidth = logicalWidth();
</span><span class="cx">
</span><span class="cx"> // We parse the mpadded attributes using the content metrics as the default value.
</span><del>- LayoutUnit width = contentWidth;
- LayoutUnit ascent = contentAscent;
- LayoutUnit descent = contentDescent;
- LayoutUnit lspace = 0;
- LayoutUnit voffset = 0;
- resolveAttributes(width, ascent, descent, lspace, voffset);
</del><ins>+ LayoutUnit width = mpaddedWidth(contentWidth);
+ LayoutUnit ascent = mpaddedHeight(contentAscent);
+ LayoutUnit descent = mpaddedDepth(contentDescent);
</ins><span class="cx">
</span><span class="cx"> // Align children on the new baseline and shift them by (lspace, -voffset)
</span><del>- LayoutPoint contentLocation(lspace, ascent - contentAscent - voffset);
</del><ins>+ LayoutPoint contentLocation(lspace(), ascent - contentAscent - voffset());
</ins><span class="cx"> for (auto* child = firstChildBox(); child; child = child->nextSiblingBox())
</span><span class="cx"> child->setLocation(child->location() + contentLocation);
</span><span class="cx">
</span><span class="cx"> // Set the final metrics.
</span><span class="cx"> setLogicalWidth(width);
</span><del>- m_ascent = ascent;
</del><span class="cx"> setLogicalHeight(ascent + descent);
</span><span class="cx">
</span><span class="cx"> clearNeedsLayout();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void RenderMathMLPadded::updateFromElement()
-{
- RenderMathMLRow::updateFromElement();
- setNeedsLayoutAndPrefWidthsRecalc();
-}
-
-void RenderMathMLPadded::styleDidChange(StyleDifference diff, const RenderStyle* oldStyle)
-{
- RenderMathMLRow::styleDidChange(diff, oldStyle);
- setNeedsLayoutAndPrefWidthsRecalc();
-}
-
</del><span class="cx"> Optional<int> RenderMathMLPadded::firstLineBaseline() const
</span><span class="cx"> {
</span><del>- return Optional<int>(std::lround(static_cast<float>(m_ascent)));
</del><ins>+ // We try and calculate the baseline from the position of the first child.
+ LayoutUnit ascent;
+ if (auto* baselineChild = firstChildBox())
+ ascent = ascentForChild(*baselineChild) + baselineChild->logicalTop() + voffset();
+ else
+ ascent = mpaddedHeight(0);
+ return Optional<int>(std::lround(static_cast<float>(ascent)));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingmathmlRenderMathMLPaddedh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/mathml/RenderMathMLPadded.h (205097 => 205098)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/mathml/RenderMathMLPadded.h 2016-08-28 05:55:17 UTC (rev 205097)
+++ trunk/Source/WebCore/rendering/mathml/RenderMathMLPadded.h 2016-08-28 08:26:07 UTC (rev 205098)
</span><span class="lines">@@ -44,14 +44,12 @@
</span><span class="cx"> void layoutBlock(bool relayoutChildren, LayoutUnit pageLogicalHeight = 0) final;
</span><span class="cx"> Optional<int> firstLineBaseline() const final;
</span><span class="cx">
</span><del>- void updateFromElement() final;
- void styleDidChange(StyleDifference, const RenderStyle* oldStyle) final;
-
</del><span class="cx"> MathMLPaddedElement& element() const { return static_cast<MathMLPaddedElement&>(nodeForNonAnonymous()); }
</span><del>- void resolveWidth(LayoutUnit& width);
- void resolveAttributes(LayoutUnit& width, LayoutUnit& height, LayoutUnit& depth, LayoutUnit& lspace, LayoutUnit& voffset);
-
- LayoutUnit m_ascent;
</del><ins>+ LayoutUnit voffset() const;
+ LayoutUnit lspace() const;
+ LayoutUnit mpaddedWidth(LayoutUnit contentWidth) const;
+ LayoutUnit mpaddedHeight(LayoutUnit contentHeight) const;
+ LayoutUnit mpaddedDepth(LayoutUnit contentDepth) const;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span></span></pre>
</div>
</div>
</body>
</html>