<!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>[163543] 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/163543">163543</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2014-02-06 10:04:41 -0800 (Thu, 06 Feb 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Menclose with no notation attribute does not display anything.
https://bugs.webkit.org/show_bug.cgi?id=127889
Patch by Gurpreet Kaur <k.gurpreet@samsung.com> on 2014-02-06
Reviewed by Chris Fleizach.
Source/WebCore:
Menclose with no notation attribute should behave same as menclose with
notation attribute with value as longdiv. By default the division
symbol should be displayed. For empty and invalid notation attribute
nothing should be displayed.
Tests: mathml/presentation/menclose-notation-default-longdiv.html
mathml/presentation/menclose-notation-invalid-empty.html
* mathml/MathMLMencloseElement.h:
* rendering/mathml/RenderMathMLMenclose.cpp:
(WebCore::RenderMathMLMenclose::computePreferredLogicalWidths):
(WebCore::RenderMathMLMenclose::paint):
Added style for menclose with no notation attribute and handled this
condition in paint also where for longdiv we are explicitly drawing
the division symbol.
LayoutTests:
* mathml/presentation/menclose-notation-default-longdiv.html: Added.
* mathml/presentation/menclose-notation-invalid-empty-expected.html: Added.
* mathml/presentation/menclose-notation-invalid-empty.html: Added.
* platform/efl/mathml/presentation/menclose-notation-default-longdiv-expected.png: Added.
* platform/efl/mathml/presentation/menclose-notation-default-longdiv-expected.txt: Added.
* platform/gtk/mathml/presentation/menclose-notation-default-longdiv-expected.png: Added.
* platform/gtk/mathml/presentation/menclose-notation-default-longdiv-expected.txt: Added.
* platform/mac/mathml/presentation/menclose-notation-default-longdiv-expected.png: Added.
* platform/mac/mathml/presentation/menclose-notation-default-longdiv-expected.txt: Added.
Added new test cases to test the functionality of menclose with no
notation attribute, invalid and empty notation attribute.</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="#trunkSourceWebCoremathmlMathMLMencloseElementh">trunk/Source/WebCore/mathml/MathMLMencloseElement.h</a></li>
<li><a href="#trunkSourceWebCorerenderingmathmlRenderMathMLMenclosecpp">trunk/Source/WebCore/rendering/mathml/RenderMathMLMenclose.cpp</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsmathmlpresentationmenclosenotationdefaultlongdivhtml">trunk/LayoutTests/mathml/presentation/menclose-notation-default-longdiv.html</a></li>
<li><a href="#trunkLayoutTestsmathmlpresentationmenclosenotationinvalidemptyexpectedhtml">trunk/LayoutTests/mathml/presentation/menclose-notation-invalid-empty-expected.html</a></li>
<li><a href="#trunkLayoutTestsmathmlpresentationmenclosenotationinvalidemptyhtml">trunk/LayoutTests/mathml/presentation/menclose-notation-invalid-empty.html</a></li>
<li><a href="#trunkLayoutTestsplatformeflmathmlpresentationmenclosenotationdefaultlongdivexpectedpng">trunk/LayoutTests/platform/efl/mathml/presentation/menclose-notation-default-longdiv-expected.png</a></li>
<li><a href="#trunkLayoutTestsplatformeflmathmlpresentationmenclosenotationdefaultlongdivexpectedtxt">trunk/LayoutTests/platform/efl/mathml/presentation/menclose-notation-default-longdiv-expected.txt</a></li>
<li><a href="#trunkLayoutTestsplatformgtkmathmlpresentationmenclosenotationdefaultlongdivexpectedpng">trunk/LayoutTests/platform/gtk/mathml/presentation/menclose-notation-default-longdiv-expected.png</a></li>
<li><a href="#trunkLayoutTestsplatformgtkmathmlpresentationmenclosenotationdefaultlongdivexpectedtxt">trunk/LayoutTests/platform/gtk/mathml/presentation/menclose-notation-default-longdiv-expected.txt</a></li>
<li><a href="#trunkLayoutTestsplatformmacmathmlpresentationmenclosenotationdefaultlongdivexpectedpng">trunk/LayoutTests/platform/mac/mathml/presentation/menclose-notation-default-longdiv-expected.png</a></li>
<li><a href="#trunkLayoutTestsplatformmacmathmlpresentationmenclosenotationdefaultlongdivexpectedtxt">trunk/LayoutTests/platform/mac/mathml/presentation/menclose-notation-default-longdiv-expected.txt</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (163542 => 163543)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2014-02-06 17:59:05 UTC (rev 163542)
+++ trunk/LayoutTests/ChangeLog 2014-02-06 18:04:41 UTC (rev 163543)
</span><span class="lines">@@ -1,3 +1,22 @@
</span><ins>+2014-02-06 Gurpreet Kaur <k.gurpreet@samsung.com>
+
+ Menclose with no notation attribute does not display anything.
+ https://bugs.webkit.org/show_bug.cgi?id=127889
+
+ Reviewed by Chris Fleizach.
+
+ * mathml/presentation/menclose-notation-default-longdiv.html: Added.
+ * mathml/presentation/menclose-notation-invalid-empty-expected.html: Added.
+ * mathml/presentation/menclose-notation-invalid-empty.html: Added.
+ * platform/efl/mathml/presentation/menclose-notation-default-longdiv-expected.png: Added.
+ * platform/efl/mathml/presentation/menclose-notation-default-longdiv-expected.txt: Added.
+ * platform/gtk/mathml/presentation/menclose-notation-default-longdiv-expected.png: Added.
+ * platform/gtk/mathml/presentation/menclose-notation-default-longdiv-expected.txt: Added.
+ * platform/mac/mathml/presentation/menclose-notation-default-longdiv-expected.png: Added.
+ * platform/mac/mathml/presentation/menclose-notation-default-longdiv-expected.txt: Added.
+ Added new test cases to test the functionality of menclose with no
+ notation attribute, invalid and empty notation attribute.
+
</ins><span class="cx"> 2014-02-06 Alexey Proskuryakov <ap@apple.com>
</span><span class="cx">
</span><span class="cx"> media/video-load-preload-metadata.html is flaky
</span></span></pre></div>
<a id="trunkLayoutTestsmathmlpresentationmenclosenotationdefaultlongdivhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/mathml/presentation/menclose-notation-default-longdiv.html (0 => 163543)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/mathml/presentation/menclose-notation-default-longdiv.html (rev 0)
+++ trunk/LayoutTests/mathml/presentation/menclose-notation-default-longdiv.html 2014-02-06 18:04:41 UTC (rev 163543)
</span><span class="lines">@@ -0,0 +1,11 @@
</span><ins>+<!DOCTYPE html>
+<html>
+ <head>
+ <title>menclose default notation longdiv test</title>
+ </head>
+ <body>
+ <p>
+ <math><mrow><menclose><mspace width="100px" height="50px" mathbackground="red"/></menclose></mrow></math>
+ </p>
+ </body>
+</html>
</ins><span class="cx">\ No newline at end of file
</span><span class="cx">Property changes on: trunk/LayoutTests/mathml/presentation/menclose-notation-default-longdiv.html
</span><span class="cx">___________________________________________________________________
</span></span></pre></div>
<a id="svnexecutable"></a>
<div class="addfile"><h4>Added: svn:executable</h4></div>
<a id="trunkLayoutTestsmathmlpresentationmenclosenotationinvalidemptyexpectedhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/mathml/presentation/menclose-notation-invalid-empty-expected.html (0 => 163543)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/mathml/presentation/menclose-notation-invalid-empty-expected.html (rev 0)
+++ trunk/LayoutTests/mathml/presentation/menclose-notation-invalid-empty-expected.html 2014-02-06 18:04:41 UTC (rev 163543)
</span><span class="lines">@@ -0,0 +1,16 @@
</span><ins>+<!DOCTYPE html>
+<html>
+ <head>
+ <title>expected test case for menclose with empty and invalid notation attribute</title>
+ </head>
+ <body>
+ <p>
+ <math>
+ <mtable>
+ <mtr><mtd><mspace width="100px" height="50px" mathbackground="red"/></mtd></mtr>
+ <mtr><mtd><mspace width="100px" height="50px" mathbackground="red"/></mtd></mtr>
+ </mtable>
+ </math>
+ </p>
+ </body>
+</html>
</ins><span class="cx">\ No newline at end of file
</span><span class="cx">Property changes on: trunk/LayoutTests/mathml/presentation/menclose-notation-invalid-empty-expected.html
</span><span class="cx">___________________________________________________________________
</span></span></pre></div>
<a id="svnexecutable"></a>
<div class="addfile"><h4>Added: svn:executable</h4></div>
<a id="trunkLayoutTestsmathmlpresentationmenclosenotationinvalidemptyhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/mathml/presentation/menclose-notation-invalid-empty.html (0 => 163543)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/mathml/presentation/menclose-notation-invalid-empty.html (rev 0)
+++ trunk/LayoutTests/mathml/presentation/menclose-notation-invalid-empty.html 2014-02-06 18:04:41 UTC (rev 163543)
</span><span class="lines">@@ -0,0 +1,16 @@
</span><ins>+<!DOCTYPE html>
+<html>
+ <head>
+ <title>menclose with empty and invalid notation attribute</title>
+ </head>
+ <body>
+ <p>
+ <math>
+ <mtable>
+ <mtr><mtd><menclose notation=""><mspace width="100px" height="50px" mathbackground="red"/></menclose></mtd></mtr>
+ <mtr><mtd><menclose notation="triangle"><mspace width="100px" height="50px" mathbackground="red"/></menclose></mtd></mtr>
+ </mtable>
+ </math>
+ </p>
+ </body>
+</html>
</ins><span class="cx">\ No newline at end of file
</span><span class="cx">Property changes on: trunk/LayoutTests/mathml/presentation/menclose-notation-invalid-empty.html
</span><span class="cx">___________________________________________________________________
</span></span></pre></div>
<a id="svnexecutable"></a>
<div class="addfile"><h4>Added: svn:executable</h4></div>
<a id="trunkLayoutTestsplatformeflmathmlpresentationmenclosenotationdefaultlongdivexpectedpng"></a>
<div class="binary"><h4>Added: trunk/LayoutTests/platform/efl/mathml/presentation/menclose-notation-default-longdiv-expected.png</h4>
<pre class="diff"><span>
<span class="cx">(Binary files differ)
</span></span></pre></div>
<span class="cx">Property changes on: trunk/LayoutTests/platform/efl/mathml/presentation/menclose-notation-default-longdiv-expected.png
</span><span class="cx">___________________________________________________________________
</span><a id="svnexecutable"></a>
<div class="addfile"><h4>Added: svn:executable</h4></div>
<a id="svnmimetype"></a>
<div class="addfile"><h4>Added: svn:mime-type</h4></div>
<a id="trunkLayoutTestsplatformeflmathmlpresentationmenclosenotationdefaultlongdivexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/platform/efl/mathml/presentation/menclose-notation-default-longdiv-expected.txt (0 => 163543)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/efl/mathml/presentation/menclose-notation-default-longdiv-expected.txt (rev 0)
+++ trunk/LayoutTests/platform/efl/mathml/presentation/menclose-notation-default-longdiv-expected.txt 2014-02-06 18:04:41 UTC (rev 163543)
</span><span class="lines">@@ -0,0 +1,11 @@
</span><ins>+layer at (0,0) size 800x600
+ RenderView at (0,0) size 800x600
+layer at (0,0) size 800x92
+ RenderBlock {HTML} at (0,0) size 800x92
+ RenderBody {BODY} at (8,16) size 784x60
+ RenderBlock {P} at (0,0) size 784x60
+ RenderMathMLMath {math} at (0,0) size 102x56 [padding: 0 1 0 1]
+ RenderMathMLRow {mrow} at (1,0) size 100x56
+ RenderMathMLMenclose {menclose} at (0,0) size 100x56 [padding: 6 0 0 5]
+ RenderMathMLSpace {mspace} at (5,6) size 100x50 [bgcolor=#FF0000]
+ RenderText {#text} at (0,0) size 0x0
</ins><span class="cx">Property changes on: trunk/LayoutTests/platform/efl/mathml/presentation/menclose-notation-default-longdiv-expected.txt
</span><span class="cx">___________________________________________________________________
</span></span></pre></div>
<a id="svnexecutable"></a>
<div class="addfile"><h4>Added: svn:executable</h4></div>
<a id="trunkLayoutTestsplatformgtkmathmlpresentationmenclosenotationdefaultlongdivexpectedpng"></a>
<div class="binary"><h4>Added: trunk/LayoutTests/platform/gtk/mathml/presentation/menclose-notation-default-longdiv-expected.png</h4>
<pre class="diff"><span>
<span class="cx">(Binary files differ)
</span></span></pre></div>
<span class="cx">Property changes on: trunk/LayoutTests/platform/gtk/mathml/presentation/menclose-notation-default-longdiv-expected.png
</span><span class="cx">___________________________________________________________________
</span><a id="svnexecutable"></a>
<div class="addfile"><h4>Added: svn:executable</h4></div>
<a id="svnmimetype"></a>
<div class="addfile"><h4>Added: svn:mime-type</h4></div>
<a id="trunkLayoutTestsplatformgtkmathmlpresentationmenclosenotationdefaultlongdivexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/platform/gtk/mathml/presentation/menclose-notation-default-longdiv-expected.txt (0 => 163543)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/gtk/mathml/presentation/menclose-notation-default-longdiv-expected.txt (rev 0)
+++ trunk/LayoutTests/platform/gtk/mathml/presentation/menclose-notation-default-longdiv-expected.txt 2014-02-06 18:04:41 UTC (rev 163543)
</span><span class="lines">@@ -0,0 +1,11 @@
</span><ins>+layer at (0,0) size 800x600
+ RenderView at (0,0) size 800x600
+layer at (0,0) size 800x92
+ RenderBlock {HTML} at (0,0) size 800x92
+ RenderBody {BODY} at (8,16) size 784x60
+ RenderBlock {P} at (0,0) size 784x60
+ RenderMathMLMath {math} at (0,0) size 102x56 [padding: 0 1 0 1]
+ RenderMathMLRow {mrow} at (1,0) size 100x56
+ RenderMathMLMenclose {menclose} at (0,0) size 100x56 [padding: 6 0 0 5]
+ RenderMathMLSpace {mspace} at (5,6) size 100x50 [bgcolor=#FF0000]
+ RenderText {#text} at (0,0) size 0x0
</ins><span class="cx">Property changes on: trunk/LayoutTests/platform/gtk/mathml/presentation/menclose-notation-default-longdiv-expected.txt
</span><span class="cx">___________________________________________________________________
</span></span></pre></div>
<a id="svnexecutable"></a>
<div class="addfile"><h4>Added: svn:executable</h4></div>
<a id="trunkLayoutTestsplatformmacmathmlpresentationmenclosenotationdefaultlongdivexpectedpng"></a>
<div class="binary"><h4>Added: trunk/LayoutTests/platform/mac/mathml/presentation/menclose-notation-default-longdiv-expected.png</h4>
<pre class="diff"><span>
<span class="cx">(Binary files differ)
</span></span></pre></div>
<span class="cx">Property changes on: trunk/LayoutTests/platform/mac/mathml/presentation/menclose-notation-default-longdiv-expected.png
</span><span class="cx">___________________________________________________________________
</span><a id="svnexecutable"></a>
<div class="addfile"><h4>Added: svn:executable</h4></div>
<a id="svnmimetype"></a>
<div class="addfile"><h4>Added: svn:mime-type</h4></div>
<a id="trunkLayoutTestsplatformmacmathmlpresentationmenclosenotationdefaultlongdivexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/platform/mac/mathml/presentation/menclose-notation-default-longdiv-expected.txt (0 => 163543)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac/mathml/presentation/menclose-notation-default-longdiv-expected.txt (rev 0)
+++ trunk/LayoutTests/platform/mac/mathml/presentation/menclose-notation-default-longdiv-expected.txt 2014-02-06 18:04:41 UTC (rev 163543)
</span><span class="lines">@@ -0,0 +1,11 @@
</span><ins>+layer at (0,0) size 800x600
+ RenderView at (0,0) size 800x600
+layer at (0,0) size 800x92
+ RenderBlock {HTML} at (0,0) size 800x92
+ RenderBody {BODY} at (8,16) size 784x60
+ RenderBlock {P} at (0,0) size 784x60
+ RenderMathMLMath {math} at (0,0) size 102x56 [padding: 0 1 0 1]
+ RenderMathMLRow {mrow} at (1,0) size 100x56
+ RenderMathMLMenclose {menclose} at (0,0) size 100x56 [padding: 6 0 0 5]
+ RenderMathMLSpace {mspace} at (5,6) size 100x50 [bgcolor=#FF0000]
+ RenderText {#text} at (0,0) size 0x0
</ins><span class="cx">Property changes on: trunk/LayoutTests/platform/mac/mathml/presentation/menclose-notation-default-longdiv-expected.txt
</span><span class="cx">___________________________________________________________________
</span></span></pre></div>
<a id="svnexecutable"></a>
<div class="addfile"><h4>Added: svn:executable</h4></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (163542 => 163543)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-02-06 17:59:05 UTC (rev 163542)
+++ trunk/Source/WebCore/ChangeLog 2014-02-06 18:04:41 UTC (rev 163543)
</span><span class="lines">@@ -1,3 +1,26 @@
</span><ins>+2014-02-06 Gurpreet Kaur <k.gurpreet@samsung.com>
+
+ Menclose with no notation attribute does not display anything.
+ https://bugs.webkit.org/show_bug.cgi?id=127889
+
+ Reviewed by Chris Fleizach.
+
+ Menclose with no notation attribute should behave same as menclose with
+ notation attribute with value as longdiv. By default the division
+ symbol should be displayed. For empty and invalid notation attribute
+ nothing should be displayed.
+
+ Tests: mathml/presentation/menclose-notation-default-longdiv.html
+ mathml/presentation/menclose-notation-invalid-empty.html
+
+ * mathml/MathMLMencloseElement.h:
+ * rendering/mathml/RenderMathMLMenclose.cpp:
+ (WebCore::RenderMathMLMenclose::computePreferredLogicalWidths):
+ (WebCore::RenderMathMLMenclose::paint):
+ Added style for menclose with no notation attribute and handled this
+ condition in paint also where for longdiv we are explicitly drawing
+ the division symbol.
+
</ins><span class="cx"> 2014-02-05 Mark Hahnenberg <mhahnenberg@apple.com>
</span><span class="cx">
</span><span class="cx"> Heap::writeBarrier shouldn't be static
</span></span></pre></div>
<a id="trunkSourceWebCoremathmlMathMLMencloseElementh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/mathml/MathMLMencloseElement.h (163542 => 163543)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/mathml/MathMLMencloseElement.h 2014-02-06 17:59:05 UTC (rev 163542)
+++ trunk/Source/WebCore/mathml/MathMLMencloseElement.h 2014-02-06 18:04:41 UTC (rev 163543)
</span><span class="lines">@@ -36,6 +36,8 @@
</span><span class="cx"> static PassRefPtr<MathMLMencloseElement> create(const QualifiedName& tagName, Document&);
</span><span class="cx"> const Vector<String>& notationValues() const { return m_notationValues; }
</span><span class="cx"> bool isRadical() const { return m_isRadicalValue; }
</span><ins>+ String longDivLeftPadding() const;
+ bool isDefaultLongDiv() const { return !hasAttribute(MathMLNames::notationAttr); }
</ins><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> MathMLMencloseElement(const QualifiedName&, Document&);
</span><span class="lines">@@ -43,7 +45,6 @@
</span><span class="cx"> virtual bool isPresentationAttribute(const QualifiedName&) const override;
</span><span class="cx"> virtual void collectStyleForPresentationAttribute(const QualifiedName&, const AtomicString&, MutableStyleProperties&) override;
</span><span class="cx"> virtual void finishParsingChildren() override;
</span><del>- String longDivLeftPadding() const;
</del><span class="cx">
</span><span class="cx"> Vector<String> m_notationValues;
</span><span class="cx"> bool m_isRadicalValue;
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingmathmlRenderMathMLMenclosecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/mathml/RenderMathMLMenclose.cpp (163542 => 163543)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/mathml/RenderMathMLMenclose.cpp 2014-02-06 17:59:05 UTC (rev 163542)
+++ trunk/Source/WebCore/rendering/mathml/RenderMathMLMenclose.cpp 2014-02-06 18:04:41 UTC (rev 163543)
</span><span class="lines">@@ -65,6 +65,7 @@
</span><span class="cx"> ASSERT(preferredLogicalWidthsDirty());
</span><span class="cx">
</span><span class="cx"> RenderMathMLBlock::computePreferredLogicalWidths();
</span><ins>+ const int paddingTop = 6;
</ins><span class="cx">
</span><span class="cx"> MathMLMencloseElement* menclose = toMathMLMencloseElement(element());
</span><span class="cx"> const Vector<String>& notationValues = menclose->notationValues();
</span><span class="lines">@@ -76,6 +77,10 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ if (menclose->isDefaultLongDiv()) {
+ style().setPaddingTop(Length(paddingTop, Fixed));
+ style().setPaddingLeft(Length(menclose->longDivLeftPadding().toInt(), Fixed));
+ }
</ins><span class="cx"> setPreferredLogicalWidthsDirty(false);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -99,8 +104,8 @@
</span><span class="cx"> MathMLMencloseElement* menclose = toMathMLMencloseElement(element());
</span><span class="cx"> const Vector<String>& notationValues = menclose->notationValues();
</span><span class="cx"> size_t notationalValueSize = notationValues.size();
</span><del>- bool isDefaultLongDiv = !notationalValueSize;
- if (notationalValueSize && checkNotationalValuesValidity(notationValues)) {
</del><ins>+ bool isDefaultLongDiv = menclose->isDefaultLongDiv();
+ if ((notationalValueSize && checkNotationalValuesValidity(notationValues)) || isDefaultLongDiv) {
</ins><span class="cx"> IntRect rect = absoluteBoundingBoxRect();
</span><span class="cx"> int left = rect.x();
</span><span class="cx"> int top = rect.y();
</span><span class="lines">@@ -140,6 +145,8 @@
</span><span class="cx"> midxPoint = style().paddingLeft().value();
</span><span class="cx"> root.addBezierCurveTo(FloatPoint(left, top), FloatPoint(left + midxPoint, top + halfboxHeight), FloatPoint(left, top + boxHeight));
</span><span class="cx"> info.context->strokePath(root);
</span><ins>+ if (isDefaultLongDiv)
+ info.context->drawLine(IntPoint(left, top), IntPoint(left + boxWidth + midxPoint, top));
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>