<!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>[166170] 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/166170">166170</a></dd>
<dt>Author</dt> <dd>fred.wang@free.fr</dd>
<dt>Date</dt> <dd>2014-03-24 09:27:19 -0700 (Mon, 24 Mar 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>[regression] background colors do not apply to <mo> elements.
https://bugs.webkit.org/show_bug.cgi?id=130470.
Source/WebCore:
Test: mathml/presentation/tokenElements-background-color.html
* rendering/mathml/RenderMathMLOperator.cpp:
(WebCore::RenderMathMLOperator::paint): always call the parent painting to draw the background.
(WebCore::RenderMathMLOperator::paintChildren): move the special case for invisible operator here.
LayoutTests:
* mathml/presentation/tokenElements-background-color.html: Added.
* mathml/presentation/tokenElements-background-color-expected.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="#trunkSourceWebCorerenderingmathmlRenderMathMLOperatorcpp">trunk/Source/WebCore/rendering/mathml/RenderMathMLOperator.cpp</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsmathmlpresentationtokenElementsbackgroundcolorexpectedhtml">trunk/LayoutTests/mathml/presentation/tokenElements-background-color-expected.html</a></li>
<li><a href="#trunkLayoutTestsmathmlpresentationtokenElementsbackgroundcolorhtml">trunk/LayoutTests/mathml/presentation/tokenElements-background-color.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (166169 => 166170)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2014-03-24 16:20:11 UTC (rev 166169)
+++ trunk/LayoutTests/ChangeLog 2014-03-24 16:27:19 UTC (rev 166170)
</span><span class="lines">@@ -1,3 +1,11 @@
</span><ins>+2014-03-24 Frédéric Wang <fred.wang@free.fr>
+
+ [regression] background colors do not apply to <mo> elements.
+ https://bugs.webkit.org/show_bug.cgi?id=130470.
+
+ * mathml/presentation/tokenElements-background-color.html: Added.
+ * mathml/presentation/tokenElements-background-color-expected.html: Added.
+
</ins><span class="cx"> 2014-03-24 Michał Pakuła vel Rutka <m.pakula@samsung.com>
</span><span class="cx">
</span><span class="cx"> Unreviewed EFL gardening
</span></span></pre></div>
<a id="trunkLayoutTestsmathmlpresentationtokenElementsbackgroundcolorexpectedhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/mathml/presentation/tokenElements-background-color-expected.html (0 => 166170)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/mathml/presentation/tokenElements-background-color-expected.html (rev 0)
+++ trunk/LayoutTests/mathml/presentation/tokenElements-background-color-expected.html 2014-03-24 16:27:19 UTC (rev 166170)
</span><span class="lines">@@ -0,0 +1,35 @@
</span><ins>+<!doctype html>
+<html>
+ <head>
+ <title>Token elements Background Color</title>
+ <meta charset="utf-8"/>
+ </head>
+ <body>
+ <style type="text/css">
+ math > mrow {
+ background: #faa;
+ }
+ math > mrow > mrow {
+ visibility: hidden;
+ }
+ </style>
+ </head>
+ <body>
+
+ <p>
+ <math>
+ <mrow><mrow><mtext>mtext</mtext></mrow></mrow>
+ <mrow><mrow><mo>mo</mo></mrow></mrow>
+ <mrow><mrow><mo>+</mo></mrow></mrow>
+ <mrow><mrow><mi>mi</mi></mrow></mrow>
+ <mrow><mrow><mi>m</mi></mrow></mrow>
+ <mrow><mrow><mn>mn</mn></mrow></mrow>
+ </math>
+ </p>
+
+ <p>
+ <math><mrow><mrow><mo minsize="4em">|</mo></mrow></mrow></math>
+ </p>
+
+ </body>
+</html>
</ins><span class="cx">Property changes on: trunk/LayoutTests/mathml/presentation/tokenElements-background-color-expected.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="trunkLayoutTestsmathmlpresentationtokenElementsbackgroundcolorhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/mathml/presentation/tokenElements-background-color.html (0 => 166170)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/mathml/presentation/tokenElements-background-color.html (rev 0)
+++ trunk/LayoutTests/mathml/presentation/tokenElements-background-color.html 2014-03-24 16:27:19 UTC (rev 166170)
</span><span class="lines">@@ -0,0 +1,39 @@
</span><ins>+<!doctype html>
+<html>
+ <head>
+ <title>Token elements Background Color</title>
+ <meta charset="utf-8"/>
+ </head>
+ <body>
+ <style type="text/css">
+ math {
+ color: #faa;
+ }
+ mo, mtext, mn, mi {
+ background: #faa;
+ }
+ </style>
+ </head>
+ <body>
+
+ <!-- We verify that token elements have a background color.
+ We use the same color for the foreground and background so the text should not be visible. However, the pink background should be painted. -->
+
+ <p>
+ <math>
+ <mtext>mtext</mtext>
+ <mo>mo</mo>
+ <mo>+</mo>
+ <mi>mi</mi>
+ <mi>m</mi>
+ <mn>mn</mn>
+ </math>
+ </p>
+
+ <!-- We also do the test for a stretchy operator. -->
+ <p>
+ <math><mrow><mrow><mo minsize="4em">|</mo></mrow></mrow></math>
+ </p>
+
+ </body>
+</html>
</ins><span class="cx">Property changes on: trunk/LayoutTests/mathml/presentation/tokenElements-background-color.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="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (166169 => 166170)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-03-24 16:20:11 UTC (rev 166169)
+++ trunk/Source/WebCore/ChangeLog 2014-03-24 16:27:19 UTC (rev 166170)
</span><span class="lines">@@ -1,5 +1,16 @@
</span><span class="cx"> 2014-03-24 Frédéric Wang <fred.wang@free.fr>
</span><span class="cx">
</span><ins>+ [regression] background colors do not apply to <mo> elements.
+ https://bugs.webkit.org/show_bug.cgi?id=130470.
+
+ Test: mathml/presentation/tokenElements-background-color.html
+
+ * rendering/mathml/RenderMathMLOperator.cpp:
+ (WebCore::RenderMathMLOperator::paint): always call the parent painting to draw the background.
+ (WebCore::RenderMathMLOperator::paintChildren): move the special case for invisible operator here.
+
+2014-03-24 Frédéric Wang <fred.wang@free.fr>
+
</ins><span class="cx"> Operator stretching: expose a math data API
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=130572
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingmathmlRenderMathMLOperatorcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/mathml/RenderMathMLOperator.cpp (166169 => 166170)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/mathml/RenderMathMLOperator.cpp 2014-03-24 16:20:11 UTC (rev 166169)
+++ trunk/Source/WebCore/rendering/mathml/RenderMathMLOperator.cpp 2014-03-24 16:27:19 UTC (rev 166170)
</span><span class="lines">@@ -1547,14 +1547,10 @@
</span><span class="cx">
</span><span class="cx"> void RenderMathMLOperator::paint(PaintInfo& info, const LayoutPoint& paintOffset)
</span><span class="cx"> {
</span><del>- // We skip painting for invisible operators too to avoid some "missing character" glyph to appear if appropriate math fonts are not available.
- if (info.context->paintingDisabled() || info.phase != PaintPhaseForeground || style().visibility() != VISIBLE || isInvisibleOperator())
- return;
</del><ins>+ RenderMathMLToken::paint(info, paintOffset);
</ins><span class="cx">
</span><del>- if (m_stretchyData.mode() == DrawNormal) {
- RenderMathMLToken::paint(info, paintOffset);
</del><ins>+ if (info.context->paintingDisabled() || info.phase != PaintPhaseForeground || style().visibility() != VISIBLE || m_stretchyData.mode() == DrawNormal)
</ins><span class="cx"> return;
</span><del>- }
</del><span class="cx">
</span><span class="cx"> // FIXME: This painting should work in RTL mode too (https://bugs.webkit.org/show_bug.cgi?id=123018).
</span><span class="cx">
</span><span class="lines">@@ -1593,7 +1589,8 @@
</span><span class="cx">
</span><span class="cx"> void RenderMathMLOperator::paintChildren(PaintInfo& paintInfo, const LayoutPoint& paintOffset, PaintInfo& paintInfoForChild, bool usePrintRect)
</span><span class="cx"> {
</span><del>- if (m_stretchyData.mode() != DrawNormal)
</del><ins>+ // We skip painting for invisible operators too to avoid some "missing character" glyph to appear if appropriate math fonts are not available.
+ if (m_stretchyData.mode() != DrawNormal || isInvisibleOperator())
</ins><span class="cx"> return;
</span><span class="cx"> RenderMathMLToken::paintChildren(paintInfo, paintOffset, paintInfoForChild, usePrintRect);
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>