<!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>[203639] 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/203639">203639</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2016-07-23 01:19:57 -0700 (Sat, 23 Jul 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Source/WebCore:
[MathML] PaintInfo state is not properly restored after applyTransform.
https://bugs.webkit.org/show_bug.cgi?id=160077
Patch by Frederic Wang <fwang@igalia.com> on 2016-07-23
Reviewed by Simon Fraser.
PaintInfo::applyTransform modifies PaintInfo::rect and the original state is not properly
restored by GraphicsContextStateSaver. To avoid some weird rendering bugs in MathOperator
and RenderMathMLMenclose, we follow what is done in SVG renderers and make a copy of the
original PaintInfo before applying the transform.
Test: mathml/presentation/bug160077.html
* rendering/mathml/MathOperator.cpp:
(WebCore::MathOperator::paint):
* rendering/mathml/RenderMathMLMenclose.cpp:
(WebCore::RenderMathMLMenclose::paint):
LayoutTests:
[MathML] PaintInfo state not properly restored after applyTransform.
https://bugs.webkit.org/show_bug.cgi?id=160077
Patch by Frederic Wang <fwang@igalia.com> on 2016-07-23
Reviewed by Simon Fraser.
* mathml/presentation/bug160077-expected-mismatch.html: Added.
* mathml/presentation/bug160077.html: Added.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorerenderingmathmlMathOperatorcpp">trunk/Source/WebCore/rendering/mathml/MathOperator.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingmathmlRenderMathMLMenclosecpp">trunk/Source/WebCore/rendering/mathml/RenderMathMLMenclose.cpp</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsmathmlpresentationbug160077expectedmismatchhtml">trunk/LayoutTests/mathml/presentation/bug160077-expected-mismatch.html</a></li>
<li><a href="#trunkLayoutTestsmathmlpresentationbug160077html">trunk/LayoutTests/mathml/presentation/bug160077.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (203638 => 203639)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2016-07-23 08:07:58 UTC (rev 203638)
+++ trunk/LayoutTests/ChangeLog 2016-07-23 08:19:57 UTC (rev 203639)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2016-07-23 Frederic Wang <fwang@igalia.com>
+
+ [MathML] PaintInfo state not properly restored after applyTransform.
+ https://bugs.webkit.org/show_bug.cgi?id=160077
+
+ Reviewed by Simon Fraser.
+
+ * mathml/presentation/bug160077-expected-mismatch.html: Added.
+ * mathml/presentation/bug160077.html: Added.
+
</ins><span class="cx"> 2016-07-22 Myles C. Maxfield <mmaxfield@apple.com>
</span><span class="cx">
</span><span class="cx"> All dancers with bunny ears are female
</span></span></pre></div>
<a id="trunkLayoutTestsmathmlpresentationbug160077expectedmismatchhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/mathml/presentation/bug160077-expected-mismatch.html (0 => 203639)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/mathml/presentation/bug160077-expected-mismatch.html (rev 0)
+++ trunk/LayoutTests/mathml/presentation/bug160077-expected-mismatch.html 2016-07-23 08:19:57 UTC (rev 203639)
</span><span class="lines">@@ -0,0 +1,13 @@
</span><ins>+<html>
+ <body style="font-size: 300%">
+
+ <p><math xmlns='http://www.w3.org/1998/Math/MathML'><mrow><mrow><mo stretchy="false">(</mo><mi>i</mi><menclose notation="updiagonalstrike"><mi>D</mi></menclose><mo>+</mo><mi>m</mi><mo stretchy="false">)</mo><mi>&psi;</mi><mo>=</mo><mn>0</mn></mrow></mrow></math></p>
+
+ <p><math xmlns='http://www.w3.org/1998/Math/MathML'><mrow><mrow><mo stretchy="false">(</mo><mi>i</mi><menclose notation="updiagonalstrike"><mi>D</mi></menclose><mo>+</mo><mi>m</mi><mo stretchy="false">)</mo><mi>&psi;</mi><mo>=</mo><mn>0</mn></mrow></mrow></math></p>
+
+ <p><math xmlns='http://www.w3.org/1998/Math/MathML'><mrow><mo stretchy="false">(</mo><mi>i</mi><mi>D</mi><mo>+</mo><mi>m</mi><mo stretchy="false">)</mo><mi>&psi;</mi><mo>=</mo><mn>0</mn></mrow></math></p>
+
+ <p><math xmlns='http://www.w3.org/1998/Math/MathML'><mrow><mrow><mo stretchy="false">(</mo><mi>i</mi><menclose notation="updiagonalstrike"><mi>D</mi></menclose><mo>+</mo><mi>m</mi><mo stretchy="false">)</mo><mi>&psi;</mi><mo mathcolor="red">=</mo><mn>0</mn></mrow></mrow></math></p>
+
+ </body>
+</html>
</ins></span></pre></div>
<a id="trunkLayoutTestsmathmlpresentationbug160077html"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/mathml/presentation/bug160077.html (0 => 203639)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/mathml/presentation/bug160077.html (rev 0)
+++ trunk/LayoutTests/mathml/presentation/bug160077.html 2016-07-23 08:19:57 UTC (rev 203639)
</span><span class="lines">@@ -0,0 +1,13 @@
</span><ins>+<html>
+ <body onload="document.body.style.fontSize='300%'">
+
+ <p><math xmlns='http://www.w3.org/1998/Math/MathML'><mrow><mrow><mo stretchy="false">(</mo><mi>i</mi><menclose notation="updiagonalstrike"><mi>D</mi></menclose><mo>+</mo><mi>m</mi><mo stretchy="false">)</mo><mi>&psi;</mi><mo>=</mo><mn>0</mn></mrow></mrow></math></p>
+
+ <p><math xmlns='http://www.w3.org/1998/Math/MathML'><mrow><mrow><mo stretchy="false">(</mo><mi>i</mi><menclose notation="updiagonalstrike"><mi>D</mi></menclose><mo>+</mo><mi>m</mi><mo stretchy="false">)</mo><mi>&psi;</mi><mo>=</mo><mn>0</mn></mrow></mrow></math></p>
+
+ <p><math xmlns='http://www.w3.org/1998/Math/MathML'><mrow><mo stretchy="false">(</mo><mi>i</mi><mi>D</mi><mo>+</mo><mi>m</mi><mo stretchy="false">)</mo><mi>&psi;</mi><mo>=</mo><mn>0</mn></mrow></math></p>
+
+ <p><math xmlns='http://www.w3.org/1998/Math/MathML'><mrow><mrow><mo stretchy="false">(</mo><mi>i</mi><menclose notation="updiagonalstrike"><mi>D</mi></menclose><mo>+</mo><mi>m</mi><mo stretchy="false">)</mo><mi>&psi;</mi><mo>=</mo><mn>0</mn></mrow></mrow></math></p>
+
+ </body>
+</html>
</ins></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (203638 => 203639)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-07-23 08:07:58 UTC (rev 203638)
+++ trunk/Source/WebCore/ChangeLog 2016-07-23 08:19:57 UTC (rev 203639)
</span><span class="lines">@@ -1,3 +1,22 @@
</span><ins>+2016-07-23 Frederic Wang <fwang@igalia.com>
+
+ [MathML] PaintInfo state is not properly restored after applyTransform.
+ https://bugs.webkit.org/show_bug.cgi?id=160077
+
+ Reviewed by Simon Fraser.
+
+ PaintInfo::applyTransform modifies PaintInfo::rect and the original state is not properly
+ restored by GraphicsContextStateSaver. To avoid some weird rendering bugs in MathOperator
+ and RenderMathMLMenclose, we follow what is done in SVG renderers and make a copy of the
+ original PaintInfo before applying the transform.
+
+ Test: mathml/presentation/bug160077.html
+
+ * rendering/mathml/MathOperator.cpp:
+ (WebCore::MathOperator::paint):
+ * rendering/mathml/RenderMathMLMenclose.cpp:
+ (WebCore::RenderMathMLMenclose::paint):
+
</ins><span class="cx"> 2016-07-23 Youenn Fablet <youenn@apple.com>
</span><span class="cx">
</span><span class="cx"> [Fetch API] Fetch response stream should enqueue Uint8Array
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingmathmlMathOperatorcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/mathml/MathOperator.cpp (203638 => 203639)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/mathml/MathOperator.cpp 2016-07-23 08:07:58 UTC (rev 203638)
+++ trunk/Source/WebCore/rendering/mathml/MathOperator.cpp 2016-07-23 08:19:57 UTC (rev 203639)
</span><span class="lines">@@ -600,8 +600,10 @@
</span><span class="cx"> if (info.context().paintingDisabled() || info.phase != PaintPhaseForeground || style.visibility() != VISIBLE)
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- GraphicsContextStateSaver stateSaver(info.context());
- info.context().setFillColor(style.visitedDependentColor(CSSPropertyColor));
</del><ins>+ // Make a copy of the PaintInfo because applyTransform will modify its rect.
+ PaintInfo paintInfo(info);
+ GraphicsContextStateSaver stateSaver(paintInfo.context());
+ paintInfo.context().setFillColor(style.visitedDependentColor(CSSPropertyColor));
</ins><span class="cx">
</span><span class="cx"> // For a radical character, we may need some scale transform to stretch it vertically or mirror it.
</span><span class="cx"> if (m_baseCharacter == kRadicalOperator) {
</span><span class="lines">@@ -609,7 +611,7 @@
</span><span class="cx"> if (radicalHorizontalScale == -1 || m_radicalVerticalScale > 1) {
</span><span class="cx"> LayoutPoint scaleOrigin = paintOffset;
</span><span class="cx"> scaleOrigin.move(m_width / 2, 0);
</span><del>- info.applyTransform(AffineTransform().translate(scaleOrigin).scale(radicalHorizontalScale, m_radicalVerticalScale).translate(-scaleOrigin));
</del><ins>+ paintInfo.applyTransform(AffineTransform().translate(scaleOrigin).scale(radicalHorizontalScale, m_radicalVerticalScale).translate(-scaleOrigin));
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -635,7 +637,7 @@
</span><span class="cx"> LayoutPoint operatorTopLeft = paintOffset;
</span><span class="cx"> FloatRect glyphBounds = boundsForGlyph(glyphData);
</span><span class="cx"> LayoutPoint operatorOrigin(operatorTopLeft.x(), operatorTopLeft.y() - glyphBounds.y());
</span><del>- info.context().drawGlyphs(style.fontCascade(), *glyphData.font, buffer, 0, 1, operatorOrigin);
</del><ins>+ paintInfo.context().drawGlyphs(style.fontCascade(), *glyphData.font, buffer, 0, 1, operatorOrigin);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingmathmlRenderMathMLMenclosecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/mathml/RenderMathMLMenclose.cpp (203638 => 203639)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/mathml/RenderMathMLMenclose.cpp 2016-07-23 08:07:58 UTC (rev 203638)
+++ trunk/Source/WebCore/rendering/mathml/RenderMathMLMenclose.cpp 2016-07-23 08:19:57 UTC (rev 203639)
</span><span class="lines">@@ -211,14 +211,17 @@
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> LayoutUnit thickness = ruleThickness();
</span><del>- GraphicsContextStateSaver stateSaver(info.context());
</del><span class="cx">
</span><del>- info.context().setStrokeThickness(thickness);
- info.context().setStrokeStyle(SolidStroke);
- info.context().setStrokeColor(style().visitedDependentColor(CSSPropertyColor));
- info.context().setFillColor(Color::transparent);
- info.applyTransform(AffineTransform().translate(paintOffset + location()));
</del><ins>+ // Make a copy of the PaintInfo because applyTransform will modify its rect.
+ PaintInfo paintInfo(info);
+ GraphicsContextStateSaver stateSaver(paintInfo.context());
</ins><span class="cx">
</span><ins>+ paintInfo.context().setStrokeThickness(thickness);
+ paintInfo.context().setStrokeStyle(SolidStroke);
+ paintInfo.context().setStrokeColor(style().visitedDependentColor(CSSPropertyColor));
+ paintInfo.context().setFillColor(Color::transparent);
+ paintInfo.applyTransform(AffineTransform().translate(paintOffset + location()));
+
</ins><span class="cx"> // In the MathML in HTML5 implementation note, the "left" notation is described as follows:
</span><span class="cx"> // - center of the left vertical bar is at 3\xi_8 padding + \xi_8 border/2 = 7\xi_8/2
</span><span class="cx"> // - top space is Overbar Vertical Gap + Overbar Rule Thickness = 3\xi_8 + \xi_8 = 4\xi_8
</span><span class="lines">@@ -296,7 +299,7 @@
</span><span class="cx"> roundedRect.inflate(7 * thickness / 2);
</span><span class="cx"> Path path;
</span><span class="cx"> path.addRoundedRect(roundedRect);
</span><del>- info.context().strokePath(path);
</del><ins>+ paintInfo.context().strokePath(path);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // For longdiv, we use our own rules for now:
</span><span class="lines">@@ -322,7 +325,7 @@
</span><span class="cx"> path.moveTo(LayoutPoint(right, top));
</span><span class="cx"> path.addLineTo(LayoutPoint(left, top));
</span><span class="cx"> path.addQuadCurveTo(LayoutPoint(midX, midY), FloatPoint(left, bottom));
</span><del>- info.context().strokePath(path);
</del><ins>+ paintInfo.context().strokePath(path);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // In the MathML in HTML5 implementation note, the "circle" notation is described as follows:
</span><span class="lines">@@ -337,7 +340,7 @@
</span><span class="cx"> ellipseRect.setY(m_contentRect.y() - (ellipseRect.height() - m_contentRect.height()) / 2);
</span><span class="cx"> Path path;
</span><span class="cx"> path.addEllipse(ellipseRect);
</span><del>- info.context().strokePath(path);
</del><ins>+ paintInfo.context().strokePath(path);
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>