<!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>[195115] releases/WebKitGTK/webkit-2.10</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/195115">195115</a></dd>
<dt>Author</dt> <dd>carlosgc@webkit.org</dd>
<dt>Date</dt> <dd>2016-01-15 02:42:01 -0800 (Fri, 15 Jan 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/193829">r193829</a> - Bad position of large operators inside an munderover element
https://bugs.webkit.org/show_bug.cgi?id=151916
Reviewed by Alejandro G. Castro.
Source/WebCore:
Test: mathml/opentype/large-operators-munderover.html
* rendering/mathml/RenderMathMLOperator.h:
(WebCore::RenderMathMLOperator::isVertical): Expose the direction of the operator.
* rendering/mathml/RenderMathMLUnderOver.cpp:
(WebCore::RenderMathMLUnderOver::layout): Remove call to horizontal stretching for vertical operators.
LayoutTests:
* mathml/opentype/large-operators-munderover-expected.txt: Added.
* mathml/opentype/large-operators-munderover.html: Added.
Add a test to verify the position and size of a large operator used as an munderover base.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#releasesWebKitGTKwebkit210LayoutTestsChangeLog">releases/WebKitGTK/webkit-2.10/LayoutTests/ChangeLog</a></li>
<li><a href="#releasesWebKitGTKwebkit210SourceWebCoreChangeLog">releases/WebKitGTK/webkit-2.10/Source/WebCore/ChangeLog</a></li>
<li><a href="#releasesWebKitGTKwebkit210SourceWebCorerenderingmathmlRenderMathMLOperatorh">releases/WebKitGTK/webkit-2.10/Source/WebCore/rendering/mathml/RenderMathMLOperator.h</a></li>
<li><a href="#releasesWebKitGTKwebkit210SourceWebCorerenderingmathmlRenderMathMLUnderOvercpp">releases/WebKitGTK/webkit-2.10/Source/WebCore/rendering/mathml/RenderMathMLUnderOver.cpp</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#releasesWebKitGTKwebkit210LayoutTestsmathmlopentypelargeoperatorsmunderoverexpectedtxt">releases/WebKitGTK/webkit-2.10/LayoutTests/mathml/opentype/large-operators-munderover-expected.txt</a></li>
<li><a href="#releasesWebKitGTKwebkit210LayoutTestsmathmlopentypelargeoperatorsmunderoverhtml">releases/WebKitGTK/webkit-2.10/LayoutTests/mathml/opentype/large-operators-munderover.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="releasesWebKitGTKwebkit210LayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.10/LayoutTests/ChangeLog (195114 => 195115)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.10/LayoutTests/ChangeLog 2016-01-15 10:40:22 UTC (rev 195114)
+++ releases/WebKitGTK/webkit-2.10/LayoutTests/ChangeLog 2016-01-15 10:42:01 UTC (rev 195115)
</span><span class="lines">@@ -1,3 +1,15 @@
</span><ins>+2015-12-09 Frederic Wang <fred.wang@free.fr>
+
+ Bad position of large operators inside an munderover element
+ https://bugs.webkit.org/show_bug.cgi?id=151916
+
+ Reviewed by Alejandro G. Castro.
+
+ * mathml/opentype/large-operators-munderover-expected.txt: Added.
+ * mathml/opentype/large-operators-munderover.html: Added.
+
+ Add a test to verify the position and size of a large operator used as an munderover base.
+
</ins><span class="cx"> 2015-12-08 Zalan Bujtas <zalan@apple.com>
</span><span class="cx">
</span><span class="cx"> Do not insert positioned renderers to multiple gPositionedDescendantsMap.
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit210LayoutTestsmathmlopentypelargeoperatorsmunderoverexpectedtxt"></a>
<div class="addfile"><h4>Added: releases/WebKitGTK/webkit-2.10/LayoutTests/mathml/opentype/large-operators-munderover-expected.txt (0 => 195115)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.10/LayoutTests/mathml/opentype/large-operators-munderover-expected.txt (rev 0)
+++ releases/WebKitGTK/webkit-2.10/LayoutTests/mathml/opentype/large-operators-munderover-expected.txt 2016-01-15 10:42:01 UTC (rev 195115)
</span><span class="lines">@@ -0,0 +1,7 @@
</span><ins>+This test passes if you see a large black square with a green bar overscript and a red bar underscript.
+
+largeop width: PASS
+largeop height: PASS
+green bar is above: PASS
+red bar is below: PASS
+
</ins></span></pre></div>
<a id="releasesWebKitGTKwebkit210LayoutTestsmathmlopentypelargeoperatorsmunderoverhtml"></a>
<div class="addfile"><h4>Added: releases/WebKitGTK/webkit-2.10/LayoutTests/mathml/opentype/large-operators-munderover.html (0 => 195115)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.10/LayoutTests/mathml/opentype/large-operators-munderover.html (rev 0)
+++ releases/WebKitGTK/webkit-2.10/LayoutTests/mathml/opentype/large-operators-munderover.html 2016-01-15 10:42:01 UTC (rev 195115)
</span><span class="lines">@@ -0,0 +1,54 @@
</span><ins>+<!doctype html>
+<html>
+ <head>
+ <title>Large Operator Munderover</title>
+ <meta charset="utf-8"/>
+ <style type="text/css">
+ /* This font is taken from Mozilla's test suite. */
+ @font-face {
+ font-family: stretchy;
+ src: url("stretchy.woff");
+ }
+ math {
+ font-family: stretchy;
+ }
+ </style>
+ <script>
+ var result;
+ var epsilon = 1;
+ function almostEqual(x, y) {
+ return Math.abs(x - y) < epsilon;
+ }
+ function assert(text, condition) {
+ result += text + ": " + (condition ? "PASS" : "FAIL") + "\n";
+ }
+ function test() {
+ result = "";
+ // font em is 1024, size of glyph L8 is 8389 and font-size is 16px
+ var largeop = document.getElementById("largeop").getBoundingClientRect();
+ var green = document.getElementById("green").getBoundingClientRect();
+ var red = document.getElementById("red").getBoundingClientRect();
+ var size = (8389/1024)*16;
+
+ assert("largeop width", almostEqual(largeop.width, size));
+ assert("largeop height", almostEqual(largeop.height, size));
+ assert("green bar is above", green.bottom <= largeop.top);
+ assert("red bar is below", red.top >= largeop.bottom);
+ document.getElementById("result").innerText = result;
+ if (window.testRunner)
+ testRunner.dumpAsText();
+ }
+ </script>
+ </head>
+ <body onload="test()">
+ <p>This test passes if you see a large black square with a green bar overscript and a red bar underscript.</p>
+ <math display="block">
+ <munderover>
+ <mo id="largeop" lspace="0px" rspace="0px" style="font-size: 16px;" >&#x2A1C;</mo>
+ <mspace id="red" width="200px" height="10px" depth="10px" mathbackground="red"/>
+ <mspace id="green" width="250px" height="10px" depth="10px" mathbackground="green"/>
+ </munderover>
+ </math>
+ <div id="result"></div>
+ </body>
+</html>
</ins></span></pre></div>
<a id="releasesWebKitGTKwebkit210SourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.10/Source/WebCore/ChangeLog (195114 => 195115)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.10/Source/WebCore/ChangeLog 2016-01-15 10:40:22 UTC (rev 195114)
+++ releases/WebKitGTK/webkit-2.10/Source/WebCore/ChangeLog 2016-01-15 10:42:01 UTC (rev 195115)
</span><span class="lines">@@ -1,3 +1,17 @@
</span><ins>+2015-12-09 Frederic Wang <fred.wang@free.fr>
+
+ Bad position of large operators inside an munderover element
+ https://bugs.webkit.org/show_bug.cgi?id=151916
+
+ Reviewed by Alejandro G. Castro.
+
+ Test: mathml/opentype/large-operators-munderover.html
+
+ * rendering/mathml/RenderMathMLOperator.h:
+ (WebCore::RenderMathMLOperator::isVertical): Expose the direction of the operator.
+ * rendering/mathml/RenderMathMLUnderOver.cpp:
+ (WebCore::RenderMathMLUnderOver::layout): Remove call to horizontal stretching for vertical operators.
+
</ins><span class="cx"> 2015-12-09 Zan Dobersek <zdobersek@igalia.com>
</span><span class="cx">
</span><span class="cx"> [TextureMapper] TextureMapperShaderProgram::setMatrix() should use TransformationMatrix::FloatMatrix4
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit210SourceWebCorerenderingmathmlRenderMathMLOperatorh"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.10/Source/WebCore/rendering/mathml/RenderMathMLOperator.h (195114 => 195115)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.10/Source/WebCore/rendering/mathml/RenderMathMLOperator.h 2016-01-15 10:40:22 UTC (rev 195114)
+++ releases/WebKitGTK/webkit-2.10/Source/WebCore/rendering/mathml/RenderMathMLOperator.h 2016-01-15 10:42:01 UTC (rev 195115)
</span><span class="lines">@@ -71,6 +71,7 @@
</span><span class="cx"> bool hasOperatorFlag(MathMLOperatorDictionary::Flag flag) const { return m_operatorFlags & flag; }
</span><span class="cx"> // FIXME: The displaystyle property is not implemented (https://bugs.webkit.org/show_bug.cgi?id=118737).
</span><span class="cx"> bool isLargeOperatorInDisplayStyle() const { return !hasOperatorFlag(MathMLOperatorDictionary::Stretchy) && hasOperatorFlag(MathMLOperatorDictionary::LargeOp); }
</span><ins>+ bool isVertical() const { return m_isVertical; }
</ins><span class="cx">
</span><span class="cx"> virtual void updateStyle() override final;
</span><span class="cx">
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit210SourceWebCorerenderingmathmlRenderMathMLUnderOvercpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.10/Source/WebCore/rendering/mathml/RenderMathMLUnderOver.cpp (195114 => 195115)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.10/Source/WebCore/rendering/mathml/RenderMathMLUnderOver.cpp 2016-01-15 10:40:22 UTC (rev 195114)
+++ releases/WebKitGTK/webkit-2.10/Source/WebCore/rendering/mathml/RenderMathMLUnderOver.cpp 2016-01-15 10:42:01 UTC (rev 195115)
</span><span class="lines">@@ -80,8 +80,10 @@
</span><span class="cx"> if (child->needsLayout()) {
</span><span class="cx"> if (is<RenderMathMLBlock>(child)) {
</span><span class="cx"> if (auto renderOperator = downcast<RenderMathMLBlock>(*child).unembellishedOperator()) {
</span><del>- renderOperator->resetStretchSize();
- renderOperators.append(renderOperator);
</del><ins>+ if (!renderOperator->isVertical()) {
+ renderOperator->resetStretchSize();
+ renderOperators.append(renderOperator);
+ }
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>