<!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>[199665] 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/199665">199665</a></dd>
<dt>Author</dt> <dd>fred.wang@free.fr</dd>
<dt>Date</dt> <dd>2016-04-18 07:45:00 -0700 (Mon, 18 Apr 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Refactor RenderMathMLScripts layout to avoid using flexbox
https://bugs.webkit.org/show_bug.cgi?id=153917
Patch by Frederic Wang <fwang@igalia.com> on 2016-04-18
Reviewed by Martin Robinson.
Source/WebCore:
Tests: mathml/mathml-in-html5/subsup-parameters-1.html
mathml/opentype/large-operators-italic-correction.html
Reimplement RenderMathMLScripts without any flexbox or anonymous.
We also rely on parameters from the MATH table to improve rendering.
* css/mathml.css:
(msub > * + * + *, msup > * + * + *, msubsup > * + * + * + *, msub > mprescripts, msup > mprescripts, msubsup > mprescripts, msub > none, msup > none, msubsup > none, mmultiscripts > mprescripts ~ mprescripts, mmultiscripts > mprescripts ~ mprescripts ~ *): Deleted.
Invalid markup for scripts is now just hidden.
* rendering/mathml/RenderMathMLOperator.h: ditto.
* rendering/mathml/RenderMathMLScripts.cpp:
(WebCore::RenderMathMLScripts::unembellishedOperator): Reimplemented.
(WebCore::RenderMathMLScripts::getBaseAndScripts): Helper function to verify whether the
child list is valid and retrieve pointers on important children.
(WebCore::RenderMathMLScripts::spaceAfterScript): Helper function to get the
space after a script.
(WebCore::RenderMathMLScripts::italicCorrection): Helper function to read the
italic correction of a largeop base.
(WebCore::RenderMathMLScripts::computePreferredLogicalWidths): Implement this function.
(WebCore::RenderMathMLScripts::getScriptMetricsAndLayoutIfNeeded): Helper function to get
the maximum ascent/descent of all the scripts and determine the minimal
sub/sup shifts to apply.
(WebCore::RenderMathMLScripts::mirrorIfNeeded): Helper function to calculate the horizontal
offset depending on the directionality.
(WebCore::RenderMathMLScripts::layoutBlock): Implement this function.
(WebCore::RenderMathMLScripts::firstLineBaseline): Implement this function.
(WebCore::RenderMathMLScripts::paintChildren): Implement this function.
(WebCore::RenderMathMLScripts::RenderMathMLScripts): Deleted.
(WebCore::RenderMathMLScripts::base): Deleted.
(WebCore::RenderMathMLScripts::fixAnonymousStyleForSubSupPair): Deleted.
(WebCore::RenderMathMLScripts::fixAnonymousStyles): Deleted.
(WebCore::RenderMathMLScripts::addChildInternal): Deleted.
(WebCore::RenderMathMLScripts::removeChildInternal): Deleted.
(WebCore::RenderMathMLScripts::addChild): Deleted.
(WebCore::RenderMathMLScripts::removeChild): Deleted.
(WebCore::RenderMathMLScripts::styleDidChange): Deleted.
(WebCore::RenderMathMLScripts::layout): Deleted.
(WebCore::RenderMathMLScriptsWrapper::createAnonymousWrapper): Deleted.
(WebCore::RenderMathMLScriptsWrapper::addChildInternal): Deleted.
(WebCore::RenderMathMLScriptsWrapper::addChild): Deleted.
(WebCore::RenderMathMLScriptsWrapper::removeChildInternal): Deleted.
(WebCore::RenderMathMLScriptsWrapper::removeChild): Deleted.
* rendering/mathml/RenderMathMLScripts.h: Update definitions and remove classes
for anonymous wrappers.
LayoutTests:
We import tests from the MathML in HTML5 test suite to verify various OpenType MATH parameters.
We also add a test for the italic correction of large operators (bug 130325).
Finally, we adjust some tests and expectations to take into account the new rendering.
* imported/mathml-in-html5/LICENSE: Added.
* imported/mathml-in-html5/README.md: Added.
* imported/mathml-in-html5/fonts/math/scripts-spaceafterscript3000.woff: Renamed from LayoutTests/mathml/mathml-in-html5/fonts/scripts-spaceafterscript3000.woff.
* imported/mathml-in-html5/fonts/math/scripts-subscriptbaselinedropmin9000.woff: Renamed from LayoutTests/mathml/mathml-in-html5/fonts/scripts-subscriptbaselinedropmin9000.woff.
* imported/mathml-in-html5/fonts/math/scripts-subscriptshiftdown6000.woff: Renamed from LayoutTests/mathml/mathml-in-html5/fonts/scripts-subscriptshiftdown6000.woff.
* imported/mathml-in-html5/fonts/math/scripts-subscripttopmax4000.woff: Renamed from LayoutTests/mathml/mathml-in-html5/fonts/scripts-subscripttopmax4000.woff.
* imported/mathml-in-html5/fonts/math/scripts-subsuperscriptgapmin11000-superscriptbottommaxwithsubscript3000.woff: Renamed from LayoutTests/mathml/mathml-in-html5/fonts/scripts-subsuperscriptgapmin11000-superscriptbottommaxwithsubscript3000.woff.
* imported/mathml-in-html5/fonts/math/scripts-subsuperscriptgapmin11000.woff: Renamed from LayoutTests/mathml/mathml-in-html5/fonts/scripts-subsuperscriptgapmin11000.woff.
* imported/mathml-in-html5/fonts/math/scripts-superscriptbaselinedropmax10000.woff: Renamed from LayoutTests/mathml/mathml-in-html5/fonts/scripts-superscriptbaselinedropmax10000.woff.
* imported/mathml-in-html5/fonts/math/scripts-superscriptbottommin8000.woff: Renamed from LayoutTests/mathml/mathml-in-html5/fonts/scripts-superscriptbottommin8000.woff.
* imported/mathml-in-html5/fonts/math/scripts-superscriptshiftup7000.woff: Renamed from LayoutTests/mathml/mathml-in-html5/fonts/scripts-superscriptshiftup7000.woff.
* imported/mathml-in-html5/fonts/math/scripts-superscriptshiftupcramped5000.woff: Renamed from LayoutTests/mathml/mathml-in-html5/fonts/scripts-superscriptshiftupcramped5000.woff.
* imported/mathml-in-html5/mathml/presentation-markup/scripts/subsup-parameters-1-expected.txt: Renamed from LayoutTests/mathml/mathml-in-html5/subsup-parameters-1-expected.txt.
* imported/mathml-in-html5/mathml/presentation-markup/scripts/subsup-parameters-1.html: Renamed from LayoutTests/mathml/mathml-in-html5/subsup-parameters-1.html.
* mathml/msubsup-fuzz-expected.txt: Test adjustment: Update the reference now that nothing
is displayed for invalid markup.
* accessibility/mac/mathml-multiscript-expected.txt: ditto.
* mathml/opentype/large-operators-italic-correction.html: Added. This test verifies that the
italic correction from the MATH table is used for positioning subscripts of large operators.
* mathml/opentype/large-operators-italic-correction-expected.txt: Added.
* mathml/presentation/bug95015.html: Test adjustment: move down a bit the covering red
rectangle, since the script is slightly lower.
* mathml/presentation/bug95015-expected.html: ditto
* mathml/presentation/multiscripts-positions.html: Test adjustment: Modify the expected
vertical positions of scripts now that we follow Gecko's behavior.
* mathml/presentation/multiscripts-positions-expected.html: ditto.
* mathml/presentation/multiscripts-noscripts-expected.html: There seem to be small errors in
the ascent of mmultiscripts, probably due to the conversions between firstLineBaseline (int)
and LayoutUnit (fractional pixel). For now, let's tweak the tests.
* mathml/presentation/multiscripts-noscripts.html: ditto.
* mathml/presentation/scripts-height-expected.html: ditto
* mathml/presentation/scripts-height.html: ditto
* mathml/presentation/scripts-horizontal-alignment.html: Modify the test to make it work
with the new layout rules.
* mathml/presentation/scripts-horizontal-alignment-expected.html: ditto.
* platform/gtk/accessibility/math-multiscript-attributes-expected.txt: Test adjustment:
Update reference to take into account a small shift.
* platform/mac/accessibility/math-multiscript-attributes-expected.txt: ditto.
* platform/gtk/mathml/presentation/roots-expected.png: Test adjustment: Update reference to
take into account small rendering changes.
* platform/gtk/mathml/presentation/roots-expected.txt: ditto.
* platform/ios-simulator/mathml/presentation/roots-expected.txt: ditto.
* platform/mac/TestExpectations: Mark some tests for scripts as failing on mac. MATH fonts
are really needed to make them reliable.
* platform/ios-simulator/TestExpectations: Ditto</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsaccessibilitymacmathmlmultiscriptexpectedtxt">trunk/LayoutTests/accessibility/mac/mathml-multiscript-expected.txt</a></li>
<li><a href="#trunkLayoutTestsaccessibilitymathmultiscriptattributesexpectedtxt">trunk/LayoutTests/accessibility/math-multiscript-attributes-expected.txt</a></li>
<li><a href="#trunkLayoutTestsmathmlmsubsupfuzzexpectedtxt">trunk/LayoutTests/mathml/msubsup-fuzz-expected.txt</a></li>
<li><a href="#trunkLayoutTestsmathmlpresentationbug95015expectedhtml">trunk/LayoutTests/mathml/presentation/bug95015-expected.html</a></li>
<li><a href="#trunkLayoutTestsmathmlpresentationbug95015html">trunk/LayoutTests/mathml/presentation/bug95015.html</a></li>
<li><a href="#trunkLayoutTestsmathmlpresentationmultiscriptsnoscriptsexpectedhtml">trunk/LayoutTests/mathml/presentation/multiscripts-noscripts-expected.html</a></li>
<li><a href="#trunkLayoutTestsmathmlpresentationmultiscriptsnoscriptshtml">trunk/LayoutTests/mathml/presentation/multiscripts-noscripts.html</a></li>
<li><a href="#trunkLayoutTestsmathmlpresentationmultiscriptspositionsexpectedhtml">trunk/LayoutTests/mathml/presentation/multiscripts-positions-expected.html</a></li>
<li><a href="#trunkLayoutTestsmathmlpresentationmultiscriptspositionshtml">trunk/LayoutTests/mathml/presentation/multiscripts-positions.html</a></li>
<li><a href="#trunkLayoutTestsmathmlpresentationscriptsheightexpectedhtml">trunk/LayoutTests/mathml/presentation/scripts-height-expected.html</a></li>
<li><a href="#trunkLayoutTestsmathmlpresentationscriptsheighthtml">trunk/LayoutTests/mathml/presentation/scripts-height.html</a></li>
<li><a href="#trunkLayoutTestsmathmlpresentationscriptshorizontalalignmentexpectedhtml">trunk/LayoutTests/mathml/presentation/scripts-horizontal-alignment-expected.html</a></li>
<li><a href="#trunkLayoutTestsmathmlpresentationscriptshorizontalalignmenthtml">trunk/LayoutTests/mathml/presentation/scripts-horizontal-alignment.html</a></li>
<li><a href="#trunkLayoutTestsplatformgtkaccessibilitymathmultiscriptattributesexpectedtxt">trunk/LayoutTests/platform/gtk/accessibility/math-multiscript-attributes-expected.txt</a></li>
<li><a href="#trunkLayoutTestsplatformgtkmathmlpresentationrootsexpectedpng">trunk/LayoutTests/platform/gtk/mathml/presentation/roots-expected.png</a></li>
<li><a href="#trunkLayoutTestsplatformgtkmathmlpresentationrootsexpectedtxt">trunk/LayoutTests/platform/gtk/mathml/presentation/roots-expected.txt</a></li>
<li><a href="#trunkLayoutTestsplatformiossimulatorTestExpectations">trunk/LayoutTests/platform/ios-simulator/TestExpectations</a></li>
<li><a href="#trunkLayoutTestsplatformiossimulatormathmlpresentationrootsexpectedtxt">trunk/LayoutTests/platform/ios-simulator/mathml/presentation/roots-expected.txt</a></li>
<li><a href="#trunkLayoutTestsplatformmacTestExpectations">trunk/LayoutTests/platform/mac/TestExpectations</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="#trunkSourceWebCorerenderingmathmlRenderMathMLScriptscpp">trunk/Source/WebCore/rendering/mathml/RenderMathMLScripts.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingmathmlRenderMathMLScriptsh">trunk/Source/WebCore/rendering/mathml/RenderMathMLScripts.h</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li>trunk/LayoutTests/imported/mathml-in-html5/</li>
<li><a href="#trunkLayoutTestsimportedmathmlinhtml5LICENSE">trunk/LayoutTests/imported/mathml-in-html5/LICENSE</a></li>
<li><a href="#trunkLayoutTestsimportedmathmlinhtml5READMEmd">trunk/LayoutTests/imported/mathml-in-html5/README.md</a></li>
<li>trunk/LayoutTests/imported/mathml-in-html5/fonts/</li>
<li>trunk/LayoutTests/imported/mathml-in-html5/fonts/math/</li>
<li><a href="#trunkLayoutTestsimportedmathmlinhtml5fontsmathscriptsspaceafterscript3000woff">trunk/LayoutTests/imported/mathml-in-html5/fonts/math/scripts-spaceafterscript3000.woff</a></li>
<li><a href="#trunkLayoutTestsimportedmathmlinhtml5fontsmathscriptssubscriptbaselinedropmin9000woff">trunk/LayoutTests/imported/mathml-in-html5/fonts/math/scripts-subscriptbaselinedropmin9000.woff</a></li>
<li><a href="#trunkLayoutTestsimportedmathmlinhtml5fontsmathscriptssubscriptshiftdown6000woff">trunk/LayoutTests/imported/mathml-in-html5/fonts/math/scripts-subscriptshiftdown6000.woff</a></li>
<li><a href="#trunkLayoutTestsimportedmathmlinhtml5fontsmathscriptssubscripttopmax4000woff">trunk/LayoutTests/imported/mathml-in-html5/fonts/math/scripts-subscripttopmax4000.woff</a></li>
<li><a href="#trunkLayoutTestsimportedmathmlinhtml5fontsmathscriptssubsuperscriptgapmin11000superscriptbottommaxwithsubscript3000woff">trunk/LayoutTests/imported/mathml-in-html5/fonts/math/scripts-subsuperscriptgapmin11000-superscriptbottommaxwithsubscript3000.woff</a></li>
<li><a href="#trunkLayoutTestsimportedmathmlinhtml5fontsmathscriptssubsuperscriptgapmin11000woff">trunk/LayoutTests/imported/mathml-in-html5/fonts/math/scripts-subsuperscriptgapmin11000.woff</a></li>
<li><a href="#trunkLayoutTestsimportedmathmlinhtml5fontsmathscriptssuperscriptbaselinedropmax10000woff">trunk/LayoutTests/imported/mathml-in-html5/fonts/math/scripts-superscriptbaselinedropmax10000.woff</a></li>
<li><a href="#trunkLayoutTestsimportedmathmlinhtml5fontsmathscriptssuperscriptbottommin8000woff">trunk/LayoutTests/imported/mathml-in-html5/fonts/math/scripts-superscriptbottommin8000.woff</a></li>
<li><a href="#trunkLayoutTestsimportedmathmlinhtml5fontsmathscriptssuperscriptshiftup7000woff">trunk/LayoutTests/imported/mathml-in-html5/fonts/math/scripts-superscriptshiftup7000.woff</a></li>
<li><a href="#trunkLayoutTestsimportedmathmlinhtml5fontsmathscriptssuperscriptshiftupcramped5000woff">trunk/LayoutTests/imported/mathml-in-html5/fonts/math/scripts-superscriptshiftupcramped5000.woff</a></li>
<li>trunk/LayoutTests/imported/mathml-in-html5/mathml/</li>
<li>trunk/LayoutTests/imported/mathml-in-html5/mathml/presentation-markup/</li>
<li>trunk/LayoutTests/imported/mathml-in-html5/mathml/presentation-markup/scripts/</li>
<li><a href="#trunkLayoutTestsimportedmathmlinhtml5mathmlpresentationmarkupscriptssubsupparameters1expectedtxt">trunk/LayoutTests/imported/mathml-in-html5/mathml/presentation-markup/scripts/subsup-parameters-1-expected.txt</a></li>
<li><a href="#trunkLayoutTestsimportedmathmlinhtml5mathmlpresentationmarkupscriptssubsupparameters1html">trunk/LayoutTests/imported/mathml-in-html5/mathml/presentation-markup/scripts/subsup-parameters-1.html</a></li>
<li><a href="#trunkLayoutTestsmathmlopentypelargeoperatorsitaliccorrectionexpectedtxt">trunk/LayoutTests/mathml/opentype/large-operators-italic-correction-expected.txt</a></li>
<li><a href="#trunkLayoutTestsmathmlopentypelargeoperatorsitaliccorrectionhtml">trunk/LayoutTests/mathml/opentype/large-operators-italic-correction.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (199664 => 199665)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2016-04-18 10:36:29 UTC (rev 199664)
+++ trunk/LayoutTests/ChangeLog 2016-04-18 14:45:00 UTC (rev 199665)
</span><span class="lines">@@ -1,3 +1,60 @@
</span><ins>+2016-04-18 Frederic Wang <fwang@igalia.com>
+
+ Refactor RenderMathMLScripts layout to avoid using flexbox
+ https://bugs.webkit.org/show_bug.cgi?id=153917
+
+ Reviewed by Martin Robinson.
+
+ We import tests from the MathML in HTML5 test suite to verify various OpenType MATH parameters.
+ We also add a test for the italic correction of large operators (bug 130325).
+ Finally, we adjust some tests and expectations to take into account the new rendering.
+
+ * imported/mathml-in-html5/LICENSE: Added.
+ * imported/mathml-in-html5/README.md: Added.
+ * imported/mathml-in-html5/fonts/math/scripts-spaceafterscript3000.woff: Renamed from LayoutTests/mathml/mathml-in-html5/fonts/scripts-spaceafterscript3000.woff.
+ * imported/mathml-in-html5/fonts/math/scripts-subscriptbaselinedropmin9000.woff: Renamed from LayoutTests/mathml/mathml-in-html5/fonts/scripts-subscriptbaselinedropmin9000.woff.
+ * imported/mathml-in-html5/fonts/math/scripts-subscriptshiftdown6000.woff: Renamed from LayoutTests/mathml/mathml-in-html5/fonts/scripts-subscriptshiftdown6000.woff.
+ * imported/mathml-in-html5/fonts/math/scripts-subscripttopmax4000.woff: Renamed from LayoutTests/mathml/mathml-in-html5/fonts/scripts-subscripttopmax4000.woff.
+ * imported/mathml-in-html5/fonts/math/scripts-subsuperscriptgapmin11000-superscriptbottommaxwithsubscript3000.woff: Renamed from LayoutTests/mathml/mathml-in-html5/fonts/scripts-subsuperscriptgapmin11000-superscriptbottommaxwithsubscript3000.woff.
+ * imported/mathml-in-html5/fonts/math/scripts-subsuperscriptgapmin11000.woff: Renamed from LayoutTests/mathml/mathml-in-html5/fonts/scripts-subsuperscriptgapmin11000.woff.
+ * imported/mathml-in-html5/fonts/math/scripts-superscriptbaselinedropmax10000.woff: Renamed from LayoutTests/mathml/mathml-in-html5/fonts/scripts-superscriptbaselinedropmax10000.woff.
+ * imported/mathml-in-html5/fonts/math/scripts-superscriptbottommin8000.woff: Renamed from LayoutTests/mathml/mathml-in-html5/fonts/scripts-superscriptbottommin8000.woff.
+ * imported/mathml-in-html5/fonts/math/scripts-superscriptshiftup7000.woff: Renamed from LayoutTests/mathml/mathml-in-html5/fonts/scripts-superscriptshiftup7000.woff.
+ * imported/mathml-in-html5/fonts/math/scripts-superscriptshiftupcramped5000.woff: Renamed from LayoutTests/mathml/mathml-in-html5/fonts/scripts-superscriptshiftupcramped5000.woff.
+ * imported/mathml-in-html5/mathml/presentation-markup/scripts/subsup-parameters-1-expected.txt: Renamed from LayoutTests/mathml/mathml-in-html5/subsup-parameters-1-expected.txt.
+ * imported/mathml-in-html5/mathml/presentation-markup/scripts/subsup-parameters-1.html: Renamed from LayoutTests/mathml/mathml-in-html5/subsup-parameters-1.html.
+ * mathml/msubsup-fuzz-expected.txt: Test adjustment: Update the reference now that nothing
+ is displayed for invalid markup.
+ * accessibility/mac/mathml-multiscript-expected.txt: ditto.
+ * mathml/opentype/large-operators-italic-correction.html: Added. This test verifies that the
+ italic correction from the MATH table is used for positioning subscripts of large operators.
+ * mathml/opentype/large-operators-italic-correction-expected.txt: Added.
+ * mathml/presentation/bug95015.html: Test adjustment: move down a bit the covering red
+ rectangle, since the script is slightly lower.
+ * mathml/presentation/bug95015-expected.html: ditto
+ * mathml/presentation/multiscripts-positions.html: Test adjustment: Modify the expected
+ vertical positions of scripts now that we follow Gecko's behavior.
+ * mathml/presentation/multiscripts-positions-expected.html: ditto.
+ * mathml/presentation/multiscripts-noscripts-expected.html: There seem to be small errors in
+ the ascent of mmultiscripts, probably due to the conversions between firstLineBaseline (int)
+ and LayoutUnit (fractional pixel). For now, let's tweak the tests.
+ * mathml/presentation/multiscripts-noscripts.html: ditto.
+ * mathml/presentation/scripts-height-expected.html: ditto
+ * mathml/presentation/scripts-height.html: ditto
+ * mathml/presentation/scripts-horizontal-alignment.html: Modify the test to make it work
+ with the new layout rules.
+ * mathml/presentation/scripts-horizontal-alignment-expected.html: ditto.
+ * platform/gtk/accessibility/math-multiscript-attributes-expected.txt: Test adjustment:
+ Update reference to take into account a small shift.
+ * platform/mac/accessibility/math-multiscript-attributes-expected.txt: ditto.
+ * platform/gtk/mathml/presentation/roots-expected.png: Test adjustment: Update reference to
+ take into account small rendering changes.
+ * platform/gtk/mathml/presentation/roots-expected.txt: ditto.
+ * platform/ios-simulator/mathml/presentation/roots-expected.txt: ditto.
+ * platform/mac/TestExpectations: Mark some tests for scripts as failing on mac. MATH fonts
+ are really needed to make them reliable.
+ * platform/ios-simulator/TestExpectations: Ditto
+
</ins><span class="cx"> 2016-04-18 Manuel Rego Casasnovas <rego@igalia.com>
</span><span class="cx">
</span><span class="cx"> [css-grid] Use grid-template-areas to determine the explicit grid
</span></span></pre></div>
<a id="trunkLayoutTestsaccessibilitymacmathmlmultiscriptexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/accessibility/mac/mathml-multiscript-expected.txt (199664 => 199665)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/accessibility/mac/mathml-multiscript-expected.txt 2016-04-18 10:36:29 UTC (rev 199664)
+++ trunk/LayoutTests/accessibility/mac/mathml-multiscript-expected.txt 2016-04-18 14:45:00 UTC (rev 199665)
</span><span class="lines">@@ -2,35 +2,15 @@
</span><span class="cx"> 1
</span><span class="cx"> 2
</span><span class="cx">
</span><del>-A
-1
-2
-3
</del><span class="cx">
</span><span class="cx"> A
</span><span class="cx"> 4
</span><span class="cx"> 5
</span><span class="cx">
</span><del>-A
-4
-5
-6
</del><span class="cx">
</span><del>-A
-1
-2
-3
-4
-5
-6
</del><span class="cx">
</span><span class="cx"> A
</span><span class="cx">
</span><del>-A
-1
-3
-5
-6
</del><span class="cx"> This tests checks that mmultiscript tags will create the correct accessibility math hierarchy.
</span><span class="cx">
</span><span class="cx"> On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
</span></span></pre></div>
<a id="trunkLayoutTestsaccessibilitymathmultiscriptattributesexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/accessibility/math-multiscript-attributes-expected.txt (199664 => 199665)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/accessibility/math-multiscript-attributes-expected.txt 2016-04-18 10:36:29 UTC (rev 199664)
+++ trunk/LayoutTests/accessibility/math-multiscript-attributes-expected.txt 2016-04-18 14:45:00 UTC (rev 199665)
</span><span class="lines">@@ -14,7 +14,7 @@
</span><span class="cx"> AXChildren:
</span><span class="cx"> AXHelp:
</span><span class="cx"> AXParent:
</span><del>-AXSize: NSSize: {12, 24}
</del><ins>+AXSize: NSSize: {12, 25}
</ins><span class="cx"> AXTitle:
</span><span class="cx"> AXDescription:
</span><span class="cx"> AXValue:
</span><span class="lines">@@ -104,7 +104,7 @@
</span><span class="cx"> AXChildren:
</span><span class="cx"> AXHelp:
</span><span class="cx"> AXParent:
</span><del>-AXSize: NSSize: {9, 19}
</del><ins>+AXSize: NSSize: {10, 19}
</ins><span class="cx"> AXTitle:
</span><span class="cx"> AXDescription:
</span><span class="cx"> AXValue:
</span><span class="lines">@@ -134,7 +134,7 @@
</span><span class="cx"> AXChildren:
</span><span class="cx"> AXHelp:
</span><span class="cx"> AXParent:
</span><del>-AXSize: NSSize: {9, 18}
</del><ins>+AXSize: NSSize: {10, 18}
</ins><span class="cx"> AXTitle:
</span><span class="cx"> AXDescription:
</span><span class="cx"> AXValue:
</span></span></pre></div>
<a id="trunkLayoutTestsimportedmathmlinhtml5LICENSE"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/imported/mathml-in-html5/LICENSE (0 => 199665)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/imported/mathml-in-html5/LICENSE (rev 0)
+++ trunk/LayoutTests/imported/mathml-in-html5/LICENSE 2016-04-18 14:45:00 UTC (rev 199665)
</span><span class="lines">@@ -0,0 +1,3 @@
</span><ins>+This repository is covered by the dual-licensing approach described in:
+
+ http://www.w3.org/Consortium/Legal/2008/04-testsuite-copyright.html
</ins></span></pre></div>
<a id="trunkLayoutTestsimportedmathmlinhtml5READMEmd"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/imported/mathml-in-html5/README.md (0 => 199665)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/imported/mathml-in-html5/README.md (rev 0)
+++ trunk/LayoutTests/imported/mathml-in-html5/README.md 2016-04-18 14:45:00 UTC (rev 199665)
</span><span class="lines">@@ -0,0 +1,47 @@
</span><ins>+# Tests for the MathML in HTML5 implementation note
+
+This repository contains tests for the
+[MathML in HTML5 implementation note](http://www.mathml-association.org/MathMLinHTML5/).
+We follow the formats and conventions of
+[W3C's Test the Web Forward Project](http://testthewebforward.org/),
+please read their documentation for details. The main goals are:
+- helping implementers to verify conformance with the technical description
+ given in the MathML in HTML5 note.
+- provide a set of automatable tests to integrate into the testing framework of
+ web browser developers.
+
+## Installation
+
+You must at least install [git](http://git-scm.com/) and
+[python](http://python.org/). Clone the repository with
+
+ $ git clone --recursive https://github.com/username/MathMLinHTML5-tests.git
+
+If you cloned the repository without --recursive, you will likely have empty
+`resources` and `tools` directories at the root of your cloned repo. You can
+clone the submodules with these additional steps:
+
+ $ cd MathMLinHTML5-tests
+ $ git submodule update --init --recursive
+
+Next, generate the MANIFEST.json file with the following command:
+
+ $ python tools/manifest/update.py
+
+To verify the tests in your browser, you also need to setup a web server whose
+root points to the root of the cloned repo. For a quick setup, you can just run
+the `serve.py` Python script at the root:
+
+ $ python server.py
+
+Finally, open `index.html` at the web server root to get an overview of all the
+tests. Using W3C's wptserve has not been tried but the tests can easily be
+imported into other automated testing framework anyway.
+
+## Note on Web fonts
+
+Many of the tests verify OpenType features and require specific Web fonts for
+that purpose. WOFF fonts are generated using the Python API of
+[fontforge](https://github.com/fontforge/fontforge/). A recent enough version
+of FontForge is necessary so that it includes fixes for [WOFF checkSumAdjustment](https://github.com/fontforge/fontforge/issues/926), [USE_TYPO_METRICS flag](https://github.com/fontforge/fontforge/pull/2274) and various bugs in OpenType
+MATH.
</ins></span></pre></div>
<a id="trunkLayoutTestsimportedmathmlinhtml5fontsmathscriptsspaceafterscript3000woff"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/imported/mathml-in-html5/fonts/math/scripts-spaceafterscript3000.woff (0 => 199665)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/imported/mathml-in-html5/fonts/math/scripts-spaceafterscript3000.woff (rev 0)
+++ trunk/LayoutTests/imported/mathml-in-html5/fonts/math/scripts-spaceafterscript3000.woff 2016-04-18 14:45:00 UTC (rev 199665)
</span><span class="lines">@@ -0,0 +1,6 @@
</span><ins>+wOFFOTTO\x90 \x98CFF <\xC1\xF3\xD9pMFFTM yS\xE1\xDAMATH iX*OS/2X>`
+\xF0cmap\xEC7B+\xC6head*6]\xFBOhhea4$O\xDFhmtx\x88\xD0maxpPPname\x98QB\xDFJ\x94\x98post$ \xFF\x863x\x9Cc`d``\xE2u O\xC7\xF3\xDB|e\xE0f~a\xB8,\xD7\x99\x86&2\xF1 x\x9Cc`d``\xFC\xC2\xF8\x85!\x8A\xF902\xA0&Z<4Px\x9Cc`a~\xC18\x81\x81\x95\x81\x81\xA9\x8BiC\x84f|\xC0`\xC8\xC8e`\xE5d\x80Ft\xD0\xC0\xA0\xC0\xA0\xC0\xF8\x85\xF1 C\x86\xA0 #) x\x9C\xB5\x91\xBFj\xC30\xC6?;h;\x94 3h)$Pن\x90:\x84@\x86\x92\xACٍqb-\x91\xB0%}\xA6ҥOч\xE9\xD4\xE8g[\x85 \xA5\x94B,$\xFD\xA4\xBB\xEF|wp\x8DWh\xBF;\xAC=\xE0\xC5s\x88[|z\xEE`<{\xEEb|x\xEE\xE1&\xBC\xF7\xDC\xC7 |\xA2gн\xE4\xE9\xB1Q\xD5 `\x8A\xCAs\x88!\xDE=w`\x82 \xCF]\xC6\xF3܃\xAF<\xF71+ \xB0\x84\x86\xC1\x91Q\xF6(\xE1 'Lj{\x89\xD2-%\xF75O XM/\xD5\xDC+\xF2Xjs\xACԾtb\x98\x8FD"\xE3\x89\xD8d\xAEܬ\xC5\xC2Z\x9D\xAB\xCC)M7K]\xFD7C\xA5E\xC4i%G\xC1uǻ\x82\xD6S\x9F\x94Y\xD46\xA
F\x94q6\xB2&ˋl犪\xBDI\xA5\xAC\xAD\xF3\xA3|\xD5\xD4\xE0\x9A\xBDb'\x8A\xA6\xFE1s\xCE\xFFfݪ̨I9\xBF{\x8A\x95>\xB8\x95\xAE\xF6\x85H\xC6R\xCC\xC5o\xD5ќ̢4\xAA{z\xB6n\xBD\xB0}M\xD1H\xE2\xA6m \xD8ҟ/(\xA4\x8C\xC7uR\xE7\xCA\xE4 O\x8D\x9D\xDAx\x9Cc```f\x80`F\xB0\xF2\xC1| \xCD\x84 \xBE\xC2\xFF\xFF\xF2\xFFC\xA8JF6' $?\xD4Ya\xD3x\x9Cc`f\x83\xFF\xCD F@\x8A\x91+(U\xB9x\x9Ccd`aa`dd\x94-N.\xCA,()\xD6-.HLNML+I-\x82\x88002102h\xFF\xE0g\xF8!\xCD\xF8C\x86\xE9\x87,\xF3 \x96 \xC6n `\x95a8\xC0/\xC3\xC0 \xC3pXP\x86\x81C\x86\xE1\xB53H\x83\x83C\x9Cs~AeQfzF\x89\x82F\xB2\xA6\x82\x91\x81\xA1\x99\x82obI\x86\xAF\x8F\x82cqq~rfbIf~ >\xCB\xF1: \x98\x95\x94\xBB\xF7~\xAF\xDD˸w\xEF\xCF-{\x99\xF7\x8A\xFD\x92\xF8\xFE\xF0\x9F\xDB\xDE\xDF\xEBE\xBF\xD7\xFE\xDC\x8F\xEFW\x8DH\xB7h7COnx\x9Cc```d\x82\xCB"\xEA\xF9`Z\xFE\xAE)\x8C7\x9A\x87x\x9Cc`d``\xE0bx\xC0\xA8\xC7\xC0`\xC3z\x87\x81,\xC0\xBD\x83E\xD3\xE3\x88PgQ \xA6al$3Pč\x
B0cFQ\x86\xBFW\x81l1 \xAD\xA4\xC1&0\x82!*O\x88y\x84$\xE4p\xBA
+\xA2R\xA8B\xCC\xE2\x9B \x85\xD1HXJ @\xE8\xE8
</ins><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="trunkLayoutTestsimportedmathmlinhtml5fontsmathscriptssubscriptbaselinedropmin9000woff"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/imported/mathml-in-html5/fonts/math/scripts-subscriptbaselinedropmin9000.woff (0 => 199665)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/imported/mathml-in-html5/fonts/math/scripts-subscriptbaselinedropmin9000.woff (rev 0)
+++ trunk/LayoutTests/imported/mathml-in-html5/fonts/math/scripts-subscriptbaselinedropmin9000.woff 2016-04-18 14:45:00 UTC (rev 199665)
</span><span class="lines">@@ -0,0 +1,9 @@
</span><ins>+wOFFOTTO\xB0 (CFF T\xC9 \x8Bc\xAC\xC8FFTM yS\xE1\xDAMATH<jX0\x9AOS/2X>`
+\xF0cmap7B+\xC6head*6]\xFBOhhea4$O\xDFhmtx\xA8\xD0maxpPPname\x98i\xBAY\xFB \xB2post< \xFF\x863x\x9Cc`d``\xE2\xD0\xE5-\x92\xF1\xFC6_\xB8\x99_E.\xCB\xDF5E\xA6\xA1\x80\x83\x81 D\xBCCx\x9Cc`d``\xFC\xC2\xF8\x85!\x8A\xF902\xA0&Z<4Px\x9Cc`a~\xC18\x81\x81\x95\x81\x81\xA9\x8BiC\x84f|\xC0`\xC8\xC8e`\xE5d\x80Ft\xD0\xC0\xA0\xC0\xA0\xC0\xF8\x85\xF1 C\x86\xA0 #) x\x9C\xBD\x92\xBFN\xC30\xC6?\xA7$\xC4\x83\x87"\xB5C\xAA$\x95\xAA\xB6UEU\xA1vQc\xD4Ƒ\x9D\xDDx^\x81W\xE0/\xC3\xC4C\xB0pv\xCC\xC0\x82B\x8De\xDD\xEF\xEC\xBB/\xE7\xB3\x9C\xE3 \xF5w\x8D\xA5c\x86^ {\xB8b\x97\x8E\xB8a/\x8E\x9B\xE8x\xB7\x8E[\xB8\xF0 \xB7i\xFD\x9D"Y\xF3\x8C\xBC;\x9Be\x98a\xE5\xD8\xC3o\x8Ex`#\xC7M,؇\xE3\xB8w︍\x85\xF7\x84$J IE`\x8B 8\xBAH\xD1#!@\x88!\xD1
+1\xED\xE4d\x97\xE4M\xA1iH\x8Av]\xC0L\x96G%\xB6yŻi\x8FGA8䫸\xCAWK>\xD5Z\xA6"\xAE\x84\xA40My\xE6o%ej\xF84H\xBE\xAD&\xA4\xAA\x91aG~AvC;\xA6ʽ\xF5\xC7T\x95Щe\xA5}}HjLb\x9D\xEDD\x91m\x94,\xF7\xA2\x81\x89\xFA\xB3\xFC\x8F\xB2s{\xE6\xCAZE\x9D\xCBl\xBF\xFA\x94\xC81\xA1\xF9_\xA7\xAC\xD5"\xF2} h~\xDD 沨\xE6Rm3 \xF5>\xE1\xBF\xE9\x85Ec\xE0\x9B\xBB9\xF9E\xACI@\x91\\xFDZ\xB8M+m\xC7\xEAsb\x9D)M/\x84A\xD87Ş\xBA\xC2OOi\xC1\x90x\x9Cc```f\x80`F\xB0\xF2\xC1| \xCD\x84 \xBE\xC2\xFF\xFF\xF2\xFFC\xA8JF6' $?\xD4Ya\xD3x\x9Cc`f\x83\xFF\xCD F@\x8A\x91+(U\xB9x\x9Ccd`aa`ddT-N.\xCA,()\xD6-.M\x820\x93\x8BSs2\xF3RS\x8A\xF2 r3\xF3,+ \x99\xB4\xF03\xFC\x90f\xFC!\xC3\xF4C\x96\xF9\x87Kc7\xB0\xCA0\xDC\xE0\x97a`\x90a\xB8-(\xC3\xC0!\xC3\xC8,\xC4\xC0 Ҡ\xC6\xE0Ő\xE7\x9C_PY\x94\x99\x9EQ\xA2\xA0\x91\xAC\xA9`d`h\xA6\xE0\x9BX\x92\xE1\xEB\xA3\xE0X\\x9C\x9F\x9C\x99X\x92\x99\x9FG\x8C#\x88r(02012*)w\xEF\xFD^\xBB\x97q\xEFޟ[\xF62\xEF\xFB%\xF1
\xFD\xE1? \xB6\xBD\xBF~\xAF\xFD\xB9\xE5w-; ߯\x91n\xD1n .\x99RY!x\x9Cc```d\x82\xCB"\xEA\xF9`Z\xFE\xAE)\x8C7\x9A\x87x\x9Cc`d``\xE0bx\xC0\xA8\xC7\xC0`\xC3z\x87'P\xD6\xC0-G\x98\xC6\xC0\xC0G\x84:#\x88Z0+c#\x99\x81"n\x84 3\x8A20\xFC\xBD
+d\xDB0p0\x88i \xCD6\x81 Qy*@\xCC\xC3 \xC4 \xC1 \x87\xD3U\x95"@*` \xD8\\x88(\x8CF\x82\xE0\x8F \xC8\xE8\xE8
</ins><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="trunkLayoutTestsimportedmathmlinhtml5fontsmathscriptssubscriptshiftdown6000woff"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/imported/mathml-in-html5/fonts/math/scripts-subscriptshiftdown6000.woff (0 => 199665)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/imported/mathml-in-html5/fonts/math/scripts-subscriptshiftdown6000.woff (rev 0)
+++ trunk/LayoutTests/imported/mathml-in-html5/fonts/math/scripts-subscriptshiftdown6000.woff 2016-04-18 14:45:00 UTC (rev 199665)
</span><span class="lines">@@ -0,0 +1,9 @@
</span><ins>+wOFFOTTO\x94 \xBCCFF @\xC2\xF9`76FFTM yS\xE1\xDAMATH jX$\xE2OS/2X>`
+\xF0cmap\xF07B+\xC6head*6]\xFBOhhea4$O\xDFhmtx\x8C\xD0maxpPPname\x98X`t\x84\xBA\xB7post( \xFF\x863x\x9Cc`d``ⲷ\xD3\xE3\xF9m\xBE2p3\xBF\x8A0\\x96\xBFk\x8ALC\x885\xCE %x\x9Cc`d``\xFC\xC2\xF8\x85!\x8A\xF902\xA0&Z<4Px\x9Cc`a~\xC18\x81\x81\x95\x81\x81\xA9\x8BiC\x84f|\xC0`\xC8\xC8e`\xE5d\x80Ft\xD0\xC0\xA0\xC0\xA0\xC0\xF8\x85\xF1 C\x86\xA0 #) x\x9C\xB5\x91\xCFJ\xC3@ƿ\xA4\xC0\x8Bx\x8Fe\x84LIR\xB4\xF4R*=H{\xB4\xF76\xFD\x93\xBDt\xC3\xEE\x96\xD2W\xF0\xEA{\x88/\xE1\xD9'\xFA%Y/\x82\x82H\xB3 \xF3\xDBٙ/;\xB3.\xF1
+\xD5w\x87\xA9c-\xBC9\xF6q\x83O\xC75 \xBCg\xC7u\xB4\xFC\x9A\xE3\xAE\xFC\xC7M\xC6_\x98\xE9\xD5/\xB8{,\xAB
+\xF60\x84v\xEC\xE3 \x8Ek\xB0\xE3:\x86\xE3\x84븉\xA1\xFF\x841r \xA9"\xB1E \x816Rt\xE8c\x84\x88\x90\x90fX\xF0$\xA3\x9Fr7\x82\xE1R̒e\\x92w\xC0X\xE5G-\xB7\x99\xED\xB4#\xE20J\xC4la\xB3\xD9T\x8C\x8CQ\xA9\X\xA9\x98fXW\xFC-g\xA5A@\xDBc\xF9-\x9A\x916\xA4\x95\xD4Nx\x93b\xC1\xA4Z\xE6\xD6f\xBFt\x98ɍ]\xA9\xC3. \xC3\xE2\xFCOb?\x88L\xCA~l\xE95\xA7\xB2.g\xD1e\x89\xC0\x80\xF6\x9F*\x85}\xD6\xF5h_3\xC6D\xED\xECD\xE9\xEDZ\xC4\xDDP \xC4\xEF\x9D2!\xEE\xBD\xA0\x98\xF2\x99G:g\xFF\x9A\xD5+\x8B\xB2(*\xA7Q\xF5\x83\xF9Z\xBE\xACè[\\xED\xBC\xF79[o\xA7\xE7x\x9Cc```f\x80`F\xB0\xF2\xC1| \xCD\x84 \xBE\xC2\xFF\xFF\xF2\xFFC\xA8JF6' $?\xD4Ya\xD3x\x9Cc`f\x83\xFF\xCD F@\x8A\x91+(U\xB9x\x9Ccd`aa`dd\x94/N.\xCA,()\xD6-.M\x82232\xD3JR\xF2\xCB\xF3\xCC \x99\xB4\xF03\xFC\x90f\xFC!\xC3\xF4C\x96\xF9\x87Kc7\xB0\xCA0 \xE3\x97a`\x90a8)(\xC3\xC0!\xC3\xF0Q\x88\x81\xA4A\x8D\xC1\x85!\xC99\xBF\xA0\xB2(3=\xA3DA#YS\xC1\xC8\xC0\xD0L\xC17\xB1$\xC3\xD7G\xC1\xB1\xB88
?93\xB1$3?\xBF\xF5 \x8C L\x8C\x8CJ\xCA\xDD{\xBF\xD7\xEEeܻ\xF7疽\xCC{\xC5~I|\xF8O\x82m\xEF\xEF\xF5\xA2\xDFkn\xF9]\xCB\xCE\xC7\xF7\xABF\xA4[\xB4\x9B\x87 \xAB\xA0R\x97x\x9Cc```d\x82\xCB"\xEA\xF9`Z\xFE\xAE)\x8C7\x9A\x87x\x9Cc`d``\xE0bx\xC0\xA8\xC7\xC0`\xC3z\x87\x88`\x8A\x91\xA6100\xC6\xA1\xCE\xA2L\xC3\xD8Hf\xA0\x88anj\xA2 \xAF\xD96 b@ZH3\x82M`CT\x9E
+\xF301H0\xC8\xE1tD\xA5P\x85
+\x98\xC56"
+\xA3\x91 +V \xE8\xE8
</ins><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="trunkLayoutTestsimportedmathmlinhtml5fontsmathscriptssubscripttopmax4000woff"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/imported/mathml-in-html5/fonts/math/scripts-subscripttopmax4000.woff (0 => 199665)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/imported/mathml-in-html5/fonts/math/scripts-subscripttopmax4000.woff (rev 0)
+++ trunk/LayoutTests/imported/mathml-in-html5/fonts/math/scripts-subscripttopmax4000.woff 2016-04-18 14:45:00 UTC (rev 199665)
</span><span class="lines">@@ -0,0 +1,5 @@
</span><ins>+wOFFOTTO\x88 \x84CFF 8\xC0\xF0w\xAF\xED\xD6FFTM\xF8 yS\xE1\xDAMATHjX OS/2X>`
+\xF0cmap\xE87B+\xC6head*6]\xFBOhhea4$O\xDFhmtx\x80\xD0maxpPPname\x98P3\x9E5\xF2\xE4post \xFF\x863x\x9Cc`d``\xE2/3\xDB\xCE\xC7\xF3\xDB|e\xE0f~a\xB8,\xD7\x99\x86&G\xC2 \x8Cx\x9Cc`d``\xFC\xC2\xF8\x85!\x8A\xF902\xA0&Z<4Px\x9Cc`a~\xC18\x81\x81\x95\x81\x81\xA9\x8BiC\x84f|\xC0`\xC8\xC8e`\xE5d\x80Ft\xD0\xC0\xA0\xC0\xA0\xC0\xF8\x85\xF1 C\x86\xA0 #) x\x9C\xB5\x91\xCFj1ƿ\xAC\xA0\x97R\xE8\xD1\xCB\Z\xF4\xB0\x92]e\x8B\xDED\xF0P\xF4\xEA}]\xC4\xCDA\xB3$\xF4\x95<\xF41\xFA }\x80>B\xE9l6=J)\xC2\xFC\x92\xCC7\x99\x99\xB8\xC5 \x9A\xF1\x80e`\x81 .\x81#\xDC\xE3=p O\xC2n\xA3'\xDEwpQ\xE0.z\x91bOѾ\xE1ݳW\xD5,\x90\xC1\x8E\xF0\x88\xD7\xC0- D\xB8\x8DL\w@\xE2#pY\x94`\x8D
+g\x8E\xA2\xB0C B lSH$\xFCa\x85\x9CoJ\xB6K\xDE\xCD`yj\xF6R\xFE\1 \x80\xB9\xAE\xCEF\xEDJG\xFDb@\xA9L2Z\xE5\xAE\-if\xAD.T\xEE\x94f7˺\xFA\xB5\x8A\x951\xAF#6\xDFN\x9D\xCFiϱOs\xF5\x84-\x8C\xAA\x9C\x8D\xEDqӠ\xD3\xD5>?\x8D\xA5\xAC/\xFF\xE3'\xED\xC2g\xEF\xBC5܃\xAD\xAF|\xC8\xFE\x84)\xAF\xFF\xE5\xDBhSLX1\xE2\xF5\xD5K,\xF4\xC1-\xB4\xD9m) J\x9A\xD2/u\xF1m:\x89Gq\xDD\xCA\xEB\xF4m\xCD\xD5\x8E\xD1\xFC yE\xE2koj\xC0zk,\xFFI\x99 댮\x92\xC6'葜(x\x9Cc```f\x80`F\xB0\xF2\xC1| \xCD\x84 \xBE\xC2\xFF\xFF\xF2\xFFC\xA8JF6' $?\xD4Ya\xD3x\x9Cc`f\x83\xFF\xCD F@\x8A\x91+(U\xB9x\x9Ccd`aa`dd\x94)N.\xCA,()\xD6-.M\x820K\xF2 r+L \x99\xB4\xF03\xFC\x90f\xFC!\xC3\xF4C\x96\xF9\x87Kc7\xB0\xCA0\xEC\xE5\x97a`\x90a8 (\xC3\xC0!\xC3\xF0B\x88\x81\xA4A\x8D\xC1\x91!\xC69\xBF\xA0\xB2(3=\xA3DA#YS\xC1\xC8\xC0\xD0L\xC17\xB1$\xC3\xD7G\xC1\xB1\xB88?93\xB1$3?\x8F\xDD\xF8\x9C\x8C L\x8C\x8CJ\xCA\xDD{\xBF\xD7\xEEeܻ\xF7疽\xCC{\xC5~I|\xF8O\x82m\xEF\xEF\xF5\xA2\xDFkn\x
F9]\xCB\xCE\xC7\xF7\xABF\xA4[\xB4\x9B\x87 \x82GN\xB3x\x9Cc```d\x82\xCB"\xEA\xF9`Z\xFE\xAE)\x8C7\x9A\x87x\x9Cc`d``\xE0bx\xC0\xA8\xC7\xC0`\xC3z\x87+\xE0_\x80]\x9C$0\x8D\x81\x811\x8EuF\xB5`\xC6F2E\xDC;fe`\xF8{ȶa\xE0`\xD2*@\x9Al#\xA2\xF2T\x80\x98\x87A\x88A\x82A\xA7\xAB *E\x80*T\xC0,>\xB0\xB9Q\x8DX\xDA ,\xE8\xE8
</ins><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="trunkLayoutTestsimportedmathmlinhtml5fontsmathscriptssubsuperscriptgapmin11000superscriptbottommaxwithsubscript3000woff"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/imported/mathml-in-html5/fonts/math/scripts-subsuperscriptgapmin11000-superscriptbottommaxwithsubscript3000.woff (0 => 199665)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/imported/mathml-in-html5/fonts/math/scripts-subsuperscriptgapmin11000-superscriptbottommaxwithsubscript3000.woff (rev 0)
+++ trunk/LayoutTests/imported/mathml-in-html5/fonts/math/scripts-subsuperscriptgapmin11000-superscriptbottommaxwithsubscript3000.woff 2016-04-18 14:45:00 UTC (rev 199665)
</span><span class="lines">@@ -0,0 +1,14 @@
</span><ins>+wOFFOTTO\xE8 \x9CCFF t\xDDt\xFC\x9E\xDAFFTMT yS\xE1\xDAMATHpmXD"OS/2X>`
+\xF0cmap$7B+\xC6head*6]\xFBOhhea4$O\xDFhmtx\xE0\xD0maxpPPname\x98\x8A\xC7Ώ0\xA0post\ \xFF\x863x\x9Cc`d``\xE2.\x8E \x93\xE3\xF9m\xBE2p3\xBF\x8A0\\x96\xBFk\x8ALC\x88 \xDD\x9Fx\x9Cc`d``\xFC\xC2\xF8\x85!\x8A\xF902\xA0&Z<4Px\x9Cc`a~\xC18\x81\x81\x95\x81\x81\xA9\x8BiC\x84f|\xC0`\xC8\xC8e`\xE5d\x80Ft\xD0\xC0\xA0\xC0\xA0\xC0\xF8\x85\xF1 C\x86\xA0 #) x\x9C\xDDS1N\xC30}I G\xF0\x82C*'\x95*\xB5 \xAA*\xB5jW\xF64\xAA\xA9\xA3\xD8Ua\xE1=
+\xC7\xE8\xC0'\xE2\xC51\x82\x85 $\xB1l\xBF\xEF\xFF\xFF\xF3\x8B\xFD+\xA0\x8F'\xE8\xBEK,=\xB0B\x8FC\xDC\xCF \x{1D01EF} GX\xF4\x8E \x9F\xE0"\x92 \x9Fb\xBD02\x88\xCEhݺ\xAC8\xA0\xF18\xC4cp\xEBq\xC7\xF0\xDC\xE3\x87\xDE\xC8\xE3\x88\xA8\xEF\xF1)\xD13h\xD4x \x8BB\x81W\xC8q\xCD9\x85D\x82\xD1
+=%\xE7%\xAD) \x9Bf\x94r\xEB\x8Ax \xCCt\xFDШ\xA2\xB4\xE2*\xBF\xA9LFb\x95\xD9r\xB5Sct\xAE2\xAB4\xC3 \xF3\xDA\xDDjf\xC4\xEC;\xAC\xDDXcC\xCFgA\xFE\xAD-\x95$\xD4Ӷ\xF8\x8B\xE85uX6͌\x8A\x99\xF7\xD8\xD3\xD3\xEA~\xDF\xE3#v\xE8\xB9`\xF2F\xD5\xD6\xC4f\xB76\xBBz\xD3tv\x91Օ\xDA&\x89\x942\xFE\xB4\xBC\xD6\xD6\xEA\xAA\xCA\xEE\xF7ʖm\x86[ 2
+\xBF\xFE \xDF\xD5?w\xB7h\xDD\xDCP\xF1\xC6U\xC0\x80\xDC\xF6\xBFuo\x9D\xA6c\xB2\xD9\xDFks\xBD\xB5s\xDD\x91\xA4\x98\x88 \xBA_2\xA5\xE3x\xB7e\xFDk\xF8\xCE\xEB\xE9^\xB4p쉫\x81\xEE\xCCqG\xBEb!e2hO\xE5\xDF \xC5\xA3K)x\x9Cc```f\x80`F\xB0\xF2\xC1| \xCD\x84 \xBE\xC2\xFF\xFF\xF2\xFFC\xA8JF6' $?\xD4Ya\xD3x\x9Cc`f\x83\xFF\xCD F@\x8A\x91+(U\xB9x\x9Ccd`aa`dd\xF4(N.\xCA,()\xD6-.M*.-H-\x82\xF0\xD3 r3\xF3 ++ t\x91\x84\x93\xF2KJ\xF2ss+\xCA3K2@:\xC0\xA2\xC6@U \x8CL \x8C \xDA?\xF8~H3\xFE\x90a\xFA!\xCB\xFCC\x82\xA5\x87\x87\xB1Xe \xF9ed]e8ds\x84\x98A\xD4r\xB68\xE7Te\xA6g\x94(h$k*\x9A)\xF8&\x96d\xF8\xFA(8\xE7'g&\x96d\xE6\xE7Qɝ\xD4\xF2.02012*)w\xEF\xFD^\xBB\x97q\xEFޟ[\xF62\xEF\xFB%\xF1\xFD\xE1? \xB6\xBD\xBF~\xAF\xFD\xB9\xE5w-; ߯\x91n\xD1n .\xD0\xF0\x820x\x9Cc```d\x82\xCB"\xEA\xF9`Z\xFE\xAE)\x8C7\x9A\x87x\x9Cc`d``\xE0bx\xC0\xA8\xC7\xC0`\xC3z\x87\x81$\xA0\x{143041}{\x91\x8A\xA7100\xC6\xA1\xCE\xA2
L\xC3\xD8Hf\xA0\x88anj\xA2 \xAF\xD96 b@ZH3\x82M`CT\x9E
+\xF301H0\xC8\xE1tD\xA5P\x85
+\x98\xC56"
+\xA3\x91 \x99\xE1+b\xE8\xE8
</ins><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="trunkLayoutTestsimportedmathmlinhtml5fontsmathscriptssubsuperscriptgapmin11000woff"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/imported/mathml-in-html5/fonts/math/scripts-subsuperscriptgapmin11000.woff (0 => 199665)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/imported/mathml-in-html5/fonts/math/scripts-subsuperscriptgapmin11000.woff (rev 0)
+++ trunk/LayoutTests/imported/mathml-in-html5/fonts/math/scripts-subsuperscriptgapmin11000.woff 2016-04-18 14:45:00 UTC (rev 199665)
</span><span class="lines">@@ -0,0 +1,10 @@
</span><ins>+wOFFOTTO\x9C \xF4CFF D\xC5T*\xB2\xD0FFTM yS\xE1\xDAMATH(iX8jOS/2X>`
+\xF0cmap\xF47B+\xC6head*6]\xFBOhhea4$O\xDFhmtx\x94\xD0maxpPPname\x98\\x8D-\xA2\xE6post, \xFF\x863x\x9Cc`d``b\x99\xD3\xE5\xE1\xF1\xFC6_\xB8\x99_E.\xCB\xDF5E\xA6\xA1\x80\x83\x81 D_x\x9Cc`d``\xFC\xC2\xF8\x85!\x8A\xF902\xA0&Z<4Px\x9Cc`a~\xC18\x81\x81\x95\x81\x81\xA9\x8BiC\x84f|\xC0`\xC8\xC8e`\xE5d\x80Ft\xD0\xC0\xA0\xC0\xA0\xC0\xF8\x85\xF1 C\x86\xA0 #) x\x9C\xBD\x92\xBFj\xC30\xC6?9\xA0PJ\xD7n
+\xB4% l tHJ\xB2fw\x8C\xB15\xC4\x963\xA4\x8F\xD3\xE8ح\xEFѱ\x8F\xD2ϲ
+]J\xA1\x85X\xC8\xFA\x9Dt\xDF\xF9\xEEdWx\x81@\xFB\xDCa\xE3X`\x80W\xC7 nĥ\xE3 ij\xE3.ޭ\xE3 \xAE\xBD\xDCq\x9F\xFBo\xF4\xDD Z\x8FVհ\xC0\x95c\xDE w\xF0$\xEE w\xB1 \x8E{\x90\xDE\xDAq K\xEF\x84Jh\x9CE!C\x8EC$q\x8D Ĕ\xB4E̓\x9C\xEB\x86\xD6\x86\xA3\xA4\x97\xB2\xFB\x8A\\xABR\x9F*\x95\xE5\xB5 &#\xE1Tn\xE3:\xDFn\xE42Qq\xADJ\xBAꚯi*+|\xCE#\xF6\xF6\xAD\x91\xF2\xE4\xFBy\xC6\xF8Z3 \x99O3`\x92J\xE9\xDA\xF8\xE6\xB87G\x9DV\xAD\x9D\xC5\xFA\xA0\x8A0 \x82\xC6\xE5Q\x8E\xB6\xB6\xD6v\xAD\xA8Omw\xC6TI\xCC9\xFF_S'\xEA \xE7W\xEF\xB1.\x8Bz]VY*\xA3q \xE7\xF2\xD7\xDA\xE9\xCD\xFC\x89\xDF\\xC0\xB9\xBA\xBDs\xB1\xDA?AZ]h\xFB\xD3ֆ e\xBC}\xE1\xB8\xC9\xF1L\x89}\xA9\xB29x\x9Cc```f\x80`F\xB0\xF2\xC1| \xCD\x84 \xBE\xC2\xFF\xFF\xF2\xFFC\xA8JF6' $?\xD4Ya\xD3x\x9Cc`f\x83\xFF\xCD F@\x8A\x91+(U\xB9x\x9Ccd`aa`ddT*N.\xCA,()\xD6-.M*.-H-\x82\xF0\xD3 r3\xF3 ++ \x99\xB4\xF03\xFC\x90f\xFC!\xC3\xF4C\x96\xF9\x87Kc7\xB0\xCA0\x9C\xE7\x97a`\x90a
\xB8$(\xC3\xC0!\xC3\xF0K\x88\x81\xA4A\x8D\xC1\x9D!\xC39\xBF\xA0\xB2(3=\xA3DA#YS\xC1\xC8\xC0\xD0L\xC17\xB1$\xC3\xD7G\xC1\xB1\xB88?93\xB1$3?\x8F\xA0 ;\x98\x80\xBEQ\xEE\xDE\xFB\xBDv/\xE3?\xB7\xECe\xDE+\xF6K\xE2\xFB\xC3l{\xAF\xFD^\xFBs\xCB\xEFZv>\xBE_5"ݢ\xDD<\\xA1\xA9U\xC1x\x9Cc```d\x82\xCB"\xEA\xF9`Z\xFE\xAE)\x8C7\x9A\x87x\x9Cc`d``\xE0bx\xC0\xA8\xC7\xC0`\xC3z\x87\x81$\xA0\xF5\x83\xC5\xD3\xE3\x88PgQ \xA6al$3Pč\xB0cFQ\x86\xBFW\x81l1 \xAD\xA4\xC1&0\x82!*O\x88y\x84$\xE4p\xBA
+\xA2R\xA8B\xCC\xE2\x9B \x85\xD1H\xC6\xC8 \x9F\xE8\xE8
</ins><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="trunkLayoutTestsimportedmathmlinhtml5fontsmathscriptssuperscriptbaselinedropmax10000woff"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/imported/mathml-in-html5/fonts/math/scripts-superscriptbaselinedropmax10000.woff (0 => 199665)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/imported/mathml-in-html5/fonts/math/scripts-superscriptbaselinedropmax10000.woff (rev 0)
+++ trunk/LayoutTests/imported/mathml-in-html5/fonts/math/scripts-superscriptbaselinedropmax10000.woff 2016-04-18 14:45:00 UTC (rev 199665)
</span><span class="lines">@@ -0,0 +1,15 @@
</span><ins>+wOFFOTTO\xB0 \CFF T\xCBA\x8B\xB91FFTM yS\xE1\xDAMATH<jX4\x82OS/2X>`
+\xF0cmap7B+\xC6head*6]\xFBOhhea4$O\xDFhmtx\xA8\xD0maxpPPname\x98i\xE7\xA5Tpost< \xFF\x863x\x9Cc`d``\xE2L\xA7\xB0\xBB\xF1\xFC6_\xB8\x99_E.\xCB\xDF5E\xA6\xA1\x80\x83\x81 D\x97\x88x\x9Cc`d``\xFC\xC2\xF8\x85!\x8A\xF902\xA0&Z<4Px\x9Cc`a~\xC18\x81\x81\x95\x81\x81\xA9\x8BiC\x84f|\xC0`\xC8\xC8e`\xE5d\x80Ft\xD0\xC0\xA0\xC0\xA0\xC0\xF8\x85\xF1 C\x86\xA0 #) x\x9CŒ\xCFj\xC2@ƿ\xC4?\xD0Ki/\xBDv/E-D\x92\x82
+"x\xF5\xE8=\xC6\xD4,h6d#\xE8 \xF4\xD8G)}\x85\xF6|\x8C>E\xBF$[譅\xDCe\x99\xDF\xCC\xCE\xCC\xCE\xCE.\x80K\xBC\xC0B5\xEE03l\xA1\x85w\xC36n\xAD{\xC35\x8C\xAD\x93\xE1:Z\xF6\xA3\xE1\xAE\xECW\xC3M\xB4j\xD7\xF4\xB4\xEAԦeT\xC1\xC8 \xDBx\xC0\x87\xE1\x9E\xAC\xA9\xE1:\xF6\x8D\xE1\x84\xFDl\xB8I\xFB\xC6PHqd\x89+b\xE4h#D\x87҇ }\xD2 wb\xCA\xB54\xA7\xA2\x97,풜c\x95 3\xB9\x89s\xD1;\xC2w\xBD\xBE\x98y<\x9F\x89\x91\xD6*\x94A.\xDD4\xE3\x8A\xD3RFj8\{rD\xDB\xF7\x9D3kZ\xB7\xD4\xCA5w\x8AJw\xB4 X\x95k&t\x98\xC94ާQV)\xAB@G[\x99D\xEBL\xA5\xBB\xE0\xE0\xB9 \xF8\xF39?埔]\xC8K\x99\xB1\x97Q\xD9\xC1.c\x86\\xFF{\xEF*\xA7\x8F3\xF5\xB8\xBE\xDE
+\x95\xE4\x95m"\xE1w]1\xBF\xEC=\xFD\x81\xD3s\x8Ag;\xDF-\xCDՏe\xB4W\xF6\xB0\xBA3\x96\x8C\xE7/\xAE\xEBu\x8B\xAA\xCFV\xEA'n\x82\xCBox\x9Cc```f\x80`F\xB0\xF2\xC1| \xCD\x84 \xBE\xC2\xFF\xFF\xF2\xFFC\xA8JF6' $?\xD4Ya\xD3x\x9Cc`f\x83\xFF\xCD F@\x8A\x91+(U\xB9x\x9Ccd`aa`dd\xD4(N.\xCA,()\xD6-.-H-\x82p\x92\x8BSs2\xF3RS\x8A\xF2 r+ +\x80\x80\x81\x91\x89\x81\x91A\xFB?\xC3i\xC6 2L?d\x99H\xB0\xF4\xF00v\xAB \xC3C~\x86'\x822 2\x8C<B \xCC +j \xBE %\xCE\xF9\x95E\x99\xE9%
+ɚ
+F\x86f
+\xBE\x89%\xBE>
+\x8E\xC5\xC5\xF9ə\x89%\x99\xF9yD\xBA\x83X\xE7##\xA3\x92r\xF7\xDE\xEF\xB5{\xF7\xEE\xFD\xB9e/\xF3^\xB1_\xDF \xFE\x93`\xDB\xFB{\xBD\xE8\xF7ڟ[~ײ\xF3\xF1\xFD\xAA\xE9\xED\xE6\xE1\xE2\ux\x9Cc```d\x82\xCB"\xEA\xF9`Z\xFE\xAE)\x8C7\x9A\x87x\x9Cc`d``\xE0bx\xC0\xA8\xC7\xC0`\xC3z\x87\x81h\xA0.@\xBCZ0\x98\xC6\xC0\xC0G\x84:#\x88Z0+c#\x99\x81"n\x84 3\x8A20\xFC\xBD
+d\xDB0p0\x88i \xCD6\x81 Qy*@\xCC\xC3 \xC4 \xC1 \x87\xD3U\x95"@*` \xD8\\x88(\x8CF\x82ş \xB4\xE8\xE8
</ins><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="trunkLayoutTestsimportedmathmlinhtml5fontsmathscriptssuperscriptbottommin8000woff"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/imported/mathml-in-html5/fonts/math/scripts-superscriptbottommin8000.woff (0 => 199665)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/imported/mathml-in-html5/fonts/math/scripts-superscriptbottommin8000.woff (rev 0)
+++ trunk/LayoutTests/imported/mathml-in-html5/fonts/math/scripts-superscriptbottommin8000.woff 2016-04-18 14:45:00 UTC (rev 199665)
</span><span class="lines">@@ -0,0 +1,6 @@
</span><ins>+wOFFOTTO\x98 \xE0CFF @\xC5\xFFN٤\xE1FFTM yS\xE1\xDAMATH$jX,\xB2OS/2X>`
+\xF0cmap\xF07B+\xC6head*6]\xFBOhhea4$O\xDFhmtx\x90\xD0maxpPPname\x98W~%%\xF9,post( \xFF\x863x\x9Cc`d``b\x8B\xD4W\xD3\xE3\xF9m\xBE2p3\xBF\x8A0\\x96\xBFk\x8ALC\x88$\x9E\xC8x\x9Cc`d``\xFC\xC2\xF8\x85!\x8A\xF902\xA0&Z<4Px\x9Cc`a~\xC18\x81\x81\x95\x81\x81\xA9\x8BiC\x84f|\xC0`\xC8\xC8e`\xE5d\x80Ft\xD0\xC0\xA0\xC0\xA0\xC0\xF8\x85\xF1 C\x86\xA0 #) x\x9C\xBD\x91\xBFj\xC30\xC6?9J\x97ұݴ\x92\xC1\xC1v $\xA1CB CI\xD6L]cb+\x8E\x8C\xA5@\xF3*}\x88v體\xBEN?\xCB*t)\xA5\xE2C\xDCO\xD2\xDD\xE7\xBB\x80+\xBC@\xA0\xF9\xEE\xB0\xF2, \xF1\xE69\xC0\x8D\xB8\xF0\xDC½x\xF6܆ n=wp <z\xEE\xF2\xFC\x95\x91\xA2}\xC9݃˪Y`\x86\xCAs\x80\xEF\x9E[x\xD2s3\xF1\xE1\xB9C\x9D\xA9\xE7.fA\x814J\x9C\xA8\xA2\xB0G\xCB*{HѧO\xA8cDZc˛\x9C~\xC5\xDD \x86\xA6\xA5ܹ" \x80\x85.O\x95\xDA\xE7V\xF6ҾL\xA2x$\xD7[\x9B\xAFWrn\x8CN\xD5\xD6*\xCD0ü\xFAo%3+B\xAE#9\xE3\xD9\xF7\x9B 5-M
\xA3\xA0)\xEA\x8FYMm0i\xA5JkBs,\xB3\xAA\xD9촵\xBA(\xD4a Euğ%\x94Z\xBAެ\xF3'\x94\xB9\xB9 \x98$1\xE5\xFAo7\x8DJ\x82 s\x87\_3\xC7R \xECRW\xFBL&\x83HN\xE5o]3$\x99\x84ð\x9E\xFBY\x86\xBC\xF1r\xCD\xEBK\x97\xBB\xC94}a\xC3D\xBE\xB8\x8C\xA2xPx\x8E\xAA> \xB0\xE6x\x9Cc```f\x80`F\xB0\xF2\xC1| \xCD\x84 \xBE\xC2\xFF\xFF\xF2\xFFC\xA8JF6' $?\xD4Ya\xD3x\x9Cc`f\x83\xFF\xCD F@\x8A\x91+(U\xB9x\x9Ccd`aa`ddT,N.\xCA,()\xD6-.-H-\x82p\x92\xF2KJ\xF2ss3\xF3, \x99\xB4\xF03\xFC\x90f\xFC!\xC3\xF4C\x96\xF9\x87Kc7\xB0\xCA0\x9C\xE1\x97a`\x90a8/(\xC3\xC0!\xC3\xF0]\x88\x81\xA4A\x8D\xC1\x8D!\xCD9\xBF\xA0\xB2(3=\xA3DA#YS\xC1\xC8\xC0\xD0L\xC17\xB1$\xC3\xD7G\xC1\xB1\xB88?93\xB1$3?\x8F\x90:\x98\x95\x94\xBB\xF7~\xAF\xDD˸w\xEF\xCF-{\x99\xF7\x8A\xFD\x92\xF8\xFE\xF0\x9F\xDB\xDE\xDF\xEBE\xBF\xD7\xFE\xDC\x8F\xEFW\x8DH\xB7h7\xFC\xACUox\x9Cc```d\x82\xCB"\xEA\xF9`Z\xFE\xAE)\x8C7\x9A\x87x\x9Cc`d``\xE0bx\xC0\xA8\xC7\xC0`\xC3z\x87\x81(
\xEF@\x9C:0\x8D\x81\x811\x8EuF\xB5`\xC6F2E\xDC;fe`\xF8{ȶa\xE0`\xD2*@\x9Al#\xA2\xF2T\x80\x98\x87A\x88A\x82A\xA7\xAB *E\x80*T\xC0,>\xB0\xB9Q\x8D\xF3\x9B \xDC\xE8\xE8
</ins><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="trunkLayoutTestsimportedmathmlinhtml5fontsmathscriptssuperscriptshiftup7000woff"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/imported/mathml-in-html5/fonts/math/scripts-superscriptshiftup7000.woff (0 => 199665)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/imported/mathml-in-html5/fonts/math/scripts-superscriptshiftup7000.woff (rev 0)
+++ trunk/LayoutTests/imported/mathml-in-html5/fonts/math/scripts-superscriptshiftup7000.woff 2016-04-18 14:45:00 UTC (rev 199665)
</span><span class="lines">@@ -0,0 +1,9 @@
</span><ins>+wOFFOTTO\x90 \xBCCFF <\xC2\xF9~3EFFTM yS\xE1\xDAMATH jX(\xCAOS/2X>`
+\xF0cmap\xEC7B+\xC6head*6]\xFBOhhea4$O\xDFhmtx\x88\xD0maxpPPname\x98S`\xB8\xAE\xCD\xF4post$ \xFF\x863x\x9Cc`d``\xE2M \x93\xFE\xC7\xF3\xDB|e\xE0f~a\xB8,\xD7\x99\x86&?. ^x\x9Cc`d``\xFC\xC2\xF8\x85!\x8A\xF902\xA0&Z<4Px\x9Cc`a~\xC18\x81\x81\x95\x81\x81\xA9\x8BiC\x84f|\xC0`\xC8\xC8e`\xE5d\x80Ft\xD0\xC0\xA0\xC0\xA0\xC0\xF8\x85\xF1 C\x86\xA0 #) x\x9C\xB5\x91\xBFj\xC30\xC6?9\xA0K\xE9P:Q($Pہ\x84\x84,!!CI\xC6fƉ\xB5D\xC6R\x86\xBCBG\xE9Kt\xEE\xFA\xC9V\x87-\x94 q\xBF\xD3\xDDw֝\\xE2\xF5w\x87\x95g\x81^=\xB8\xC1\x87\xE7&\xE2\xC9s\x9D\xA0ṅ\xAB`\xE1\xB9\xCD\xF3gf\x8A\xE6\xBD\x87J\xE5X`\x8A\xD2s\x80{\xBC{n\xC0\x8Ak\xCFMLś\xE7dp빍i\xF0\x8894
+\x9CXEa\x8F ]\xA4\xE8\xD1&\x88cHZc\xCBHN\xBB\xA27\x83\xE1\xD2\xCCRչ" \x80\xB9.N\xA5\xDA\xE7VvӞL\xA2x(\xD7[\x9B\xAFWrf\x8CN\xD5\xD6*\xCD4C\x9D\xFB[A\xA5A\xC8}$g<\xFB \xC9I;\x92\x8B\x8Ex\xB7`\xD2Rք\xE6Xd\xA5wr\xB5\xB3\xC7bE.\xFE\xA7b?YV\xFD\xD8ʖ\x9CJV͢O\x89Ą\xFB? \xD4\x8C\xA9p\xCDK}\xB0K]\xEE3\x99\xF4#9\x91\xBFwʄd B7\xE53\x8Ft\xE3 կ,+Q\M\xA3\xEE\xCA\xF8\xB22\x8A⾻\xDAy\xEF\xF3 9k\xA8\xA5x\x9Cc```f\x80`F\xB0\xF2\xC1| \xCD\x84 \xBE\xC2\xFF\xFF\xF2\xFFC\xA8JF6' $?\xD4Ya\xD3x\x9Cc`f\x83\xFF\xCD F@\x8A\x91+(U\xB9x\x9Ccd`aa`dd\x94/N.\xCA,()\xD6-.-H-\x82r22\xD3JJ \xCC+ \x99\xB4\xF03\xFC\x90f\xFC!\xC3\xF4C\x96\xF9\x87Kc7\xB0\xCA0 \xE3\x97a`\x90a8)(\xC3\xC0!\xC3\xF0Q\x88\x81\xA4A\x8D\xC1\x85!\xC99\xBF\xA0\xB2(3=\xA3DA#YS\xC1\xC8\xC0\xD0L\xC17\xB1$\xC3\xD7G\xC1\xB1\xB88?93\xB1$3?\xBF\xF5 \x8C L\x8C\x8CJ\xCA\xDD{\xBF\xD7\xEEeܻ\xF7疽\xCC{\xC5~I|\xF8O\x82m\xEF\xEF\xF5\xA2\xDFkn\xF9]\xCB\xCE\xC7\xF7\xABF\x
A4[\xB4\x9B\x87 \xC8xR\xD0x\x9Cc```d\x82\xCB"\xEA\xF9`Z\xFE\xAE)\x8C7\x9A\x87x\x9Cc`d``\xE0bx\xC0\xA8\xC7\xC0`\xC3z\x87/\x90\x8E\xC0/\x8FLc``\x8C#B\x9DD-\x98\x86\xB1\x91\xCC@7E\xFE^\xB2m8Ā\xB4
+\x90f\x9B\xC0\x86\xA8< \xE6ab\x90`\x90\xC3\xE9*\x88J\xA0
+0\x8Bl.DF#A+\xD2 \xF0\xE8\xE8
</ins><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="trunkLayoutTestsimportedmathmlinhtml5fontsmathscriptssuperscriptshiftupcramped5000woff"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/imported/mathml-in-html5/fonts/math/scripts-superscriptshiftupcramped5000.woff (0 => 199665)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/imported/mathml-in-html5/fonts/math/scripts-superscriptshiftupcramped5000.woff (rev 0)
+++ trunk/LayoutTests/imported/mathml-in-html5/fonts/math/scripts-superscriptshiftupcramped5000.woff 2016-04-18 14:45:00 UTC (rev 199665)
</span><span class="lines">@@ -0,0 +1,8 @@
</span><ins>+wOFFOTTO\xA8 <CFF L\xC9δ4GFFTM yS\xE1\xDAMATH4jX \xFAOS/2X>`
+\xF0cmap\xFC7B+\xC6head*6]\xFBOhhea4$O\xDFhmtx\xA0\xD0maxpPPname\x98bɟN~`post4 \xFF\x863x\x9Cc`d``b\x97\xF8k\x8D\xF1\xFC6_\xB8\x99_E.\xCB\xDF5E\xA6\xA1\x80\x83\x81 D \x96\xA4x\x9Cc`d``\xFC\xC2\xF8\x85!\x8A\xF902\xA0&Z<4Px\x9Cc`a~\xC18\x81\x81\x95\x81\x81\xA9\x8BiC\x84f|\xC0`\xC8\xC8e`\xE5d\x80Ft\xD0\xC0\xA0\xC0\xA0\xC0\xF8\x85\xF1 C\x86\xA0 #) x\x9CŒ\xB1j\xC30\x86;N\xA0K\xE9 \xB4\x92\xC1\xC1vH
+!\x90!$\xD0)\xBBq\x9CXCbc)\x85\xAC}\x8A\xBEB\x97>B\x87>K_\xA1{\xC9\xEAХZ\x88\x84\xB8\xEFNw'\xE9N\xAE\xF1\xCD\xE8b\xE5\xD8#\xBF:\xF6q\xEB \xC7-̼7\xC7\xBA\xFE\xBD\xE36n\xFC'\xC7 \xDA?\xE8\xE9WԖ6ʰG\xAE \xFB\x98\xE2\xDDq \x8Fޝ\xE3K?p܆\xF0 wh\xC6 %*\x9C\x99Eb\x8F=d\xE8S&\x88cLZ#\xE5NA\xB9\xA26\x83\xE2,\xE9%\xAD]\x92\x8F\xC0\xBC\xACε\xDCZ\xF4\xB2\xBEH\xA2x,֩.\xD6+1S\xAA\xCCd\xAAeI7\xC58sZ\xC5H\x85\x90\xEBD\xCEi\xFB\xBES\x90v$\xB3k\xEC)\xD6o\x8B\xEFe&TV\xCBJ\xABP\x9D\xAA\xBCvJ!w\xFATeuz\xA8\xF2\xED(\x8A\x8C\xDB N\xF89\xF3¾\[Y\xB3~\xB9\xADڀ\x91\x82\xDD\xFF\xF8\xD6&_\x82 \xB3 \xB9\xBEz\x83Eyԋ\xB2\xDE\xE7"Db*~U\xFA%\x93p\x9A&]\xA2#\x97\xBD\xF99\xC2\xC6ƶn\xCD[\xB1a4\x8B\x88\xA2x`\xEE{\x81K~D\xC6&x\x9Cc```f\x80`F\xB0\xF2\xC1| \xCD\x84 \xBE\xC2\xFF\xFF\xF2\xFFC\xA8JF6' $?\xD4Ya\xD3x\x9Cc`f\x83\xFF\xCD F@\x8A\x91+(U\xB9x\x9Ccd`aa`ddT+N.\xCA,()\xD6-.-H-\x82r22\xD3JJ \x92\x8Bs RSL+ \x99\
xB4\xF03\xFC\x90f\xFC!\xC3\xF4C\x96\xF9\x87Kc7\xB0\xCA0\xDC\xE6\x97a`\x90a\xB8'(\xC3\xC0!\xC3\xC8&\xC4\xC0 Ҡ\xC6\xE0\xCDP\xE0\x9C_PY\x94\x99\x9EQ\xA2\xA0\x91\xAC\xA9`d`h\xA6\xE0\x9BX\x92\xE1\xEB\xA3\xE0X\\x9C\x9F\x9C\x99X\x92\x99\x9FG\x94+\x88s*02012*)w\xEF\xFD^\xBB\x97q\xEFޟ[\xF62\xEF\xFB%\xF1\xFD\xE1? \xB6\xBD\xBF~\xAF\xFD\xB9\xE5w-; ߯\x91n\xD1n .\xF2\xB6Z\xBAx\x9Cc```d\x82\xCB"\xEA\xF9`Z\xFE\xAE)\x8C7\x9A\x87x\x9Cc`d``\xE0bx\xC0\xA8\xC7\xC0`\xC3z\x87\x81 \xEE \xAC+\x98\xC6\xC0\xC0G\x84:#\x88Z0+c#\x99\x81"n\x84 3\x8A20\xFC\xBD
+d\xDB0p0\x88i \xCD6\x81 Qy*@\xCC\xC3 \xC4 \xC1 \x87\xD3U\x95"@*` \xD8\\x88(\x8CF\x829\xC6 \xE8\xE8
</ins><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="trunkLayoutTestsimportedmathmlinhtml5mathmlpresentationmarkupscriptssubsupparameters1expectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/imported/mathml-in-html5/mathml/presentation-markup/scripts/subsup-parameters-1-expected.txt (0 => 199665)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/imported/mathml-in-html5/mathml/presentation-markup/scripts/subsup-parameters-1-expected.txt (rev 0)
+++ trunk/LayoutTests/imported/mathml-in-html5/mathml/presentation-markup/scripts/subsup-parameters-1-expected.txt 2016-04-18 14:45:00 UTC (rev 199665)
</span><span class="lines">@@ -0,0 +1,24 @@
</span><ins>+
+
+
+
+
+
+
+
+
+
+
+
+
+
+PASS SpaceAfterScript
+PASS SuperscriptShiftUp
+PASS SubscriptShiftDown
+PASS SubSuperscriptGapMin
+PASS SuperscriptBottomMaxWithSubscript
+PASS SubscriptTopMax
+PASS SuperscriptBottomMin
+PASS SubscriptBaselineDrop
+PASS SuperscriptBaselineDrop
+
</ins><span class="cx">Property changes on: trunk/LayoutTests/imported/mathml-in-html5/mathml/presentation-markup/scripts/subsup-parameters-1-expected.txt
</span><span class="cx">___________________________________________________________________
</span></span></pre></div>
<a id="svneolstyle"></a>
<div class="addfile"><h4>Added: svn:eol-style</h4></div>
<a id="trunkLayoutTestsimportedmathmlinhtml5mathmlpresentationmarkupscriptssubsupparameters1html"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/imported/mathml-in-html5/mathml/presentation-markup/scripts/subsup-parameters-1.html (0 => 199665)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/imported/mathml-in-html5/mathml/presentation-markup/scripts/subsup-parameters-1.html (rev 0)
+++ trunk/LayoutTests/imported/mathml-in-html5/mathml/presentation-markup/scripts/subsup-parameters-1.html 2016-04-18 14:45:00 UTC (rev 199665)
</span><span class="lines">@@ -0,0 +1,338 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<head>
+<meta charset="utf-8">
+<title>Subscripts and Superscripts parameters</title>
+<link rel="help" href="http://www.mathml-association.org/MathMLinHTML5/S3.html#SS4">
+<meta name="assert" content="Elements msub, msup, subsup and msubsup correctly use the subscript and superscript parameters from the MATH table.">
+<script src="../../../../../resources/testharness.js"></script>
+<script src="../../../../../resources/testharnessreport.js"></script>
+<style>
+ math, mspace {
+ font-size: 10px;
+ }
+ @font-face {
+ font-family: spaceafterscript3000;
+ src: url("../../../fonts/math/scripts-spaceafterscript3000.woff");
+ }
+ @font-face {
+ font-family: superscriptshiftup7000;
+ src: url("../../../fonts/math/scripts-superscriptshiftup7000.woff");
+ }
+ @font-face {
+ font-family: superscriptshiftupcramped5000;
+ src: url("../../../fonts/math/scripts-superscriptshiftupcramped5000.woff");
+ }
+ @font-face {
+ font-family: subscriptshiftdown6000;
+ src: url("../../../fonts/math/scripts-subscriptshiftdown6000.woff");
+ }
+ @font-face {
+ font-family: subsuperscriptgapmin11000;
+ src: url("../../../fonts/math/scripts-subsuperscriptgapmin11000.woff");
+ }
+ @font-face {
+ font-family: subsuperscriptgapmin11000superscriptbottommaxwithsubscript3000;
+ src: url("../../../fonts/math/scripts-subsuperscriptgapmin11000-superscriptbottommaxwithsubscript3000.woff");
+ }
+ @font-face {
+ font-family: subscripttopmax4000;
+ src: url("../../../fonts/math/scripts-subscripttopmax4000.woff");
+ }
+ @font-face {
+ font-family: superscriptbottommin8000;
+ src: url("../../../fonts/math/scripts-superscriptbottommin8000.woff");
+ }
+ @font-face {
+ font-family: subscriptbaselinedropmin9000;
+ src: url("../../../fonts/math/scripts-subscriptbaselinedropmin9000.woff");
+ }
+ @font-face {
+ font-family: superscriptbaselinedropmax10000;
+ src: url("../../../fonts/math/scripts-superscriptbaselinedropmax10000.woff");
+ }
+</style>
+<script>
+ var emToPx = 10 / 1000; // font-size: 10px, font.em = 1000
+ var epsilon = 1;
+
+ function getBox(aId) {
+ return document.getElementById(aId).getBoundingClientRect();
+ }
+
+ setup({ "explicit_done": true });
+ window.addEventListener("load", function() {
+ document.fonts.ready.then(function() {
+ window.setTimeout(runTests, 250);
+ });
+ });
+
+ function runTests() {
+ test(function() {
+ var v = 3000 * emToPx;
+ assert_approx_equals(getBox("ref001").left - getBox("sub001").right, v, epsilon, "msub: Space after subscript");
+ assert_approx_equals(getBox("ref002").left - getBox("sup002").right, v, epsilon, "msup: Space after superscript");
+ assert_approx_equals(getBox("ref003").left - getBox("sup003").right, v, epsilon, "msubsup: Space after superscript");
+ assert_approx_equals(getBox("sup0042").left - getBox("sup0041").right, v, epsilon, "mmultiscripts: Space after first superscript");
+ assert_approx_equals(getBox("sup0043").left - getBox("sup0042").right, v, epsilon, "mmultiscripts: Space after second superscript");
+ assert_approx_equals(getBox("ref004").left - getBox("sup0043").right, v, epsilon, "mmultiscripts: Space after last superscript");
+ }, "SpaceAfterScript");
+
+ test(function() {
+ var v = 7000 * emToPx;
+ assert_approx_equals(getBox("ref101").bottom - getBox("sup102").bottom, v, epsilon, "msup: Superscript shift");
+ assert_approx_equals(getBox("ref101").bottom - getBox("sup103").bottom, v, epsilon, "msubsup: Superscript shift");
+ assert_approx_equals(getBox("ref101").bottom - getBox("sup1041").bottom, v, epsilon, "mmultiscripts: First superscript shift");
+ assert_approx_equals(getBox("ref101").bottom - getBox("sup1042").bottom, v, epsilon, "mmultiscripts: Second superscript shift");
+ assert_approx_equals(getBox("ref101").bottom - getBox("sup1043").bottom, v, epsilon, "mmultiscripts: Last superscript shift");
+ }, "SuperscriptShiftUp");
+
+ /* FIXME: We do not support SuperscriptShiftUpCramped yet.
+ See http://webkit.org/b/156401
+ test(function() {
+ var v = 5000 * emToPx;
+ assert_approx_equals(getBox("ref201").bottom - getBox("sup202").bottom, v, epsilon, "msup: Superscript shift");
+ assert_approx_equals(getBox("ref201").bottom - getBox("sup203").bottom, v, epsilon, "msubsup: Superscript shift");
+ assert_approx_equals(getBox("ref201").bottom - getBox("sup2041").bottom, v, epsilon, "mmultiscripts: First superscript shift");
+ assert_approx_equals(getBox("ref201").bottom - getBox("sup2042").bottom, v, epsilon, "mmultiscripts: Second superscript shift");
+ assert_approx_equals(getBox("ref201").bottom - getBox("sup2043").bottom, v, epsilon, "mmultiscripts: Last superscript shift");
+ }, "SuperscriptShiftUpCramped"); */
+
+ test(function() {
+ var v = 6000 * emToPx;
+ assert_approx_equals(getBox("sub301").bottom - getBox("ref300").bottom, v, epsilon, "msup: Subscript shift");
+ assert_approx_equals(getBox("sub302").bottom - getBox("ref300").bottom, v, epsilon, "msubsup: Subscript shift");
+ assert_approx_equals(getBox("sub303").bottom - getBox("ref300").bottom, v, epsilon, "mmultiscripts: First subscript shift");
+ assert_approx_equals(getBox("sub304").bottom - getBox("ref300").bottom, v, epsilon, "mmultiscripts: Second subscript shift");
+ }, "SubscriptShiftDown");
+
+ test(function() {
+ var v = 11000 * emToPx;
+ assert_approx_equals(getBox("sub4011").top - getBox("sup4012").bottom, v, epsilon, "msubsup: SubSuperscript gap");
+ assert_approx_equals(getBox("sub4021").top - getBox("sup4022").bottom, v, epsilon, "mmultiscripts: SubSuperscript gap");
+ }, "SubSuperscriptGapMin");
+
+ test(function() {
+ var v1 = 11000 * emToPx;
+ var v2 = 3000 * emToPx;
+ assert_approx_equals(getBox("sub501").top - getBox("sup501").bottom, v1, epsilon, "msubsup: SubSuperscript gap");
+ assert_approx_equals(getBox("ref500").bottom - getBox("sup501").bottom, v2, epsilon, "msubsup: Superscript bottom");
+ assert_approx_equals(getBox("sub502").top - getBox("sup502").bottom, v1, epsilon, "mmultiscripts: SubSuperscript gap");
+ assert_approx_equals(getBox("ref500").bottom - getBox("sup502").bottom, v2, epsilon, "mmultiscripts: Superscript bottom");
+ }, "SuperscriptBottomMaxWithSubscript");
+
+ test(function() {
+ var v = 4000 * emToPx;
+ assert_approx_equals(getBox("ref600").bottom - getBox("sub601").top, v, epsilon, "msub: Subscript top");
+ }, "SubscriptTopMax");
+
+ test(function() {
+ var v = 8000 * emToPx;
+ assert_approx_equals(getBox("ref700").bottom - getBox("sub701").bottom, v, epsilon, "msub: Superscript bottom");
+ }, "SuperscriptBottomMin");
+
+ test(function() {
+ var v = 9000 * emToPx;
+ assert_approx_equals(getBox("sub801").bottom - getBox("base801").bottom, v, epsilon, "msub: Superscript drop");
+ }, "SubscriptBaselineDrop");
+
+ test(function() {
+ var v = 10000 * emToPx;
+ assert_approx_equals(getBox("sup901").bottom - getBox("base901").top, v, epsilon, "msup: Superscript drop");
+ }, "SuperscriptBaselineDrop");
+
+ done();
+ }
+</script>
+</head>
+<body>
+ <p>
+ <math style="font-family: spaceafterscript3000;">
+ <msub>
+ <mspace height="2em" width="2em" mathbackground="blue"/>
+ <mspace id="sub001" height="1em" width="1em" mathbackground="red"/>
+ </msub>
+ <mspace id="ref001" height="1em" width="1em" mathbackground="green"/>
+ </math>
+ <math style="font-family: spaceafterscript3000;">
+ <msup>
+ <mspace height="2em" width="2em" mathbackground="blue"/>
+ <mspace id="sup002" height="1em" width="1em" mathbackground="red"/>
+ </msup>
+ <mspace id="ref002" height="1em" width="1em" mathbackground="green"/>
+ </math>
+ <math style="font-family: spaceafterscript3000;">
+ <msubsup>
+ <mspace height="2em" width="2em" mathbackground="blue"/>
+ <mspace/>
+ <mspace id="sup003" height="1em" width="1em" mathbackground="red"/>
+ </msubsup>
+ <mspace id="ref003" height="1em" width="1em" mathbackground="green"/>
+ </math>
+ <math style="font-family: spaceafterscript3000;">
+ <mmultiscripts>
+ <mspace height="2em" width="2em" mathbackground="blue"/>
+ <none/>
+ <mspace id="sup0041" height="1em" width="1em" mathbackground="red"/>
+ <none/>
+ <mspace id="sup0042" height="1em" width="1em" mathbackground="red"/>
+ <none/>
+ <mspace id="sup0043" height="1em" width="1em" mathbackground="red"/>
+ </mmultiscripts>
+ <mspace id="ref004" height="1em" width="1em" mathbackground="green"/>
+ </math>
+ </p>
+ <hr/>
+ <p>
+ <math style="font-family: superscriptshiftup7000;">
+ <mspace id="ref101" height="1em" width="1em" mathbackground="green"/>
+ <msup>
+ <mspace height="2em" width="2em" mathbackground="blue"/>
+ <mspace id="sup102" height="1em" width="1em" mathbackground="red"/>
+ </msup>
+ <msubsup>
+ <mspace height="2em" width="2em" mathbackground="blue"/>
+ <mspace height="1em" width="1em" mathbackground="red"/>
+ <mspace id="sup103" height="1em" width="1em" mathbackground="red"/>
+ </msubsup>
+ <mmultiscripts>
+ <mspace height="2em" width="2em" mathbackground="blue"/>
+ <none/>
+ <mspace id="sup1041" height="1em" width="1em" mathbackground="red"/>
+ <none/>
+ <mspace id="sup1042" height="1em" width="1em" mathbackground="red"/>
+ <none/>
+ <mspace id="sup1043" height="1em" width="1em" mathbackground="red"/>
+ </mmultiscripts>
+ </math>
+ </p>
+ <hr/>
+ <p>
+ <math style="font-family: superscriptshiftupcramped5000;">
+ <msqrt>
+ <mspace id="ref201" height="1em" width="1em" mathbackground="green"/>
+ <msup>
+ <mspace height="2em" width="2em" mathbackground="blue"/>
+ <mspace id="sup202" height="1em" width="1em" mathbackground="red"/>
+ </msup>
+ <msubsup>
+ <mspace height="2em" width="2em" mathbackground="blue"/>
+ <mspace height="1em" width="1em" mathbackground="blue"/>
+ <mspace id="sup203" height="1em" width="1em" mathbackground="red"/>
+ </msubsup>
+ <mmultiscripts>
+ <mspace height="2em" width="2em" mathbackground="blue"/>
+ <none/>
+ <mspace id="sup2041" height="1em" width="1em" mathbackground="red"/>
+ <none/>
+ <mspace id="sup2042" height="1em" width="1em" mathbackground="red"/>
+ <none/>
+ <mspace id="sup2043" height="1em" width="1em" mathbackground="red"/>
+ </mmultiscripts>
+ </msqrt>
+ </math>
+ </p>
+ <hr/>
+ <p>
+ <math style="font-family: subscriptshiftdown6000;">
+ <mspace id="ref300" height="1em" width="1em" mathbackground="green"/>
+ <msub>
+ <mspace height="2em" width="2em" mathbackground="blue"/>
+ <mspace id="sub301" height="1em" width="1em" mathbackground="red"/>
+ </msub>
+ <msubsup>
+ <mspace height="2em" width="2em" mathbackground="blue"/>
+ <mspace id="sub302" height="1em" width="1em" mathbackground="red"/>
+ <mspace height="1em" width="1em" mathbackground="blue"/>
+ </msubsup>
+ <mmultiscripts>
+ <mspace height="2em" width="2em" mathbackground="blue"/>
+ <mspace id="sub303" height="1em" width="1em" mathbackground="red"/>
+ <none/>
+ <mspace id="sub304" height="1em" width="1em" mathbackground="red"/>
+ <none/>
+ </mmultiscripts>
+ </math>
+ </p>
+ <hr/>
+ <p>
+ <math style="font-family: subsuperscriptgapmin11000;">
+ <msubsup>
+ <mspace height="2em" width="2em" mathbackground="blue"/>
+ <mspace id="sub4011" height="1em" width="1em" mathbackground="red"/>
+ <mspace id="sup4012" height="1em" width="1em" mathbackground="red"/>
+ </msubsup>
+ <mmultiscripts>
+ <mspace height="2em" width="2em" mathbackground="blue"/>
+ <none/>
+ <none/>
+ <mspace id="sub4021" height="1em" width="1em" mathbackground="red"/>
+ <mspace id="sup4022" height="1em" width="1em" mathbackground="red"/>
+ </mmultiscripts>
+ </math>
+ </p>
+ <hr/>
+ <p>
+ <math style="font-family: subsuperscriptgapmin11000superscriptbottommaxwithsubscript3000;">
+ <mspace id="ref500" height="1em" width="1em" mathbackground="green"/>
+ <msubsup>
+ <mspace height="2em" width="2em" mathbackground="blue"/>
+ <mspace id="sub501" height="1em" width="1em" mathbackground="red"/>
+ <mspace id="sup501" height="1em" width="1em" mathbackground="red"/>
+ </msubsup>
+ <mmultiscripts>
+ <mspace height="2em" width="2em" mathbackground="blue"/>
+ <none/>
+ <none/>
+ <mspace id="sub502" height="1em" width="1em" mathbackground="red"/>
+ <mspace id="sup502" height="1em" width="1em" mathbackground="red"/>
+ </mmultiscripts>
+ </math>
+ </p>
+ <hr/>
+ <p>
+ <math style="font-family: subscripttopmax4000;">
+ <mspace id="ref600" height="1em"
+ width="1em" mathbackground="green"/>
+ <msub>
+ <mspace height="2em" width="2em" mathbackground="blue"/>
+ <mspace id="sub601" height="10em"
+ width="1em" mathbackground="red"/>
+ </msub>
+ </math>
+ </p>
+ <hr/>
+ <p>
+ <math style="font-family: superscriptbottommin8000;">
+ <mspace id="ref700" height="1em"
+ width="1em" mathbackground="green"/>
+ <msup>
+ <mspace height="2em" width="2em" mathbackground="blue"/>
+ <mspace id="sub701" depth="1em"
+ width="1em" mathbackground="red"/>
+ </msup>
+ </math>
+ </p>
+ <hr/>
+ <p>
+ <math style="font-family: subscriptbaselinedropmin9000;">
+ <msub>
+ <mspace id="base801" height="2em" width="2em" mathbackground="blue"/>
+ <mspace id="sub801" height="1em"
+ width="1em" mathbackground="red"/>
+ </msub>
+ </math>
+ </p>
+ <hr/>
+ <p>
+ <math style="font-family: superscriptbaselinedropmax10000;">
+ <msup>
+ <mspace id="base901" height="15em" width="2em" mathbackground="blue"/>
+ <mspace id="sup901" height="1em"
+ width="1em" mathbackground="red"/>
+ </msup>
+ </math>
+ </p>
+ <hr/>
+</body>
+</html>
</ins><span class="cx">Property changes on: trunk/LayoutTests/imported/mathml-in-html5/mathml/presentation-markup/scripts/subsup-parameters-1.html
</span><span class="cx">___________________________________________________________________
</span></span></pre></div>
<a id="svnmimetype"></a>
<div class="addfile"><h4>Added: svn:mime-type</h4></div>
<a id="svneolstyle"></a>
<div class="addfile"><h4>Added: svn:eol-style</h4></div>
<a id="trunkLayoutTestsmathmlmsubsupfuzzexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/mathml/msubsup-fuzz-expected.txt (199664 => 199665)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/mathml/msubsup-fuzz-expected.txt 2016-04-18 10:36:29 UTC (rev 199664)
+++ trunk/LayoutTests/mathml/msubsup-fuzz-expected.txt 2016-04-18 14:45:00 UTC (rev 199665)
</span><span class="lines">@@ -1,4 +1,3 @@
</span><span class="cx"> This test passes if it does not crash.
</span><span class="cx">
</span><del>-3
</del><span class="cx">
</span></span></pre></div>
<a id="trunkLayoutTestsmathmlopentypelargeoperatorsitaliccorrectionexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/mathml/opentype/large-operators-italic-correction-expected.txt (0 => 199665)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/mathml/opentype/large-operators-italic-correction-expected.txt (rev 0)
+++ trunk/LayoutTests/mathml/opentype/large-operators-italic-correction-expected.txt 2016-04-18 14:45:00 UTC (rev 199665)
</span><span class="lines">@@ -0,0 +1,5 @@
</span><ins>+This test passes if the difference of horizontal positions between the subscript and superscript corresponds to the italic correction of the integral operator.
+
+
+PASS Large Operators Italic Correction
+
</ins><span class="cx">Property changes on: trunk/LayoutTests/mathml/opentype/large-operators-italic-correction-expected.txt
</span><span class="cx">___________________________________________________________________
</span></span></pre></div>
<a id="svneolstyle"></a>
<div class="addfile"><h4>Added: svn:eol-style</h4></div>
<a id="trunkLayoutTestsmathmlopentypelargeoperatorsitaliccorrectionhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/mathml/opentype/large-operators-italic-correction.html (0 => 199665)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/mathml/opentype/large-operators-italic-correction.html (rev 0)
+++ trunk/LayoutTests/mathml/opentype/large-operators-italic-correction.html 2016-04-18 14:45:00 UTC (rev 199665)
</span><span class="lines">@@ -0,0 +1,42 @@
</span><ins>+<!DOCTYPE html>
+<html>
+ <head>
+ <title>Large Operators Italic Correction</title>
+ <meta charset="utf-8">
+ <script src="../../resources/testharness.js"></script>
+ <script src="../../resources/testharnessreport.js"></script>
+ <style type="text/css">
+ /* For Latin Modern Math,
+ italic correction of ∫ = 591
+ em = 1000
+ so the actual italic correction will be 591 * 64 / 1000;
+ */
+ math {
+ font-family: "Latin Modern Math";
+ font-size: 64px;
+ }
+ </style>
+ <script type="text/javascript">
+ var epsilon = 1;
+ setup({ "explicit_done": true });
+ function run() {
+ assert_approx_equals(document.getElementById("sup").getBoundingClientRect().left - document.getElementById("sub").getBoundingClientRect().left, 591 * 64 / 1000, epsilon);
+ done();
+ }
+ </script>
+ </head>
+ <body onload="run()">
+
+ <p>This test passes if the difference of horizontal positions between the
+ subscript and superscript corresponds to the italic correction of the
+ integral operator.</p>
+
+ <math display="block">
+ <msubsup>
+ <mo>∫</mo>
+ <mspace id="sub" width="10px" height="10px" mathbackground="red"/>
+ <mspace id="sup" width="10px" height="10px" mathbackground="green"/>
+ </msubsup>
+ </math>
+ </body>
+</html>
</ins><span class="cx">Property changes on: trunk/LayoutTests/mathml/opentype/large-operators-italic-correction.html
</span><span class="cx">___________________________________________________________________
</span></span></pre></div>
<a id="svnmimetype"></a>
<div class="addfile"><h4>Added: svn:mime-type</h4></div>
<a id="svneolstyle"></a>
<div class="addfile"><h4>Added: svn:eol-style</h4></div>
<a id="trunkLayoutTestsmathmlpresentationbug95015expectedhtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/mathml/presentation/bug95015-expected.html (199664 => 199665)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/mathml/presentation/bug95015-expected.html 2016-04-18 10:36:29 UTC (rev 199664)
+++ trunk/LayoutTests/mathml/presentation/bug95015-expected.html 2016-04-18 14:45:00 UTC (rev 199665)
</span><span class="lines">@@ -20,7 +20,7 @@
</span><span class="cx"> </mrow>
</span><span class="cx"> </math>
</span><span class="cx"> </div>
</span><del>- <div style="position: absolute; left: 10px; top: -.2em;">
</del><ins>+ <div style="position: absolute; left: 10px; top: -.1em;">
</ins><span class="cx"> <math>
</span><span class="cx"> <mrow>
</span><span class="cx"> <mspace height="50px" depth="50px"/>
</span></span></pre></div>
<a id="trunkLayoutTestsmathmlpresentationbug95015html"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/mathml/presentation/bug95015.html (199664 => 199665)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/mathml/presentation/bug95015.html 2016-04-18 10:36:29 UTC (rev 199664)
+++ trunk/LayoutTests/mathml/presentation/bug95015.html 2016-04-18 14:45:00 UTC (rev 199665)
</span><span class="lines">@@ -20,7 +20,7 @@
</span><span class="cx"> </mrow>
</span><span class="cx"> </math>
</span><span class="cx"> </div>
</span><del>- <div style="position: absolute; left: 10px; top: -.2em;">
</del><ins>+ <div style="position: absolute; left: 10px; top: -.1em;">
</ins><span class="cx"> <math>
</span><span class="cx"> <mrow>
</span><span class="cx"> <mspace height="50px" depth="50px"/>
</span></span></pre></div>
<a id="trunkLayoutTestsmathmlpresentationmultiscriptsnoscriptsexpectedhtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/mathml/presentation/multiscripts-noscripts-expected.html (199664 => 199665)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/mathml/presentation/multiscripts-noscripts-expected.html 2016-04-18 10:36:29 UTC (rev 199664)
+++ trunk/LayoutTests/mathml/presentation/multiscripts-noscripts-expected.html 2016-04-18 14:45:00 UTC (rev 199665)
</span><span class="lines">@@ -11,11 +11,6 @@
</span><span class="cx"> <mrow>
</span><span class="cx"> <mn>1</mn>
</span><span class="cx"> </mrow>
</span><del>- </math>
- </p>
-
- <p>
- <math>
</del><span class="cx"> <mrow>
</span><span class="cx"> <mn>2</mn>
</span><span class="cx"> </mrow>
</span></span></pre></div>
<a id="trunkLayoutTestsmathmlpresentationmultiscriptsnoscriptshtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/mathml/presentation/multiscripts-noscripts.html (199664 => 199665)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/mathml/presentation/multiscripts-noscripts.html 2016-04-18 10:36:29 UTC (rev 199664)
+++ trunk/LayoutTests/mathml/presentation/multiscripts-noscripts.html 2016-04-18 14:45:00 UTC (rev 199665)
</span><span class="lines">@@ -13,11 +13,6 @@
</span><span class="cx"> <mn>1</mn>
</span><span class="cx"> <mprescripts/>
</span><span class="cx"> </mmultiscripts>
</span><del>- </math>
- </p>
-
- <p>
- <math>
</del><span class="cx"> <mmultiscripts>
</span><span class="cx"> <mn>2</mn>
</span><span class="cx"> </mmultiscripts>
</span></span></pre></div>
<a id="trunkLayoutTestsmathmlpresentationmultiscriptspositionsexpectedhtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/mathml/presentation/multiscripts-positions-expected.html (199664 => 199665)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/mathml/presentation/multiscripts-positions-expected.html 2016-04-18 10:36:29 UTC (rev 199664)
+++ trunk/LayoutTests/mathml/presentation/multiscripts-positions-expected.html 2016-04-18 14:45:00 UTC (rev 199665)
</span><span class="lines">@@ -106,7 +106,7 @@
</span><span class="cx"> </mmultiscripts>
</span><span class="cx"> </math>
</span><span class="cx"> </p>
</span><del>- <p style="position: absolute; left: -5px; top: 110px;">
</del><ins>+ <p style="position: absolute; left: -5px; top: 120px;">
</ins><span class="cx"> <math>
</span><span class="cx"> <mspace height="50px" depth="50px"/>
</span><span class="cx"> <mrow>
</span><span class="lines">@@ -149,7 +149,7 @@
</span><span class="cx"> </mrow>
</span><span class="cx"> </math>
</span><span class="cx"> </p>
</span><del>- <p style="position: absolute; left: 145px; top: 110px;">
</del><ins>+ <p style="position: absolute; left: 145px; top: 120px;">
</ins><span class="cx"> <math>
</span><span class="cx"> <mspace height="50px" depth="50px"/>
</span><span class="cx"> <mrow>
</span></span></pre></div>
<a id="trunkLayoutTestsmathmlpresentationmultiscriptspositionshtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/mathml/presentation/multiscripts-positions.html (199664 => 199665)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/mathml/presentation/multiscripts-positions.html 2016-04-18 10:36:29 UTC (rev 199664)
+++ trunk/LayoutTests/mathml/presentation/multiscripts-positions.html 2016-04-18 14:45:00 UTC (rev 199665)
</span><span class="lines">@@ -108,7 +108,7 @@
</span><span class="cx"> </mmultiscripts>
</span><span class="cx"> </math>
</span><span class="cx"> </p>
</span><del>- <p style="position: absolute; left: -5px; top: 110px;">
</del><ins>+ <p style="position: absolute; left: -5px; top: 120px;">
</ins><span class="cx"> <math>
</span><span class="cx"> <mspace height="50px" depth="50px"/>
</span><span class="cx"> <mrow>
</span><span class="lines">@@ -151,7 +151,7 @@
</span><span class="cx"> </mrow>
</span><span class="cx"> </math>
</span><span class="cx"> </p>
</span><del>- <p style="position: absolute; left: 145px; top: 110px;">
</del><ins>+ <p style="position: absolute; left: 145px; top: 120px;">
</ins><span class="cx"> <math>
</span><span class="cx"> <mspace height="50px" depth="50px"/>
</span><span class="cx"> <mrow>
</span></span></pre></div>
<a id="trunkLayoutTestsmathmlpresentationscriptsheightexpectedhtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/mathml/presentation/scripts-height-expected.html (199664 => 199665)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/mathml/presentation/scripts-height-expected.html 2016-04-18 10:36:29 UTC (rev 199664)
+++ trunk/LayoutTests/mathml/presentation/scripts-height-expected.html 2016-04-18 14:45:00 UTC (rev 199665)
</span><span class="lines">@@ -68,19 +68,19 @@
</span><span class="cx"> <td style="width: 14em; height: 14em;">
</span><span class="cx"> <math>
</span><span class="cx"> <mspace height="7em" depth="7em"/>
</span><del>- <mi>x</mi>
</del><ins>+ <mspace width="10px" height="1em" depth="1em" mathbackground="red"/>
</ins><span class="cx"> <msubsup>
</span><del>- <mi>x</mi>
</del><ins>+ <mspace width="10px" height="1em" depth="1em" mathbackground="green"/>
</ins><span class="cx"> <mspace/>
</span><span class="cx"> <mspace/>
</span><span class="cx"> </msubsup>
</span><span class="cx"> <msubsup>
</span><del>- <mi>x</mi>
</del><ins>+ <mspace width="10px" height="1em" depth="1em" mathbackground="blue"/>
</ins><span class="cx"> <mspace/>
</span><span class="cx"> <mspace/>
</span><span class="cx"> </msubsup>
</span><span class="cx"> <msubsup>
</span><del>- <mi>x</mi>
</del><ins>+ <mspace width="10px" height="1em" depth="1em" mathbackground="yellow"/>
</ins><span class="cx"> <mspace/>
</span><span class="cx"> <mspace/>
</span><span class="cx"> </msubsup>
</span></span></pre></div>
<a id="trunkLayoutTestsmathmlpresentationscriptsheighthtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/mathml/presentation/scripts-height.html (199664 => 199665)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/mathml/presentation/scripts-height.html 2016-04-18 10:36:29 UTC (rev 199664)
+++ trunk/LayoutTests/mathml/presentation/scripts-height.html 2016-04-18 14:45:00 UTC (rev 199665)
</span><span class="lines">@@ -70,19 +70,19 @@
</span><span class="cx"> <td style="width: 14em; height: 14em;">
</span><span class="cx"> <math>
</span><span class="cx"> <mspace height="7em" depth="7em"/>
</span><del>- <mi>x</mi>
</del><ins>+ <mspace width="10px" height="1em" depth="1em" mathbackground="red"/>
</ins><span class="cx"> <msubsup>
</span><del>- <mi>x</mi>
</del><ins>+ <mspace width="10px" height="1em" depth="1em" mathbackground="green"/>
</ins><span class="cx"> <mspace height="4em"/>
</span><span class="cx"> <mspace height="1em"/>
</span><span class="cx"> </msubsup>
</span><span class="cx"> <msubsup>
</span><del>- <mi>x</mi>
</del><ins>+ <mspace width="10px" height="1em" depth="1em" mathbackground="blue"/>
</ins><span class="cx"> <mspace height="1em"/>
</span><span class="cx"> <mspace height="4em"/>
</span><span class="cx"> </msubsup>
</span><span class="cx"> <msubsup>
</span><del>- <mi>x</mi>
</del><ins>+ <mspace width="10px" height="1em" depth="1em" mathbackground="yellow"/>
</ins><span class="cx"> <mspace height="4em"/>
</span><span class="cx"> <mspace height="4em"/>
</span><span class="cx"> </msubsup>
</span></span></pre></div>
<a id="trunkLayoutTestsmathmlpresentationscriptshorizontalalignmentexpectedhtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/mathml/presentation/scripts-horizontal-alignment-expected.html (199664 => 199665)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/mathml/presentation/scripts-horizontal-alignment-expected.html 2016-04-18 10:36:29 UTC (rev 199664)
+++ trunk/LayoutTests/mathml/presentation/scripts-horizontal-alignment-expected.html 2016-04-18 14:45:00 UTC (rev 199665)
</span><span class="lines">@@ -11,14 +11,12 @@
</span><span class="cx"> <mmultiscripts>
</span><span class="cx"> <mn>0</mn>
</span><span class="cx"> <mspace width="10px" height="50px" mathbackground="green"/>
</span><ins>+ <mspace width="10px" depth="50px" mathbackground="green"/>
</ins><span class="cx"> <mspace width="10px" height="10px"/>
</span><del>- <mspace width="10px" height="10px"/>
- <none/>
</del><ins>+ <mspace width="10px" depth="10px"/>
</ins><span class="cx"> <mprescripts/>
</span><del>- <none/>
</del><span class="cx"> <mspace width="10px" height="10px"/>
</span><del>- <mspace width="10px" height="10px"/>
- <mspace width="10px" height="50px" mathbackground="green"/>
</del><ins>+ <mspace width="10px" depth="10px"/>
</ins><span class="cx"> </mmultiscripts>
</span><span class="cx"> </math>
</span><span class="cx">
</span></span></pre></div>
<a id="trunkLayoutTestsmathmlpresentationscriptshorizontalalignmenthtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/mathml/presentation/scripts-horizontal-alignment.html (199664 => 199665)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/mathml/presentation/scripts-horizontal-alignment.html 2016-04-18 10:36:29 UTC (rev 199664)
+++ trunk/LayoutTests/mathml/presentation/scripts-horizontal-alignment.html 2016-04-18 14:45:00 UTC (rev 199665)
</span><span class="lines">@@ -6,24 +6,22 @@
</span><span class="cx"> </head>
</span><span class="cx"> <body>
</span><span class="cx">
</span><del>- <!-- The MathML recommendation does not specify horizontal alignment of scripts. We align the bottom (respectively top) edge of the subscript (respectively superscript) with the bottom (respectively top) edge of the flex container. -->
</del><ins>+ <!-- The MathML recommendation does not specify horizontal alignment of scripts. We apply the maximum vertical shifts necessary for all subscripts / superscripts. Here we need to shift the tall green scripts to avoid collision and so the red scripts will be shifted by the same distance. -->
</ins><span class="cx"> <math style="position: absolute;">
</span><span class="cx"> <mspace height="100px" depth="100px"/>
</span><span class="cx"> <mmultiscripts>
</span><span class="cx"> <mn>0</mn>
</span><span class="cx"> <mspace width="10px" height="50px" mathbackground="green"/>
</span><ins>+ <mspace width="10px" depth="50px" mathbackground="green"/>
</ins><span class="cx"> <mspace width="10px" height="10px" mathbackground="red"/>
</span><del>- <mspace width="10px" height="10px" mathbackground="blue"/>
- <none/>
</del><ins>+ <mspace width="10px" depth="10px" mathbackground="red"/>
</ins><span class="cx"> <mprescripts/>
</span><del>- <none/>
- <mspace width="10px" height="10px" mathbackground="blue"/>
</del><span class="cx"> <mspace width="10px" height="10px" mathbackground="red"/>
</span><del>- <mspace width="10px" height="50px" mathbackground="green"/>
</del><ins>+ <mspace width="10px" depth="10px" mathbackground="red"/>
</ins><span class="cx"> </mmultiscripts>
</span><span class="cx"> </math>
</span><span class="cx">
</span><del>- <!-- These black rectangles should hide the top/bottom of the <mmultiscripts> element. So the green and red scripts should not be visible -->
</del><ins>+ <!-- These black rectangles should hide the top/bottom of the <mmultiscripts> element. So the red scripts should not be visible -->
</ins><span class="cx"> <math style="position: absolute; top: -40px;">
</span><span class="cx"> <mspace height="100px" depth="100px"/>
</span><span class="cx"> <mspace width="200px" height="40px" depth="20px" mathbackground="black"/>
</span></span></pre></div>
<a id="trunkLayoutTestsplatformgtkaccessibilitymathmultiscriptattributesexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/gtk/accessibility/math-multiscript-attributes-expected.txt (199664 => 199665)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/gtk/accessibility/math-multiscript-attributes-expected.txt 2016-04-18 10:36:29 UTC (rev 199664)
+++ trunk/LayoutTests/platform/gtk/accessibility/math-multiscript-attributes-expected.txt 2016-04-18 14:45:00 UTC (rev 199665)
</span><span class="lines">@@ -11,7 +11,7 @@
</span><span class="cx"> AXRole: AXStatic
</span><span class="cx"> AXParent: AXSection
</span><span class="cx"> AXChildren: 0
</span><del>-AXPosition: { 19.000000, -34.000000 }
</del><ins>+AXPosition: { 20.000000, -33.000000 }
</ins><span class="cx"> AXSize: { 15.000000, 106.000000 }
</span><span class="cx"> AXTitle:
</span><span class="cx"> AXDescription:
</span><span class="lines">@@ -30,7 +30,7 @@
</span><span class="cx"> AXRole: AXSubscript
</span><span class="cx"> AXParent: AXSection
</span><span class="cx"> AXChildren: 0
</span><del>-AXPosition: { 32.000000, -15.000000 }
</del><ins>+AXPosition: { 33.000000, -14.000000 }
</ins><span class="cx"> AXSize: { 11.000000, 81.000000 }
</span><span class="cx"> AXTitle:
</span><span class="cx"> AXDescription:
</span><span class="lines">@@ -49,7 +49,7 @@
</span><span class="cx"> AXRole: AXSuperscript
</span><span class="cx"> AXParent: AXSection
</span><span class="cx"> AXChildren: 0
</span><del>-AXPosition: { 32.000000, -26.000000 }
</del><ins>+AXPosition: { 33.000000, -26.000000 }
</ins><span class="cx"> AXSize: { 11.000000, 80.000000 }
</span><span class="cx"> AXTitle:
</span><span class="cx"> AXDescription:
</span><span class="lines">@@ -68,8 +68,8 @@
</span><span class="cx"> AXRole: AXSubscript
</span><span class="cx"> AXParent: AXSection
</span><span class="cx"> AXChildren: 0
</span><del>-AXPosition: { 9.000000, -15.000000 }
-AXSize: { 10.000000, 81.000000 }
</del><ins>+AXPosition: { 9.000000, -14.000000 }
+AXSize: { 11.000000, 81.000000 }
</ins><span class="cx"> AXTitle:
</span><span class="cx"> AXDescription:
</span><span class="cx"> AXValue: B
</span><span class="lines">@@ -88,7 +88,7 @@
</span><span class="cx"> AXParent: AXSection
</span><span class="cx"> AXChildren: 0
</span><span class="cx"> AXPosition: { 9.000000, -26.000000 }
</span><del>-AXSize: { 10.000000, 80.000000 }
</del><ins>+AXSize: { 11.000000, 80.000000 }
</ins><span class="cx"> AXTitle:
</span><span class="cx"> AXDescription:
</span><span class="cx"> AXValue: A
</span></span></pre></div>
<a id="trunkLayoutTestsplatformgtkmathmlpresentationrootsexpectedpng"></a>
<div class="binary"><h4>Modified: trunk/LayoutTests/platform/gtk/mathml/presentation/roots-expected.png</h4>
<pre class="diff"><span>
<span class="cx">(Binary files differ)
</span></span></pre></div>
<a id="trunkLayoutTestsplatformgtkmathmlpresentationrootsexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/gtk/mathml/presentation/roots-expected.txt (199664 => 199665)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/gtk/mathml/presentation/roots-expected.txt 2016-04-18 10:36:29 UTC (rev 199664)
+++ trunk/LayoutTests/platform/gtk/mathml/presentation/roots-expected.txt 2016-04-18 14:45:00 UTC (rev 199665)
</span><span class="lines">@@ -51,34 +51,32 @@
</span><span class="cx"> RenderBlock {p} at (0,68) size 784x19
</span><span class="cx"> RenderText {#text} at (0,2) size 222x17
</span><span class="cx"> text run at (0,2) width 222: "long square root with implied row: "
</span><del>- RenderMathMLMath {math} at (222,0) size 62x19 [padding: 0 1 0 1]
- RenderMathMLSquareRoot {msqrt} at (1,0) size 60x19
</del><ins>+ RenderMathMLMath {math} at (222,0) size 63x19 [padding: 0 1 0 1]
+ RenderMathMLSquareRoot {msqrt} at (1,0) size 61x19
</ins><span class="cx"> RenderMathMLBlock (anonymous, flex) at (0,0) size 17x19
</span><span class="cx"> RenderMathMLRadicalOperator (anonymous) at (0,0) size 17x19
</span><span class="cx"> RenderMathMLBlock (anonymous, flex) at (0,0) size 13x18
</span><span class="cx"> RenderBlock (anonymous) at (0,0) size 13x18
</span><span class="cx"> RenderText at (0,-56) size 13x106
</span><span class="cx"> text run at (0,-56) width 13: "\x{221A}"
</span><del>- RenderMathMLRootWrapper at (17,2) size 43x17
- RenderMathMLScripts {msup} at (0,0) size 16x15
- Base Wrapper at (0,0) size 10x15 [padding: 7 0 0 0]
- RenderMathMLToken {mi} at (0,7) size 10x8 [padding: 0 2 0 0]
- RenderMathMLBlock (anonymous, flex) at (0,0) size 8x8
- RenderBlock (anonymous) at (0,0) size 8x8
- RenderText {#text} at (0,-50) size 8x106
- text run at (0,-50) width 8: "x"
- SubSupPair Wrapper at (9,0) size 7x15
- RenderMathMLToken {mn} at (0,0) size 6x9
- RenderMathMLBlock (anonymous, flex) at (0,0) size 6x9
- RenderBlock (anonymous) at (0,0) size 6x9
- RenderText {#text} at (0,-35) size 6x80
- text run at (0,-35) width 6: "2"
- RenderMathMLOperator {mo} at (15,4) size 20x12
</del><ins>+ RenderMathMLRootWrapper at (17,2) size 44x17
+ RenderMathMLScripts {msup} at (0,0) size 17x15
+ RenderMathMLToken {mi} at (0,6) size 10x9 [padding: 0 2 0 0]
+ RenderMathMLBlock (anonymous, flex) at (0,0) size 8x8
+ RenderBlock (anonymous) at (0,0) size 8x8
+ RenderText {#text} at (0,-50) size 8x106
+ text run at (0,-50) width 8: "x"
+ RenderMathMLToken {mn} at (9,0) size 7x9
+ RenderMathMLBlock (anonymous, flex) at (0,0) size 6x9
+ RenderBlock (anonymous) at (0,0) size 6x9
+ RenderText {#text} at (0,-35) size 6x80
+ text run at (0,-35) width 6: "2"
+ RenderMathMLOperator {mo} at (16,4) size 20x12
</ins><span class="cx"> RenderMathMLBlock (anonymous, flex) at (3,0) size 13x12
</span><span class="cx"> RenderBlock (anonymous) at (0,0) size 12x12
</span><span class="cx"> RenderText at (0,-47) size 12x106
</span><span class="cx"> text run at (0,-47) width 12: "+"
</span><del>- RenderMathMLToken {mn} at (34,3) size 9x12
</del><ins>+ RenderMathMLToken {mn} at (35,3) size 9x12
</ins><span class="cx"> RenderMathMLBlock (anonymous, flex) at (0,0) size 8x12
</span><span class="cx"> RenderBlock (anonymous) at (0,0) size 8x12
</span><span class="cx"> RenderText {#text} at (0,-46) size 8x106
</span></span></pre></div>
<a id="trunkLayoutTestsplatformiossimulatorTestExpectations"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/ios-simulator/TestExpectations (199664 => 199665)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/ios-simulator/TestExpectations 2016-04-18 10:36:29 UTC (rev 199664)
+++ trunk/LayoutTests/platform/ios-simulator/TestExpectations 2016-04-18 14:45:00 UTC (rev 199665)
</span><span class="lines">@@ -662,11 +662,15 @@
</span><span class="cx"> # These tests require the Latin Modern Math font.
</span><span class="cx"> mathml/opentype/fraction-line.html [ Pass ImageOnlyFailure ]
</span><span class="cx"> mathml/presentation/fractions-linethickness.html [ Pass ImageOnlyFailure ]
</span><ins>+mathml/opentype/large-operators-italic-correction.html [ Pass Failure ]
+mathml/presentation/multiscripts-positions.html [ Pass ImageOnlyFailure ]
+mathml/presentation/scripts-subsup.html [ Pass ImageOnlyFailure ]
</ins><span class="cx">
</span><span class="cx"> # MathML tests that fail:
</span><span class="cx"> mathml/opentype/horizontal.html [ Failure ]
</span><span class="cx"> mathml/opentype/opentype-stretchy-horizontal.html [ Failure ]
</span><span class="cx"> mathml/mathml-in-dashboard.html [ Failure ]
</span><ins>+mathml/presentation/scripts-height.html [ Failure ]
</ins><span class="cx">
</span><span class="cx"> # <rdar://problem/19221067> ASSERT(m_stretchyData.top().glyph) fails in RenderMathMLOperator.cpp
</span><span class="cx"> mathml/presentation/style-changed.html
</span></span></pre></div>
<a id="trunkLayoutTestsplatformiossimulatormathmlpresentationrootsexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/ios-simulator/mathml/presentation/roots-expected.txt (199664 => 199665)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/ios-simulator/mathml/presentation/roots-expected.txt 2016-04-18 10:36:29 UTC (rev 199664)
+++ trunk/LayoutTests/platform/ios-simulator/mathml/presentation/roots-expected.txt 2016-04-18 14:45:00 UTC (rev 199665)
</span><span class="lines">@@ -1,8 +1,8 @@
</span><span class="cx"> layer at (0,0) size 800x600
</span><span class="cx"> RenderView at (0,0) size 800x600
</span><del>-layer at (0,0) size 800x517
- RenderBlock {html} at (0,0) size 800x517
- RenderBody {body} at (8,16) size 784x485
</del><ins>+layer at (0,0) size 800x518
+ RenderBlock {html} at (0,0) size 800x518
+ RenderBody {body} at (8,16) size 784x486
</ins><span class="cx"> RenderBlock {p} at (0,0) size 784x20
</span><span class="cx"> RenderText {#text} at (0,0) size 181x19
</span><span class="cx"> text run at (0,0) width 181: "square root (should be red): "
</span><span class="lines">@@ -48,42 +48,40 @@
</span><span class="cx"> RenderBlock (anonymous) at (0,0) size 8x12
</span><span class="cx"> RenderText {#text} at (0,-1) size 8x17
</span><span class="cx"> text run at (0,-1) width 8: "1"
</span><del>- RenderBlock {p} at (0,72) size 784x24
- RenderText {#text} at (0,4) size 227x19
- text run at (0,4) width 227: "long square root with implied row: "
- RenderMathMLMath {math} at (226,0) size 54x22 [padding: 0 1 0 1]
- RenderMathMLSquareRoot {msqrt} at (1,0) size 51x22
- RenderMathMLBlock (anonymous, flex) at (0,0) size 12x22
- RenderMathMLRadicalOperator (anonymous) at (0,0) size 12x22
- RenderMathMLBlock (anonymous, flex) at (0,0) size 9x22
- RenderBlock (anonymous) at (0,0) size 9x22
</del><ins>+ RenderBlock {p} at (0,72) size 784x25
+ RenderText {#text} at (0,5) size 227x19
+ text run at (0,5) width 227: "long square root with implied row: "
+ RenderMathMLMath {math} at (226,0) size 57x24 [padding: 0 1 0 1]
+ RenderMathMLSquareRoot {msqrt} at (1,0) size 54x24
+ RenderMathMLBlock (anonymous, flex) at (0,0) size 12x24
+ RenderMathMLRadicalOperator (anonymous) at (0,0) size 12x24
+ RenderMathMLBlock (anonymous, flex) at (0,0) size 9x23
+ RenderBlock (anonymous) at (0,0) size 9x23
</ins><span class="cx"> RenderText at (0,1) size 9x17
</span><span class="cx"> text run at (0,1) width 9: "\x{221A}"
</span><del>- RenderMathMLRootWrapper at (12,3) size 39x19
- RenderMathMLScripts {msup} at (0,0) size 15x16
- Base Wrapper at (0,0) size 9x16 [padding: 7 0 0 0]
- RenderMathMLToken {mi} at (0,7) size 9x9 [padding: 0 2 0 0]
- RenderMathMLBlock (anonymous, flex) at (0,0) size 8x9
- RenderBlock (anonymous) at (0,0) size 8x9
- RenderText {#text} at (0,-4) size 8x17
- text run at (0,-4) width 8: "x"
- SubSupPair Wrapper at (8,0) size 7x16
- RenderMathMLToken {mn} at (0,0) size 6x10
- RenderMathMLBlock (anonymous, flex) at (0,0) size 6x10
- RenderBlock (anonymous) at (0,0) size 6x10
- RenderText {#text} at (0,0) size 6x13
- text run at (0,0) width 6: "2"
- RenderMathMLOperator {mo} at (14,7) size 17x9
</del><ins>+ RenderMathMLRootWrapper at (12,3) size 42x21
+ RenderMathMLScripts {msup} at (0,0) size 18x18
+ RenderMathMLToken {mi} at (0,8) size 9x10 [padding: 0 2 0 0]
+ RenderMathMLBlock (anonymous, flex) at (0,0) size 8x9
+ RenderBlock (anonymous) at (0,0) size 8x9
+ RenderText {#text} at (0,-4) size 8x17
+ text run at (0,-4) width 8: "x"
+ RenderMathMLToken {mn} at (8,0) size 7x10
+ RenderMathMLBlock (anonymous, flex) at (0,0) size 6x10
+ RenderBlock (anonymous) at (0,0) size 6x10
+ RenderText {#text} at (0,0) size 6x13
+ text run at (0,0) width 6: "2"
+ RenderMathMLOperator {mo} at (17,8) size 17x9
</ins><span class="cx"> RenderMathMLBlock (anonymous, flex) at (3,0) size 10x9
</span><span class="cx"> RenderBlock (anonymous) at (0,0) size 9x9
</span><span class="cx"> RenderText at (0,-4) size 9x17
</span><span class="cx"> text run at (0,-4) width 9: "+"
</span><del>- RenderMathMLToken {mn} at (30,4) size 9x12
</del><ins>+ RenderMathMLToken {mn} at (33,5) size 9x12
</ins><span class="cx"> RenderMathMLBlock (anonymous, flex) at (0,0) size 8x12
</span><span class="cx"> RenderBlock (anonymous) at (0,0) size 8x12
</span><span class="cx"> RenderText {#text} at (0,-1) size 8x17
</span><span class="cx"> text run at (0,-1) width 8: "1"
</span><del>- RenderBlock {p} at (0,112) size 784x37
</del><ins>+ RenderBlock {p} at (0,113) size 784x37
</ins><span class="cx"> RenderText {#text} at (0,8) size 117x19
</span><span class="cx"> text run at (0,8) width 117: "root of a fraction: "
</span><span class="cx"> RenderMathMLMath {math} at (116,0) size 47x38 [padding: 0 1 0 1]
</span><span class="lines">@@ -128,7 +126,7 @@
</span><span class="cx"> RenderBlock (anonymous) at (0,0) size 8x12
</span><span class="cx"> RenderText {#text} at (0,-1) size 8x17
</span><span class="cx"> text run at (0,-1) width 8: "2"
</span><del>- RenderBlock {p} at (0,165) size 784x20
</del><ins>+ RenderBlock {p} at (0,166) size 784x20
</ins><span class="cx"> RenderText {#text} at (0,0) size 177x19
</span><span class="cx"> text run at (0,0) width 177: "cube root (should be blue): "
</span><span class="cx"> RenderMathMLMath {math} at (176,0) size 23x19 [color=#0000FF] [padding: 0 1 0 1]
</span><span class="lines">@@ -151,7 +149,7 @@
</span><span class="cx"> RenderBlock (anonymous) at (0,0) size 8x12
</span><span class="cx"> RenderText {#text} at (0,-1) size 8x17
</span><span class="cx"> text run at (0,-1) width 8: "2"
</span><del>- RenderBlock {p} at (0,201) size 784x20
</del><ins>+ RenderBlock {p} at (0,202) size 784x20
</ins><span class="cx"> RenderText {#text} at (0,0) size 77x19
</span><span class="cx"> text run at (0,0) width 77: "long index: "
</span><span class="cx"> RenderMathMLMath {math} at (76,0) size 51x18 [padding: 0 1 0 1]
</span><span class="lines">@@ -195,7 +193,7 @@
</span><span class="cx"> RenderBlock (anonymous) at (0,0) size 8x12
</span><span class="cx"> RenderText {#text} at (0,-1) size 8x17
</span><span class="cx"> text run at (0,-1) width 8: "2"
</span><del>- RenderBlock {p} at (0,237) size 784x37
</del><ins>+ RenderBlock {p} at (0,238) size 784x37
</ins><span class="cx"> RenderText {#text} at (0,8) size 188x19
</span><span class="cx"> text run at (0,8) width 188: "long index w/ complex base: "
</span><span class="cx"> RenderMathMLMath {math} at (187,0) size 76x38 [padding: 0 1 0 1]
</span><span class="lines">@@ -267,7 +265,7 @@
</span><span class="cx"> RenderBlock (anonymous) at (0,0) size 8x12
</span><span class="cx"> RenderText {#text} at (0,-1) size 8x17
</span><span class="cx"> text run at (0,-1) width 8: "2"
</span><del>- RenderBlock {p} at (0,290) size 784x36
</del><ins>+ RenderBlock {p} at (0,291) size 784x36
</ins><span class="cx"> RenderText {#text} at (0,16) size 77x19
</span><span class="cx"> text run at (0,16) width 77: "high index: "
</span><span class="cx"> RenderMathMLMath {math} at (76,0) size 23x35 [padding: 0 1 0 1]
</span><span class="lines">@@ -302,7 +300,7 @@
</span><span class="cx"> RenderBlock (anonymous) at (0,0) size 8x12
</span><span class="cx"> RenderText {#text} at (0,-1) size 8x17
</span><span class="cx"> text run at (0,-1) width 8: "2"
</span><del>- RenderBlock {p} at (0,342) size 784x59
</del><ins>+ RenderBlock {p} at (0,343) size 784x59
</ins><span class="cx"> RenderText {#text} at (0,28) size 160x19
</span><span class="cx"> text run at (0,28) width 160: "Imbricated square roots: "
</span><span class="cx"> RenderMathMLMath {math} at (159,0) size 277x60 [padding: 0 1 0 1]
</span><span class="lines">@@ -452,7 +450,7 @@
</span><span class="cx"> RenderText {#text} at (0,-1) size 10x17
</span><span class="cx"> text run at (0,-1) width 10: "A"
</span><span class="cx"> RenderText {#text} at (0,0) size 0x0
</span><del>- RenderBlock {p} at (0,417) size 784x68
</del><ins>+ RenderBlock {p} at (0,418) size 784x68
</ins><span class="cx"> RenderText {#text} at (0,36) size 114x19
</span><span class="cx"> text run at (0,36) width 114: "Imbricated roots: "
</span><span class="cx"> RenderMathMLMath {math} at (113,0) size 292x69 [padding: 0 1 0 1]
</span></span></pre></div>
<a id="trunkLayoutTestsplatformmacTestExpectations"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/mac/TestExpectations (199664 => 199665)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac/TestExpectations 2016-04-18 10:36:29 UTC (rev 199664)
+++ trunk/LayoutTests/platform/mac/TestExpectations 2016-04-18 14:45:00 UTC (rev 199665)
</span><span class="lines">@@ -790,6 +790,9 @@
</span><span class="cx"> # These tests require the Latin Modern Math font.
</span><span class="cx"> mathml/opentype/fraction-line.html [ Pass ImageOnlyFailure ]
</span><span class="cx"> mathml/presentation/fractions-linethickness.html [ Pass ImageOnlyFailure ]
</span><ins>+mathml/opentype/large-operators-italic-correction.html [ Pass Failure ]
+mathml/presentation/multiscripts-positions.html [ Pass ImageOnlyFailure ]
+mathml/presentation/scripts-subsup.html [ Pass ImageOnlyFailure ]
</ins><span class="cx">
</span><span class="cx"> # Missing references
</span><span class="cx"> webkit.org/b/119038 mathml/presentation/mo-stretch.html [ Failure ]
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (199664 => 199665)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-04-18 10:36:29 UTC (rev 199664)
+++ trunk/Source/WebCore/ChangeLog 2016-04-18 14:45:00 UTC (rev 199665)
</span><span class="lines">@@ -1,3 +1,55 @@
</span><ins>+2016-04-18 Frederic Wang <fwang@igalia.com>
+
+ Refactor RenderMathMLScripts layout to avoid using flexbox
+ https://bugs.webkit.org/show_bug.cgi?id=153917
+
+ Reviewed by Martin Robinson.
+
+ Tests: mathml/mathml-in-html5/subsup-parameters-1.html
+ mathml/opentype/large-operators-italic-correction.html
+
+ Reimplement RenderMathMLScripts without any flexbox or anonymous.
+ We also rely on parameters from the MATH table to improve rendering.
+
+ * css/mathml.css:
+ (msub > * + * + *, msup > * + * + *, msubsup > * + * + * + *, msub > mprescripts, msup > mprescripts, msubsup > mprescripts, msub > none, msup > none, msubsup > none, mmultiscripts > mprescripts ~ mprescripts, mmultiscripts > mprescripts ~ mprescripts ~ *): Deleted.
+ Invalid markup for scripts is now just hidden.
+ * rendering/mathml/RenderMathMLOperator.h: ditto.
+ * rendering/mathml/RenderMathMLScripts.cpp:
+ (WebCore::RenderMathMLScripts::unembellishedOperator): Reimplemented.
+ (WebCore::RenderMathMLScripts::getBaseAndScripts): Helper function to verify whether the
+ child list is valid and retrieve pointers on important children.
+ (WebCore::RenderMathMLScripts::spaceAfterScript): Helper function to get the
+ space after a script.
+ (WebCore::RenderMathMLScripts::italicCorrection): Helper function to read the
+ italic correction of a largeop base.
+ (WebCore::RenderMathMLScripts::computePreferredLogicalWidths): Implement this function.
+ (WebCore::RenderMathMLScripts::getScriptMetricsAndLayoutIfNeeded): Helper function to get
+ the maximum ascent/descent of all the scripts and determine the minimal
+ sub/sup shifts to apply.
+ (WebCore::RenderMathMLScripts::mirrorIfNeeded): Helper function to calculate the horizontal
+ offset depending on the directionality.
+ (WebCore::RenderMathMLScripts::layoutBlock): Implement this function.
+ (WebCore::RenderMathMLScripts::firstLineBaseline): Implement this function.
+ (WebCore::RenderMathMLScripts::paintChildren): Implement this function.
+ (WebCore::RenderMathMLScripts::RenderMathMLScripts): Deleted.
+ (WebCore::RenderMathMLScripts::base): Deleted.
+ (WebCore::RenderMathMLScripts::fixAnonymousStyleForSubSupPair): Deleted.
+ (WebCore::RenderMathMLScripts::fixAnonymousStyles): Deleted.
+ (WebCore::RenderMathMLScripts::addChildInternal): Deleted.
+ (WebCore::RenderMathMLScripts::removeChildInternal): Deleted.
+ (WebCore::RenderMathMLScripts::addChild): Deleted.
+ (WebCore::RenderMathMLScripts::removeChild): Deleted.
+ (WebCore::RenderMathMLScripts::styleDidChange): Deleted.
+ (WebCore::RenderMathMLScripts::layout): Deleted.
+ (WebCore::RenderMathMLScriptsWrapper::createAnonymousWrapper): Deleted.
+ (WebCore::RenderMathMLScriptsWrapper::addChildInternal): Deleted.
+ (WebCore::RenderMathMLScriptsWrapper::addChild): Deleted.
+ (WebCore::RenderMathMLScriptsWrapper::removeChildInternal): Deleted.
+ (WebCore::RenderMathMLScriptsWrapper::removeChild): Deleted.
+ * rendering/mathml/RenderMathMLScripts.h: Update definitions and remove classes
+ for anonymous wrappers.
+
</ins><span class="cx"> 2016-04-18 Manuel Rego Casasnovas <rego@igalia.com>
</span><span class="cx">
</span><span class="cx"> [css-grid] Use grid-template-areas to determine the explicit grid
</span></span></pre></div>
<a id="trunkSourceWebCorecssmathmlcss"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/mathml.css (199664 => 199665)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/mathml.css 2016-04-18 10:36:29 UTC (rev 199664)
+++ trunk/Source/WebCore/css/mathml.css 2016-04-18 14:45:00 UTC (rev 199665)
</span><span class="lines">@@ -101,12 +101,8 @@
</span><span class="cx"> visibility: hidden;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-/* This is a special style for erroneous markup:
- - <merror> element.
- - extra children in script elements.
- - <mprescripts/> and <none/> elements in msub/msup/msubsup.
- */
-merror, msub > * + * + *, msup > * + * + *, msubsup > * + * + * + *, msub > mprescripts, msup > mprescripts, msubsup > mprescripts, msub > none, msup > none, msubsup > none, mmultiscripts > mprescripts ~ mprescripts, mmultiscripts > mprescripts ~ mprescripts ~ * {
</del><ins>+/* This is a special style for erroneous markup. */
+merror {
</ins><span class="cx"> outline: solid thin red;
</span><span class="cx"> font-weight: bold;
</span><span class="cx"> font-family: sans-serif;
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingmathmlRenderMathMLScriptscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/mathml/RenderMathMLScripts.cpp (199664 => 199665)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/mathml/RenderMathMLScripts.cpp 2016-04-18 10:36:29 UTC (rev 199664)
+++ trunk/Source/WebCore/rendering/mathml/RenderMathMLScripts.cpp 2016-04-18 14:45:00 UTC (rev 199665)
</span><span class="lines">@@ -1,6 +1,7 @@
</span><span class="cx"> /*
</span><span class="cx"> * Copyright (C) 2010 Alex Milowski (alex@milowski.com). All rights reserved.
</span><span class="cx"> * Copyright (C) 2013 The MathJax Consortium.
</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">@@ -31,488 +32,416 @@
</span><span class="cx"> #include "RenderMathMLScripts.h"
</span><span class="cx">
</span><span class="cx"> #include "MathMLElement.h"
</span><ins>+#include "RenderMathMLOperator.h"
</ins><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><span class="cx"> using namespace MathMLNames;
</span><span class="cx">
</span><del>-// RenderMathMLScripts implements various MathML elements drawing scripts attached to a base. For valid MathML elements, the structure of the render tree should be:
-//
-// - msub, msup, msubsup: BaseWrapper SubSupPairWrapper
-// - mmultiscripts: BaseWrapper SubSupPairWrapper* (mprescripts SubSupPairWrapper*)*
-//
-// where BaseWrapper and SubSupPairWrapper do not contain any <mprescripts/> children. In addition, BaseWrapper must have one child and SubSupPairWrapper must have either one child (msub, msup) or two children (msubsup, mmultiscripts).
-//
-// In order to accept invalid markup and to handle the script elements consistently and uniformly, we will use a more general structure that encompasses both valid and invalid elements:
-//
-// BaseWrapper SubSupPairWrapper* (mprescripts SubSupPairWrapper*)*
-//
-// where BaseWrapper can now be empty and SubSupPairWrapper can now have one or two elements.
-//
-
-static bool isPrescript(const RenderObject& renderObject)
</del><ins>+static bool isPrescriptDelimiter(const RenderObject& renderObject)
</ins><span class="cx"> {
</span><span class="cx"> return renderObject.node() && renderObject.node()->hasTagName(MathMLNames::mprescriptsTag);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> RenderMathMLScripts::RenderMathMLScripts(Element& element, Ref<RenderStyle>&& style)
</span><span class="cx"> : RenderMathMLBlock(element, WTFMove(style))
</span><del>- , m_baseWrapper(0)
</del><span class="cx"> {
</span><span class="cx"> // Determine what kind of sub/sup expression we have by element name
</span><span class="cx"> if (element.hasTagName(MathMLNames::msubTag))
</span><del>- m_kind = Sub;
</del><ins>+ m_scriptType = Sub;
</ins><span class="cx"> else if (element.hasTagName(MathMLNames::msupTag))
</span><del>- m_kind = Super;
</del><ins>+ m_scriptType = Super;
</ins><span class="cx"> else if (element.hasTagName(MathMLNames::msubsupTag))
</span><del>- m_kind = SubSup;
</del><ins>+ m_scriptType = SubSup;
</ins><span class="cx"> else {
</span><span class="cx"> ASSERT(element.hasTagName(MathMLNames::mmultiscriptsTag));
</span><del>- m_kind = Multiscripts;
</del><ins>+ m_scriptType = Multiscripts;
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>-RenderBoxModelObject* RenderMathMLScripts::base() const
</del><ins>+RenderMathMLOperator* RenderMathMLScripts::unembellishedOperator()
</ins><span class="cx"> {
</span><del>- if (!m_baseWrapper)
</del><ins>+ RenderBox* base = firstChildBox();
+ if (!is<RenderMathMLBlock>(base))
</ins><span class="cx"> return nullptr;
</span><del>- RenderObject* base = m_baseWrapper->firstChild();
- if (!is<RenderBoxModelObject>(base))
- return nullptr;
- return downcast<RenderBoxModelObject>(base);
</del><ins>+ return downcast<RenderMathMLBlock>(base)->unembellishedOperator();
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-void RenderMathMLScripts::fixAnonymousStyleForSubSupPair(RenderObject* subSupPair, bool isPostScript)
</del><ins>+bool RenderMathMLScripts::getBaseAndScripts(RenderBox*& base, RenderBox*& firstPostScript, RenderBox*& firstPreScript)
</ins><span class="cx"> {
</span><del>- ASSERT(subSupPair && subSupPair->style().refCount() == 1);
- RenderStyle& scriptsStyle = subSupPair->style();
</del><ins>+ // All scripted elements must have at least one child.
+ // The first child is the base.
+ base = firstChildBox();
+ firstPostScript = nullptr;
+ firstPreScript = nullptr;
+ if (!base)
+ return false;
</ins><span class="cx">
</span><del>- // subSup pairs are drawn in column from bottom (subscript) to top (superscript).
- scriptsStyle.setFlexDirection(FlowColumnReverse);
</del><ins>+ switch (m_scriptType) {
+ case Sub:
+ case Super:
+ // These elements must have exactly two children.
+ // The second child is a postscript and there are no prescripts.
+ // <msub> base subscript </msub>
+ // <msup> base superscript </msup>
+ firstPostScript = base->nextSiblingBox();
+ return firstPostScript && !isPrescriptDelimiter(*firstPostScript) && !firstPostScript->nextSiblingBox();
+ case SubSup: {
+ // This element must have exactly three children.
+ // The second and third children are postscripts and there are no prescripts.
+ // <msubsup> base subscript superscript </msubsup>
+ firstPostScript = base->nextSiblingBox();
+ if (!firstPostScript || isPrescriptDelimiter(*firstPostScript))
+ return false;
+ RenderBox* superScript = firstPostScript->nextSiblingBox();
+ return superScript && !isPrescriptDelimiter(*superScript) && !superScript->nextSiblingBox();
+ }
+ case Multiscripts: {
+ // This element accepts the following syntax:
+ //
+ // <mmultiscripts>
+ // base
+ // (subscript superscript)*
+ // [ <mprescripts/> (presubscript presuperscript)* ]
+ // </mmultiscripts>
+ //
+ // https://www.w3.org/TR/MathML3/chapter3.html#presm.mmultiscripts
+ //
+ // We set the first postscript, unless (subscript superscript)* is empty.
+ if (base->nextSiblingBox() && !isPrescriptDelimiter(*base->nextSiblingBox()))
+ firstPostScript = base->nextSiblingBox();
</ins><span class="cx">
</span><del>- // The MathML specification does not specify horizontal alignment of
- // scripts. We align the bottom (respectively top) edge of the subscript
- // (respectively superscript) with the bottom (respectively top) edge of
- // the flex container. Note that for valid <msub> and <msup> elements, the
- // subSupPair should actually have only one script.
- if (m_kind == Sub)
- scriptsStyle.setJustifyContentPosition(ContentPositionFlexStart);
- else if (m_kind == Super)
- scriptsStyle.setJustifyContentPosition(ContentPositionFlexEnd);
- else
- scriptsStyle.setJustifyContentDistribution(ContentDistributionSpaceBetween);
</del><ins>+ // We browse the children in order to
+ // 1) Set the first prescript, unless (presubscript presuperscript)* is empty.
+ // 2) Ensure the validity of the element i.e.
+ // a) That the list of postscripts can be grouped into pairs of subscript/superscript.
+ // b) That the list of prescripts can be grouped into pairs of subscript/superscript.
+ // c) That there is at most one <mprescripts/>.
+ bool numberOfScriptIsEven = true;
+ for (RenderBox* script = base->nextSiblingBox(); script; script = script->nextSiblingBox()) {
+ if (isPrescriptDelimiter(*script)) {
+ // This is a <mprescripts/>. Let's check 2a) and 2c).
+ if (!numberOfScriptIsEven || firstPreScript)
+ return false;
+ firstPreScript = script->nextSiblingBox(); // We do 1).
+ continue;
+ }
+ numberOfScriptIsEven = !numberOfScriptIsEven;
+ }
+ return numberOfScriptIsEven; // We verify 2b).
+ }
+ }
</ins><span class="cx">
</span><del>- // The MathML specification does not specify vertical alignment of scripts.
- // Let's right align prescripts and left align postscripts.
- // See http://lists.w3.org/Archives/Public/www-math/2012Aug/0006.html
- scriptsStyle.setAlignItemsPosition(isPostScript ? ItemPositionFlexStart : ItemPositionFlexEnd);
</del><ins>+ ASSERT_NOT_REACHED();
+ return false;
+}
</ins><span class="cx">
</span><del>- // We set the order property so that the prescripts are drawn before the base.
- scriptsStyle.setOrder(isPostScript ? 0 : -1);
</del><ins>+LayoutUnit RenderMathMLScripts::spaceAfterScript()
+{
+ const auto& primaryFont = style().fontCascade().primaryFont();
+ if (auto* mathData = primaryFont.mathData())
+ return mathData->getMathConstant(primaryFont, OpenTypeMathData::SpaceAfterScript);
+ return style().fontCascade().size() / 5;
+}
</ins><span class="cx">
</span><del>- // We set this wrapper's font-size for its line-height.
- LayoutUnit scriptSize = static_cast<int>(0.75 * style().fontSize());
- scriptsStyle.setFontSize(scriptSize);
</del><ins>+LayoutUnit RenderMathMLScripts::italicCorrection(RenderBox* base)
+{
+ if (is<RenderMathMLBlock>(*base)) {
+ if (auto* renderOperator = downcast<RenderMathMLBlock>(*base).unembellishedOperator())
+ return renderOperator->italicCorrection();
+ }
+ return 0;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-void RenderMathMLScripts::fixAnonymousStyles()
</del><ins>+void RenderMathMLScripts::computePreferredLogicalWidths()
</ins><span class="cx"> {
</span><del>- // We set the base wrapper's style so that baseHeight in layout() will be an unstretched height.
- ASSERT(m_baseWrapper && m_baseWrapper->style().hasOneRef());
- m_baseWrapper->style().setAlignSelfPosition(ItemPositionFlexStart);
</del><ins>+ m_minPreferredLogicalWidth = 0;
+ m_maxPreferredLogicalWidth = 0;
</ins><span class="cx">
</span><del>- // This sets the style for postscript pairs.
- RenderObject* subSupPair = m_baseWrapper;
- for (subSupPair = subSupPair->nextSibling(); subSupPair && !isPrescript(*subSupPair); subSupPair = subSupPair->nextSibling())
- fixAnonymousStyleForSubSupPair(subSupPair, true);
</del><ins>+ RenderBox* base;
+ RenderBox* firstPostScript;
+ RenderBox* firstPreScript;
+ if (!getBaseAndScripts(base, firstPostScript, firstPreScript))
+ return;
</ins><span class="cx">
</span><del>- if (subSupPair && m_kind == Multiscripts) {
- // This sets the style for prescript pairs.
- for (subSupPair = subSupPair->nextSibling(); subSupPair && !isPrescript(*subSupPair); subSupPair = subSupPair->nextSibling())
- fixAnonymousStyleForSubSupPair(subSupPair, false);
- }
</del><ins>+ LayoutUnit baseItalicCorrection = std::min(base->maxPreferredLogicalWidth(), italicCorrection(base));
+ LayoutUnit space = spaceAfterScript();
</ins><span class="cx">
</span><del>- // This resets style for extra subSup pairs.
- for (; subSupPair; subSupPair = subSupPair->nextSibling()) {
- if (!isPrescript(*subSupPair)) {
- ASSERT(subSupPair && subSupPair->style().refCount() == 1);
- RenderStyle& scriptsStyle = subSupPair->style();
- scriptsStyle.setFlexDirection(FlowRow);
- scriptsStyle.setJustifyContentPosition(ContentPositionFlexStart);
- scriptsStyle.setAlignItemsPosition(ItemPositionCenter);
- scriptsStyle.setOrder(0);
- scriptsStyle.setFontSize(style().fontSize());
</del><ins>+ switch (m_scriptType) {
+ case Sub:
+ m_maxPreferredLogicalWidth += base->maxPreferredLogicalWidth();
+ m_maxPreferredLogicalWidth += std::max(LayoutUnit(0), firstPostScript->maxPreferredLogicalWidth() - baseItalicCorrection + space);
+ break;
+ case Super:
+ m_maxPreferredLogicalWidth += base->maxPreferredLogicalWidth();
+ m_maxPreferredLogicalWidth += std::max(LayoutUnit(0), firstPostScript->maxPreferredLogicalWidth() + space);
+ break;
+ case SubSup:
+ case Multiscripts: {
+ RenderBox* supScript;
+ for (RenderBox* subScript = firstPreScript; subScript; subScript = supScript->nextSiblingBox()) {
+ supScript = subScript->nextSiblingBox();
+ ASSERT(supScript);
+ LayoutUnit subSupPairWidth = std::max(subScript->maxPreferredLogicalWidth(), supScript->maxPreferredLogicalWidth());
+ m_maxPreferredLogicalWidth += subSupPairWidth + space;
</ins><span class="cx"> }
</span><ins>+ m_maxPreferredLogicalWidth += base->maxPreferredLogicalWidth();
+ for (RenderBox* subScript = firstPostScript; subScript && !isPrescriptDelimiter(*subScript); subScript = supScript->nextSiblingBox()) {
+ supScript = subScript->nextSiblingBox();
+ ASSERT(supScript);
+ LayoutUnit subSupPairWidth = std::max(std::max(LayoutUnit(0), subScript->maxPreferredLogicalWidth() - baseItalicCorrection), supScript->maxPreferredLogicalWidth());
+ m_maxPreferredLogicalWidth += subSupPairWidth + space;
+ }
</ins><span class="cx"> }
</span><ins>+ }
+
+ m_minPreferredLogicalWidth = m_maxPreferredLogicalWidth;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-void RenderMathMLScripts::addChildInternal(bool doNotRestructure, RenderObject* child, RenderObject* beforeChild)
</del><ins>+void RenderMathMLScripts::getScriptMetricsAndLayoutIfNeeded(RenderBox* base, RenderBox* script, LayoutUnit& minSubScriptShift, LayoutUnit& minSupScriptShift, LayoutUnit& maxScriptDescent, LayoutUnit& maxScriptAscent)
</ins><span class="cx"> {
</span><del>- if (doNotRestructure) {
- RenderMathMLBlock::addChild(child, beforeChild);
- return;
- }
</del><ins>+ LayoutUnit baseAscent = ascentForChild(*base);
+ LayoutUnit baseDescent = base->logicalHeight() - baseAscent;
+ LayoutUnit subscriptShiftDown;
+ LayoutUnit superscriptShiftUp;
+ LayoutUnit subscriptBaselineDropMin;
+ LayoutUnit superScriptBaselineDropMax;
+ LayoutUnit subSuperscriptGapMin;
+ LayoutUnit superscriptBottomMin;
+ LayoutUnit subscriptTopMax;
+ LayoutUnit superscriptBottomMaxWithSubscript;
</ins><span class="cx">
</span><del>- if (beforeChild) {
- // beforeChild may be a grandchild, so we call the addChild function of the corresponding wrapper instead.
- RenderObject* parent = beforeChild->parent();
- if (parent != this) {
- RenderMathMLBlock& parentBlock = downcast<RenderMathMLBlock>(*parent);
- if (is<RenderMathMLScriptsWrapper>(parentBlock)) {
- RenderMathMLScriptsWrapper& wrapper = downcast<RenderMathMLScriptsWrapper>(parentBlock);
- wrapper.addChildInternal(false, child, beforeChild);
- return;
- }
- }
</del><ins>+ const auto& primaryFont = style().fontCascade().primaryFont();
+ if (auto* mathData = primaryFont.mathData()) {
+ subscriptShiftDown = mathData->getMathConstant(primaryFont, OpenTypeMathData::SubscriptShiftDown);
+ superscriptShiftUp = mathData->getMathConstant(primaryFont, OpenTypeMathData::SuperscriptShiftUp);
+ subscriptBaselineDropMin = mathData->getMathConstant(primaryFont, OpenTypeMathData::SubscriptBaselineDropMin);
+ superScriptBaselineDropMax = mathData->getMathConstant(primaryFont, OpenTypeMathData::SuperscriptBaselineDropMax);
+ subSuperscriptGapMin = mathData->getMathConstant(primaryFont, OpenTypeMathData::SubSuperscriptGapMin);
+ superscriptBottomMin = mathData->getMathConstant(primaryFont, OpenTypeMathData::SuperscriptBottomMin);
+ subscriptTopMax = mathData->getMathConstant(primaryFont, OpenTypeMathData::SubscriptTopMax);
+ superscriptBottomMaxWithSubscript = mathData->getMathConstant(primaryFont, OpenTypeMathData::SuperscriptBottomMaxWithSubscript);
+ } else {
+ // Default heuristic values when you do not have a font.
+ subscriptShiftDown = style().fontMetrics().xHeight() / 3;
+ superscriptShiftUp = style().fontMetrics().xHeight();
+ subscriptBaselineDropMin = style().fontMetrics().xHeight() / 2;
+ superScriptBaselineDropMax = style().fontMetrics().xHeight() / 2;
+ subSuperscriptGapMin = style().fontCascade().size() / 5;
+ superscriptBottomMin = style().fontMetrics().xHeight() / 4;
+ subscriptTopMax = 4 * style().fontMetrics().xHeight() / 5;
+ superscriptBottomMaxWithSubscript = 4 * style().fontMetrics().xHeight() / 5;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>- if (beforeChild == m_baseWrapper) {
- // This is like inserting the child at the beginning of the base wrapper.
- m_baseWrapper->addChildInternal(false, child, m_baseWrapper->firstChild());
- return;
</del><ins>+ if (m_scriptType == Sub || m_scriptType == SubSup || m_scriptType == Multiscripts) {
+ LayoutUnit specifiedMinSubShift = 0;
+ parseMathMLLength(element()->fastGetAttribute(MathMLNames::subscriptshiftAttr), specifiedMinSubShift, &style(), false);
+ minSubScriptShift = std::max(subscriptShiftDown, baseDescent + subscriptBaselineDropMin);
+ minSubScriptShift = std::max(minSubScriptShift, specifiedMinSubShift);
</ins><span class="cx"> }
</span><del>-
- if (isPrescript(*child)) {
- // The new child becomes an <mprescripts/> separator.
- RenderMathMLBlock::addChild(child, beforeChild);
- return;
</del><ins>+ if (m_scriptType == Super || m_scriptType == SubSup || m_scriptType == Multiscripts) {
+ LayoutUnit specifiedMinSupShift = 0;
+ parseMathMLLength(element()->fastGetAttribute(MathMLNames::superscriptshiftAttr), specifiedMinSupShift, &style(), false);
+ minSupScriptShift = std::max(superscriptShiftUp, baseAscent - superScriptBaselineDropMax);
+ minSupScriptShift = std::max(minSupScriptShift, specifiedMinSupShift);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>- if (!beforeChild || isPrescript(*beforeChild)) {
- // We are at the end of a sequence of subSup pairs.
- RenderMathMLBlock* previousSibling = downcast<RenderMathMLBlock>(beforeChild ? beforeChild->previousSibling() : lastChild());
- if (is<RenderMathMLScriptsWrapper>(previousSibling)) {
- RenderMathMLScriptsWrapper& wrapper = downcast<RenderMathMLScriptsWrapper>(*previousSibling);
- if ((wrapper.m_kind == RenderMathMLScriptsWrapper::Base && wrapper.isEmpty()) || (wrapper.m_kind == RenderMathMLScriptsWrapper::SubSupPair && !wrapper.firstChild()->nextSibling())) {
- // The previous sibling is either an empty base or a SubSup pair with a single child so we can insert the new child into that wrapper.
- wrapper.addChildInternal(true, child);
- return;
- }
- }
- // Otherwise we create a new subSupPair to store the new child.
- RenderMathMLScriptsWrapper* subSupPair = RenderMathMLScriptsWrapper::createAnonymousWrapper(this, RenderMathMLScriptsWrapper::SubSupPair);
- subSupPair->addChildInternal(true, child);
- RenderMathMLBlock::addChild(subSupPair, beforeChild);
- return;
</del><ins>+ switch (m_scriptType) {
+ case Sub: {
+ script->layoutIfNeeded();
+ LayoutUnit subAscent = ascentForChild(*script);
+ LayoutUnit subDescent = script->logicalHeight() - subAscent;
+ maxScriptDescent = subDescent;
+ minSubScriptShift = std::max(minSubScriptShift, subAscent - subscriptTopMax);
</ins><span class="cx"> }
</span><del>-
- // beforeChild is a subSup pair. This is like inserting the new child at the beginning of the subSup wrapper.
- RenderMathMLScriptsWrapper& wrapper = downcast<RenderMathMLScriptsWrapper>(*beforeChild);
- ASSERT(wrapper.m_kind == RenderMathMLScriptsWrapper::SubSupPair);
- ASSERT(!(m_baseWrapper->isEmpty() && m_baseWrapper->nextSibling() == beforeChild));
- wrapper.addChildInternal(false, child, wrapper.firstChild());
-}
-
-void RenderMathMLScripts::removeChildInternal(bool doNotRestructure, RenderObject& child)
-{
- if (doNotRestructure) {
- RenderMathMLBlock::removeChild(child);
- return;
</del><ins>+ break;
+ case Super: {
+ script->layoutIfNeeded();
+ LayoutUnit supAscent = ascentForChild(*script);
+ LayoutUnit supDescent = script->logicalHeight() - supAscent;
+ maxScriptAscent = supAscent;
+ minSupScriptShift = std::max(minSupScriptShift, superscriptBottomMin + supDescent);
</ins><span class="cx"> }
</span><ins>+ break;
+ case SubSup:
+ case Multiscripts: {
+ RenderBox* supScript;
+ for (RenderBox* subScript = script; subScript && !isPrescriptDelimiter(*subScript); subScript = supScript->nextSiblingBox()) {
+ supScript = subScript->nextSiblingBox();
+ ASSERT(supScript);
+ subScript->layoutIfNeeded();
+ supScript->layoutIfNeeded();
+ LayoutUnit subAscent = ascentForChild(*subScript);
+ LayoutUnit subDescent = subScript->logicalHeight() - subAscent;
+ LayoutUnit supAscent = ascentForChild(*supScript);
+ LayoutUnit supDescent = supScript->logicalHeight() - supAscent;
+ maxScriptAscent = std::max(maxScriptAscent, supAscent);
+ maxScriptDescent = std::max(maxScriptDescent, subDescent);
+ LayoutUnit subScriptShift = std::max(subscriptShiftDown, baseDescent + subscriptBaselineDropMin);
+ subScriptShift = std::max(subScriptShift, subAscent - subscriptTopMax);
+ LayoutUnit supScriptShift = std::max(superscriptShiftUp, baseAscent - superScriptBaselineDropMax);
+ supScriptShift = std::max(supScriptShift, superscriptBottomMin + supDescent);
</ins><span class="cx">
</span><del>- ASSERT(isPrescript(child));
</del><ins>+ LayoutUnit subSuperscriptGap = (subScriptShift - subAscent) + (supScriptShift - supDescent);
+ if (subSuperscriptGap < subSuperscriptGapMin) {
+ // First, we try and push the superscript up.
+ LayoutUnit delta = superscriptBottomMaxWithSubscript - (supScriptShift - supDescent);
+ if (delta > 0) {
+ delta = std::min(delta, subSuperscriptGapMin - subSuperscriptGap);
+ supScriptShift += delta;
+ subSuperscriptGap += delta;
+ }
+ // If that is not enough, we push the subscript down.
+ if (subSuperscriptGap < subSuperscriptGapMin)
+ subScriptShift += subSuperscriptGapMin - subSuperscriptGap;
+ }
</ins><span class="cx">
</span><del>- RenderObject* previousSibling = child.previousSibling();
- RenderObject* nextSibling = child.nextSibling();
- ASSERT(previousSibling);
-
- if (nextSibling && !isPrescript(*previousSibling) && !isPrescript(*nextSibling)) {
- RenderMathMLScriptsWrapper& previousWrapper = downcast<RenderMathMLScriptsWrapper>(*previousSibling);
- RenderMathMLScriptsWrapper& nextWrapper = downcast<RenderMathMLScriptsWrapper>(*nextSibling);
- ASSERT(nextWrapper.m_kind == RenderMathMLScriptsWrapper::SubSupPair && !nextWrapper.isEmpty());
- if ((previousWrapper.m_kind == RenderMathMLScriptsWrapper::Base && previousWrapper.isEmpty()) || (previousWrapper.m_kind == RenderMathMLScriptsWrapper::SubSupPair && !previousWrapper.firstChild()->nextSibling())) {
- RenderObject* script = nextWrapper.firstChild();
- nextWrapper.removeChildInternal(false, *script);
- previousWrapper.addChildInternal(true, script);
</del><ins>+ minSubScriptShift = std::max(minSubScriptShift, subScriptShift);
+ minSupScriptShift = std::max(minSupScriptShift, supScriptShift);
</ins><span class="cx"> }
</span><span class="cx"> }
</span><del>-
- RenderMathMLBlock::removeChild(child);
-}
-
-void RenderMathMLScripts::addChild(RenderObject* child, RenderObject* beforeChild)
-{
- if (isEmpty()) {
- m_baseWrapper = RenderMathMLScriptsWrapper::createAnonymousWrapper(this, RenderMathMLScriptsWrapper::Base);
- RenderMathMLBlock::addChild(m_baseWrapper);
</del><span class="cx"> }
</span><del>-
- addChildInternal(false, child, beforeChild);
-
- fixAnonymousStyles();
</del><span class="cx"> }
</span><span class="cx">
</span><del>-void RenderMathMLScripts::removeChild(RenderObject& child)
</del><ins>+LayoutUnit RenderMathMLScripts::mirrorIfNeeded(LayoutUnit horizontalOffset, const RenderBox& child)
</ins><span class="cx"> {
</span><del>- if (beingDestroyed() || documentBeingDestroyed()) {
- // The renderer is being destroyed so we remove the child normally.
- RenderMathMLBlock::removeChild(child);
- return;
- }
</del><ins>+ if (style().direction() == RTL)
+ return logicalWidth() - child.logicalWidth() - horizontalOffset;
</ins><span class="cx">
</span><del>- removeChildInternal(false, child);
- fixAnonymousStyles();
</del><ins>+ return horizontalOffset;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-void RenderMathMLScripts::styleDidChange(StyleDifference diff, const RenderStyle* oldStyle)
</del><ins>+void RenderMathMLScripts::layoutBlock(bool relayoutChildren, LayoutUnit)
</ins><span class="cx"> {
</span><del>- RenderMathMLBlock::styleDidChange(diff, oldStyle);
-
- if (!isEmpty())
- fixAnonymousStyles();
-}
</del><ins>+ ASSERT(needsLayout());
</ins><span class="cx">
</span><del>-RenderMathMLOperator* RenderMathMLScripts::unembellishedOperator()
-{
- RenderBoxModelObject* base = this->base();
- if (!is<RenderMathMLBlock>(base))
- return nullptr;
- return downcast<RenderMathMLBlock>(*base).unembellishedOperator();
-}
</del><ins>+ if (!relayoutChildren && simplifiedLayout())
+ return;
</ins><span class="cx">
</span><del>-void RenderMathMLScripts::layout()
-{
- RenderMathMLBlock::layout();
-
- if (!m_baseWrapper)
</del><ins>+ RenderBox* base;
+ RenderBox* firstPostScript;
+ RenderBox* firstPreScript;
+ if (!getBaseAndScripts(base, firstPostScript, firstPreScript)) {
+ setLogicalWidth(0);
+ setLogicalHeight(0);
+ clearNeedsLayout();
</ins><span class="cx"> return;
</span><del>- RenderBox* base = m_baseWrapper->firstChildBox();
- if (!base)
- return;
</del><ins>+ }
+ recomputeLogicalWidth();
+ base->layoutIfNeeded();
</ins><span class="cx">
</span><del>- // Our layout rules include: Don't let the superscript go below the "axis" (half x-height above the
- // baseline), or the subscript above the axis. Also, don't let the superscript's top edge be
- // below the base's top edge, or the subscript's bottom edge above the base's bottom edge.
</del><ins>+ LayoutUnit supScriptShift = 0;
+ LayoutUnit subScriptShift = 0;
+ LayoutUnit scriptDescent = 0;
+ LayoutUnit scriptAscent = 0;
+ LayoutUnit space = spaceAfterScript();
</ins><span class="cx">
</span><del>- LayoutUnit baseHeight = base->logicalHeight();
- LayoutUnit baseBaseline = base->firstLineBaseline().valueOr(baseHeight);
- LayoutUnit axis = style().fontMetrics().xHeight() / 2;
- int fontSize = style().fontSize();
</del><ins>+ if (m_scriptType == Multiscripts)
+ getScriptMetricsAndLayoutIfNeeded(base, firstPreScript, subScriptShift, supScriptShift, scriptDescent, scriptAscent);
+ getScriptMetricsAndLayoutIfNeeded(base, firstPostScript, subScriptShift, supScriptShift, scriptDescent, scriptAscent);
</ins><span class="cx">
</span><del>- ASSERT(m_baseWrapper->style().hasOneRef());
- bool needsSecondLayout = false;
</del><ins>+ LayoutUnit baseAscent = ascentForChild(*base);
+ LayoutUnit baseDescent = base->logicalHeight() - baseAscent;
+ LayoutUnit baseItalicCorrection = std::min(base->logicalWidth(), italicCorrection(base));
+ LayoutUnit horizontalOffset = 0;
</ins><span class="cx">
</span><del>- LayoutUnit topPadding = 0;
- LayoutUnit bottomPadding = 0;
</del><ins>+ LayoutUnit ascent = std::max(baseAscent, scriptAscent + supScriptShift);
+ LayoutUnit descent = std::max(baseDescent, scriptDescent + subScriptShift);
+ setLogicalHeight(ascent + descent);
</ins><span class="cx">
</span><del>- Element* scriptElement = element();
- LayoutUnit superscriptShiftValue = 0;
- LayoutUnit subscriptShiftValue = 0;
- if (m_kind == Sub || m_kind == SubSup || m_kind == Multiscripts)
- parseMathMLLength(scriptElement->fastGetAttribute(MathMLNames::subscriptshiftAttr), subscriptShiftValue, &style(), false);
- if (m_kind == Super || m_kind == SubSup || m_kind == Multiscripts)
- parseMathMLLength(scriptElement->fastGetAttribute(MathMLNames::superscriptshiftAttr), superscriptShiftValue, &style(), false);
</del><ins>+ switch (m_scriptType) {
+ case Sub: {
+ setLogicalWidth(base->logicalWidth() + std::max(LayoutUnit(0), firstPostScript->logicalWidth() - baseItalicCorrection + space));
+ LayoutPoint baseLocation(mirrorIfNeeded(horizontalOffset, *base), ascent - baseAscent);
+ base->setLocation(baseLocation);
+ horizontalOffset += base->logicalWidth();
+ LayoutUnit scriptAscent = ascentForChild(*firstPostScript);
+ LayoutPoint scriptLocation(mirrorIfNeeded(horizontalOffset - baseItalicCorrection, *firstPostScript), ascent + subScriptShift - scriptAscent);
+ firstPostScript->setLocation(scriptLocation);
+ }
+ break;
+ case Super: {
+ setLogicalWidth(base->logicalWidth() + std::max(LayoutUnit(0), firstPostScript->logicalWidth() + space));
+ LayoutPoint baseLocation(mirrorIfNeeded(horizontalOffset, *base), ascent - baseAscent);
+ base->setLocation(baseLocation);
+ horizontalOffset += base->logicalWidth();
+ LayoutUnit scriptAscent = ascentForChild(*firstPostScript);
+ LayoutPoint scriptLocation(mirrorIfNeeded(horizontalOffset, *firstPostScript), ascent - supScriptShift - scriptAscent);
+ firstPostScript->setLocation(scriptLocation);
+ }
+ break;
+ case SubSup:
+ case Multiscripts: {
+ RenderBox* supScript;
</ins><span class="cx">
</span><del>- bool isPostScript = true;
- RenderMathMLBlock* subSupPair = downcast<RenderMathMLBlock>(m_baseWrapper->nextSibling());
- for (; subSupPair; subSupPair = downcast<RenderMathMLBlock>(subSupPair->nextSibling())) {
-
- // We skip the base and <mprescripts/> elements.
- if (isPrescript(*subSupPair)) {
- if (!isPostScript)
- break;
- isPostScript = false;
- continue;
</del><ins>+ // Calculate the logical width.
+ LayoutUnit logicalWidth = 0;
+ for (RenderBox* subScript = firstPreScript; subScript; subScript = supScript->nextSiblingBox()) {
+ supScript = subScript->nextSiblingBox();
+ ASSERT(supScript);
+ LayoutUnit subSupPairWidth = std::max(subScript->logicalWidth(), supScript->logicalWidth());
+ logicalWidth += subSupPairWidth + space;
</ins><span class="cx"> }
</span><ins>+ logicalWidth += base->logicalWidth();
+ for (RenderBox* subScript = firstPostScript; subScript && !isPrescriptDelimiter(*subScript); subScript = supScript->nextSiblingBox()) {
+ supScript = subScript->nextSiblingBox();
+ ASSERT(supScript);
+ LayoutUnit subSupPairWidth = std::max(std::max(LayoutUnit(0), subScript->logicalWidth() - baseItalicCorrection), supScript->logicalWidth());
+ logicalWidth += subSupPairWidth + space;
+ }
+ setLogicalWidth(logicalWidth);
</ins><span class="cx">
</span><del>- if (RenderBox* superscript = m_kind == Sub ? 0 : subSupPair->lastChildBox()) {
- LayoutUnit superscriptHeight = superscript->logicalHeight();
- LayoutUnit superscriptBaseline = superscript->firstLineBaseline().valueOr(superscriptHeight);
- LayoutUnit minBaseline = std::max<LayoutUnit>(fontSize / 3 + 1 + superscriptBaseline, superscriptHeight + axis + superscriptShiftValue);
-
- topPadding = std::max<LayoutUnit>(topPadding, minBaseline - baseBaseline);
</del><ins>+ for (RenderBox* subScript = firstPreScript; subScript; subScript = supScript->nextSiblingBox()) {
+ supScript = subScript->nextSiblingBox();
+ ASSERT(supScript);
+ LayoutUnit subSupPairWidth = std::max(subScript->logicalWidth(), supScript->logicalWidth());
+ horizontalOffset += space + subSupPairWidth;
+ LayoutUnit subAscent = ascentForChild(*subScript);
+ LayoutPoint subScriptLocation(mirrorIfNeeded(horizontalOffset - subScript->logicalWidth(), *subScript), ascent + subScriptShift - subAscent);
+ subScript->setLocation(subScriptLocation);
+ LayoutUnit supAscent = ascentForChild(*supScript);
+ LayoutPoint supScriptLocation(mirrorIfNeeded(horizontalOffset - supScript->logicalWidth(), *supScript), ascent - supScriptShift - supAscent);
+ supScript->setLocation(supScriptLocation);
</ins><span class="cx"> }
</span><ins>+ LayoutPoint baseLocation(mirrorIfNeeded(horizontalOffset, *base), ascent - baseAscent);
+ base->setLocation(baseLocation);
+ horizontalOffset += base->logicalWidth();
+ for (RenderBox* subScript = firstPostScript; subScript && !isPrescriptDelimiter(*subScript); subScript = supScript->nextSiblingBox()) {
+ supScript = subScript->nextSiblingBox();
+ ASSERT(supScript);
+ LayoutUnit subAscent = ascentForChild(*subScript);
+ LayoutPoint subScriptLocation(mirrorIfNeeded(horizontalOffset - baseItalicCorrection, *subScript), ascent + subScriptShift - subAscent);
+ subScript->setLocation(subScriptLocation);
+ LayoutUnit supAscent = ascentForChild(*supScript);
+ LayoutPoint supScriptLocation(mirrorIfNeeded(horizontalOffset, *supScript), ascent - supScriptShift - supAscent);
+ supScript->setLocation(supScriptLocation);
</ins><span class="cx">
</span><del>- if (RenderBox* subscript = m_kind == Super ? 0 : subSupPair->firstChildBox()) {
- LayoutUnit subscriptHeight = subscript->logicalHeight();
- LayoutUnit subscriptBaseline = subscript->firstLineBaseline().valueOr(subscriptHeight);
- LayoutUnit baseExtendUnderBaseline = baseHeight - baseBaseline;
- LayoutUnit subscriptUnderItsBaseline = subscriptHeight - subscriptBaseline;
- LayoutUnit minExtendUnderBaseline = std::max<LayoutUnit>(fontSize / 5 + 1 + subscriptUnderItsBaseline, subscriptHeight + subscriptShiftValue - axis);
-
- bottomPadding = std::max<LayoutUnit>(bottomPadding, minExtendUnderBaseline - baseExtendUnderBaseline);
</del><ins>+ LayoutUnit subSupPairWidth = std::max(subScript->logicalWidth(), supScript->logicalWidth());
+ horizontalOffset += subSupPairWidth + space;
</ins><span class="cx"> }
</span><span class="cx"> }
</span><del>-
- Length newPadding(topPadding, Fixed);
- if (newPadding != m_baseWrapper->style().paddingTop()) {
- m_baseWrapper->style().setPaddingTop(newPadding);
- needsSecondLayout = true;
</del><span class="cx"> }
</span><span class="cx">
</span><del>- newPadding = Length(bottomPadding, Fixed);
- if (newPadding != m_baseWrapper->style().paddingBottom()) {
- m_baseWrapper->style().setPaddingBottom(newPadding);
- needsSecondLayout = true;
- }
-
- if (!needsSecondLayout)
- return;
-
- setNeedsLayout(MarkOnlyThis);
- m_baseWrapper->setChildNeedsLayout(MarkOnlyThis);
-
- RenderMathMLBlock::layout();
</del><ins>+ clearNeedsLayout();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> Optional<int> RenderMathMLScripts::firstLineBaseline() const
</span><span class="cx"> {
</span><del>- if (m_baseWrapper) {
- if (Optional<int> baseline = m_baseWrapper->firstLineBaseline())
- return baseline;
- }
- return RenderMathMLBlock::firstLineBaseline();
</del><ins>+ ASSERT(!needsLayout());
+ RenderBox* base = firstChildBox();
+ if (!base)
+ return Optional<int>();
+ return Optional<int>(static_cast<int>(lroundf(ascentForChild(*base) + base->logicalTop())));
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-RenderMathMLScriptsWrapper* RenderMathMLScriptsWrapper::createAnonymousWrapper(RenderMathMLScripts* renderObject, WrapperType type)
</del><ins>+void RenderMathMLScripts::paintChildren(PaintInfo& paintInfo, const LayoutPoint& paintOffset, PaintInfo& paintInfoForChild, bool usePrintRect)
</ins><span class="cx"> {
</span><del>- RenderMathMLScriptsWrapper* newBlock = new RenderMathMLScriptsWrapper(renderObject->document(), RenderStyle::createAnonymousStyleWithDisplay(&renderObject->style(), FLEX), type);
- newBlock->initializeStyle();
- return newBlock;
-}
-
-void RenderMathMLScriptsWrapper::addChildInternal(bool doNotRestructure, RenderObject* child, RenderObject* beforeChild)
-{
- if (doNotRestructure) {
- RenderMathMLBlock::addChild(child, beforeChild);
- return;
- }
-
- RenderMathMLScripts* parentNode = downcast<RenderMathMLScripts>(parent());
-
- if (m_kind == Base) {
- RenderObject* sibling = nextSibling();
-
- if (!isEmpty() && !beforeChild) {
- // This is like inserting the child after the base wrapper.
- parentNode->addChildInternal(false, sibling);
</del><ins>+ for (RenderBox* child = firstChildBox(); child; child = child->nextSiblingBox()) {
+ if (!paintChild(*child, paintInfo, paintOffset, paintInfoForChild, usePrintRect, PaintAsInlineBlock))
</ins><span class="cx"> return;
</span><del>- }
-
- // The old base (if any) becomes a script ; the new child becomes either the base or an <mprescripts> separator.
- RenderObject* oldBase = firstChild();
- if (oldBase)
- RenderMathMLBlock::removeChild(*oldBase);
- if (isPrescript(*child))
- parentNode->addChildInternal(true, child, sibling);
- else
- RenderMathMLBlock::addChild(child);
- if (oldBase)
- parentNode->addChildInternal(false, oldBase, sibling);
- return;
</del><span class="cx"> }
</span><del>-
- if (isPrescript(*child)) {
- // We insert an <mprescripts> element.
- if (!beforeChild)
- parentNode->addChildInternal(true, child, nextSibling());
- else if (beforeChild == firstChild())
- parentNode->addChildInternal(true, child, this);
- else {
- // We insert the <mprescripts> in the middle of a subSup pair so we must split that pair.
- RenderObject* sibling = nextSibling();
- parentNode->removeChildInternal(true, *this);
- parentNode->addChildInternal(true, child, sibling);
-
- RenderObject* script = firstChild();
- RenderMathMLBlock::removeChild(*script);
- parentNode->addChildInternal(false, script, child);
-
- script = beforeChild;
- RenderMathMLBlock::removeChild(*script);
- parentNode->addChildInternal(false, script, sibling);
- destroy();
- }
- return;
- }
-
- // We first move to the last subSup pair in the curent sequence of scripts.
- RenderMathMLScriptsWrapper* subSupPair = this;
- while (subSupPair->nextSibling() && !isPrescript(*subSupPair->nextSibling()))
- subSupPair = downcast<RenderMathMLScriptsWrapper>(subSupPair->nextSibling());
- if (subSupPair->firstChild()->nextSibling()) {
- // The last pair has two children so we need to create a new pair to leave room for the new child.
- RenderMathMLScriptsWrapper* newPair = createAnonymousWrapper(parentNode, RenderMathMLScriptsWrapper::SubSupPair);
- parentNode->addChildInternal(true, newPair, subSupPair->nextSibling());
- subSupPair = newPair;
- }
-
- // We shift the successors in the current sequence of scripts.
- for (RenderObject* previousSibling = subSupPair->previousSibling(); subSupPair != this; previousSibling = previousSibling->previousSibling()) {
- RenderMathMLScriptsWrapper& previousSubSupPair = downcast<RenderMathMLScriptsWrapper>(*previousSibling);
- RenderObject* script = previousSubSupPair.lastChild();
- previousSubSupPair.removeChildInternal(true, *script);
- subSupPair->addChildInternal(true, script, subSupPair->firstChild());
- subSupPair = downcast<RenderMathMLScriptsWrapper>(previousSibling);
- }
-
- // This subSup pair now contain one element which is either beforeChild or the script that was before. Hence we can insert the new child before of after that element.
- RenderMathMLBlock::addChild(child, firstChild() == beforeChild ? beforeChild : nullptr);
</del><span class="cx"> }
</span><span class="cx">
</span><del>-void RenderMathMLScriptsWrapper::addChild(RenderObject* child, RenderObject* beforeChild)
-{
- RenderMathMLScripts* parentNode = downcast<RenderMathMLScripts>(parent());
-
- addChildInternal(false, child, beforeChild);
-
- parentNode->fixAnonymousStyles();
-}
-
-void RenderMathMLScriptsWrapper::removeChildInternal(bool doNotRestructure, RenderObject& child)
-{
- if (doNotRestructure) {
- RenderMathMLBlock::removeChild(child);
- return;
- }
-
- RenderMathMLScripts* parentNode = downcast<RenderMathMLScripts>(parent());
-
- if (m_kind == Base) {
- // We remove the child from the base wrapper.
- RenderObject* sibling = nextSibling();
- RenderMathMLBlock::removeChild(child);
- if (sibling && !isPrescript(*sibling)) {
- // If there are postscripts, the first one becomes the base.
- RenderMathMLScriptsWrapper& wrapper = downcast<RenderMathMLScriptsWrapper>(*sibling);
- RenderObject* script = wrapper.firstChild();
- wrapper.removeChildInternal(false, *script);
- RenderMathMLBlock::addChild(script);
- }
- return;
- }
-
- // We remove the child and shift the successors in the current sequence of scripts.
- RenderMathMLBlock::removeChild(child);
- RenderMathMLScriptsWrapper* subSupPair = this;
- for (RenderObject* nextSibling = subSupPair->nextSibling(); nextSibling && !isPrescript(*nextSibling); nextSibling = nextSibling->nextSibling()) {
- RenderMathMLScriptsWrapper& nextSubSupPair = downcast<RenderMathMLScriptsWrapper>(*nextSibling);
- RenderObject* script = nextSubSupPair.firstChild();
- nextSubSupPair.removeChildInternal(true, *script);
- subSupPair->addChildInternal(true, script);
- subSupPair = downcast<RenderMathMLScriptsWrapper>(nextSibling);
- }
-
- // We remove the last subSup pair if it became empty.
- if (subSupPair->isEmpty()) {
- parentNode->removeChildInternal(true, *subSupPair);
- subSupPair->destroy();
- }
-}
-
-void RenderMathMLScriptsWrapper::removeChild(RenderObject& child)
-{
- if (beingDestroyed() || documentBeingDestroyed()) {
- // The renderer is being destroyed so we remove the child normally.
- RenderMathMLBlock::removeChild(child);
- return;
- }
-
- RenderMathMLScripts* parentNode = downcast<RenderMathMLScripts>(parent());
- removeChildInternal(false, child);
- parentNode->fixAnonymousStyles();
-}
-
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #endif // ENABLE(MATHML)
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingmathmlRenderMathMLScriptsh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/mathml/RenderMathMLScripts.h (199664 => 199665)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/mathml/RenderMathMLScripts.h 2016-04-18 10:36:29 UTC (rev 199664)
+++ trunk/Source/WebCore/rendering/mathml/RenderMathMLScripts.h 2016-04-18 14:45:00 UTC (rev 199665)
</span><span class="lines">@@ -1,6 +1,7 @@
</span><span class="cx"> /*
</span><span class="cx"> * Copyright (C) 2010 Alex Milowski (alex@milowski.com). All rights reserved.
</span><span class="cx"> * Copyright (C) 2013 The MathJax Consortium.
</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">@@ -32,80 +33,33 @@
</span><span class="cx"> #include "RenderMathMLBlock.h"
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><del>-
-class RenderMathMLScripts;
-
-class RenderMathMLScriptsWrapper final : public RenderMathMLBlock {
-
-friend class RenderMathMLScripts;
-
-public:
- enum WrapperType { Base, SubSupPair };
-
- void addChild(RenderObject* child, RenderObject* beforeChild = 0) override;
- void removeChild(RenderObject&) override;
-
-private:
- RenderMathMLScriptsWrapper(Document& document, Ref<RenderStyle>&& style, WrapperType kind)
- : RenderMathMLBlock(document, WTFMove(style))
- , m_kind(kind)
- {
- }
-
- static RenderMathMLScriptsWrapper* createAnonymousWrapper(RenderMathMLScripts* renderObject, WrapperType);
-
- void addChildInternal(bool normalInsertion, RenderObject* child, RenderObject* beforeChild = 0);
- void removeChildInternal(bool normalRemoval, RenderObject& child);
-
- const char* renderName() const override { return m_kind == Base ? "Base Wrapper" : "SubSupPair Wrapper"; }
- bool isRenderMathMLScriptsWrapper() const final { return true; }
-
- RenderMathMLScripts* parentMathMLScripts();
-
- WrapperType m_kind;
-};
-
</del><span class="cx"> // Render a base with scripts.
</span><span class="cx"> class RenderMathMLScripts final : public RenderMathMLBlock {
</span><del>-
-friend class RenderMathMLScriptsWrapper;
-
</del><span class="cx"> public:
</span><span class="cx"> RenderMathMLScripts(Element&, Ref<RenderStyle>&&);
</span><del>- void addChild(RenderObject* child, RenderObject* beforeChild = 0) override;
- void removeChild(RenderObject&) override;
-
- RenderMathMLOperator* unembellishedOperator() override;
- Optional<int> firstLineBaseline() const override;
</del><ins>+ RenderMathMLOperator* unembellishedOperator() final;
+ Optional<int> firstLineBaseline() const final;
+ void layoutBlock(bool relayoutChildren, LayoutUnit pageLogicalHeight = 0) final;
+ void paintChildren(PaintInfo& forSelf, const LayoutPoint&, PaintInfo& forChild, bool usePrintRect) final;
</ins><span class="cx">
</span><del>-protected:
- void layout() override;
-
</del><span class="cx"> private:
</span><del>- void addChildInternal(bool normalInsertion, RenderObject* child, RenderObject* beforeChild = 0);
- void removeChildInternal(bool normalRemoval, RenderObject& child);
</del><ins>+ bool isRenderMathMLScripts() const final { return true; }
+ const char* renderName() const final { return "RenderMathMLScripts"; }
</ins><span class="cx">
</span><del>- bool isRenderMathMLScripts() const override { return true; }
- const char* renderName() const override { return "RenderMathMLScripts"; }
</del><ins>+ bool getBaseAndScripts(RenderBox*& base, RenderBox*& firstPostScript, RenderBox*& firstPreScript);
+ LayoutUnit spaceAfterScript();
+ LayoutUnit italicCorrection(RenderBox* base);
+ void computePreferredLogicalWidths() override;
+ void getScriptMetricsAndLayoutIfNeeded(RenderBox* base, RenderBox* script, LayoutUnit& minSubScriptShift, LayoutUnit& minSupScriptShift, LayoutUnit& maxScriptDescent, LayoutUnit& maxScriptAscent);
+ LayoutUnit mirrorIfNeeded(LayoutUnit horizontalOffset, const RenderBox& child);
</ins><span class="cx">
</span><del>- void fixAnonymousStyleForSubSupPair(RenderObject* subSupPair, bool isPostScript);
- void fixAnonymousStyles();
-
- void styleDidChange(StyleDifference, const RenderStyle* oldStyle) override;
-
- // Omit our subscript and/or superscript. This may return 0 for a non-MathML base (which
- // won't occur in valid MathML).
- RenderBoxModelObject* base() const;
-
</del><span class="cx"> enum ScriptsType { Sub, Super, SubSup, Multiscripts };
</span><span class="cx">
</span><del>- ScriptsType m_kind;
- RenderMathMLScriptsWrapper* m_baseWrapper;
</del><ins>+ ScriptsType m_scriptType;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span><span class="cx">
</span><del>-SPECIALIZE_TYPE_TRAITS_RENDER_OBJECT(RenderMathMLScriptsWrapper, isRenderMathMLScriptsWrapper())
</del><span class="cx"> SPECIALIZE_TYPE_TRAITS_RENDER_OBJECT(RenderMathMLScripts, isRenderMathMLScripts())
</span><span class="cx">
</span><span class="cx"> #endif // ENABLE(MATHML)
</span></span></pre>
</div>
</div>
</body>
</html>