<!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>[205133] trunk/Source/WebCore</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/205133">205133</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2016-08-29 12:07:22 -0700 (Mon, 29 Aug 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Use MathMLPresentationElement for all MathML presentation tags
https://bugs.webkit.org/show_bug.cgi?id=161297
Patch by Frederic Wang <fwang@igalia.com> on 2016-08-29
Reviewed by Darin Adler.
Some tabular MathML elements as well as unsupported presentation MathML markup currently
create a generic MathMLElement instance. We make them instead use the
MathMLPresentationElement class since they are presentation MathML elements. This also
allows to make MathMLElement::isPresentationMathML always return false.
No new tests, already covered by existing tests.
* mathml/MathMLElement.cpp:
(WebCore::MathMLElement::isPresentationMathML): Deleted. Moved into the header file.
* mathml/MathMLElement.h:
(WebCore::MathMLElement::isPresentationMathML): Make this always return false now that all
presentation markup are handled by MathMLPresentationElement.
* mathml/MathMLPresentationElement.cpp:
(WebCore::MathMLPresentationElement::createElementRenderer): Make the fallback always call
MathMLElement::createElementRenderer. This preserves the behavior for the new elements
handled here and does not affect the old ones (table is handled above while all the others
are already handled in the derived class).
* mathml/mathtags.in: Use MathMLPresentationElement for all MathML presentation tags.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoremathmlMathMLElementcpp">trunk/Source/WebCore/mathml/MathMLElement.cpp</a></li>
<li><a href="#trunkSourceWebCoremathmlMathMLElementh">trunk/Source/WebCore/mathml/MathMLElement.h</a></li>
<li><a href="#trunkSourceWebCoremathmlMathMLPresentationElementcpp">trunk/Source/WebCore/mathml/MathMLPresentationElement.cpp</a></li>
<li><a href="#trunkSourceWebCoremathmlmathtagsin">trunk/Source/WebCore/mathml/mathtags.in</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (205132 => 205133)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-08-29 18:54:38 UTC (rev 205132)
+++ trunk/Source/WebCore/ChangeLog 2016-08-29 19:07:22 UTC (rev 205133)
</span><span class="lines">@@ -1,3 +1,29 @@
</span><ins>+2016-08-29 Frederic Wang <fwang@igalia.com>
+
+ Use MathMLPresentationElement for all MathML presentation tags
+ https://bugs.webkit.org/show_bug.cgi?id=161297
+
+ Reviewed by Darin Adler.
+
+ Some tabular MathML elements as well as unsupported presentation MathML markup currently
+ create a generic MathMLElement instance. We make them instead use the
+ MathMLPresentationElement class since they are presentation MathML elements. This also
+ allows to make MathMLElement::isPresentationMathML always return false.
+
+ No new tests, already covered by existing tests.
+
+ * mathml/MathMLElement.cpp:
+ (WebCore::MathMLElement::isPresentationMathML): Deleted. Moved into the header file.
+ * mathml/MathMLElement.h:
+ (WebCore::MathMLElement::isPresentationMathML): Make this always return false now that all
+ presentation markup are handled by MathMLPresentationElement.
+ * mathml/MathMLPresentationElement.cpp:
+ (WebCore::MathMLPresentationElement::createElementRenderer): Make the fallback always call
+ MathMLElement::createElementRenderer. This preserves the behavior for the new elements
+ handled here and does not affect the old ones (table is handled above while all the others
+ are already handled in the derived class).
+ * mathml/mathtags.in: Use MathMLPresentationElement for all MathML presentation tags.
+
</ins><span class="cx"> 2016-08-29 Alex Christensen <achristensen@webkit.org>
</span><span class="cx">
</span><span class="cx"> API test URLParserTest.ParserFailures failing ASSERT_NOT_REACHED
</span></span></pre></div>
<a id="trunkSourceWebCoremathmlMathMLElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/mathml/MathMLElement.cpp (205132 => 205133)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/mathml/MathMLElement.cpp 2016-08-29 18:54:38 UTC (rev 205132)
+++ trunk/Source/WebCore/mathml/MathMLElement.cpp 2016-08-29 19:07:22 UTC (rev 205133)
</span><span class="lines">@@ -64,26 +64,6 @@
</span><span class="cx"> return adoptRef(*new MathMLElement(tagName, document));
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool MathMLElement::isPresentationMathML() const
-{
- return hasTagName(MathMLNames::mtrTag)
- || hasTagName(MathMLNames::mtdTag)
- || hasTagName(MathMLNames::maligngroupTag)
- || hasTagName(MathMLNames::malignmarkTag)
- || hasTagName(MathMLNames::mencloseTag)
- || hasTagName(MathMLNames::mglyphTag)
- || hasTagName(MathMLNames::mlabeledtrTag)
- || hasTagName(MathMLNames::mlongdivTag)
- || hasTagName(MathMLNames::mpaddedTag)
- || hasTagName(MathMLNames::msTag)
- || hasTagName(MathMLNames::mscarriesTag)
- || hasTagName(MathMLNames::mscarryTag)
- || hasTagName(MathMLNames::msgroupTag)
- || hasTagName(MathMLNames::mslineTag)
- || hasTagName(MathMLNames::msrowTag)
- || hasTagName(MathMLNames::mstackTag);
-}
-
</del><span class="cx"> bool MathMLElement::isPhrasingContent(const Node& node) const
</span><span class="cx"> {
</span><span class="cx"> // Phrasing content is described in the HTML 5 specification:
</span></span></pre></div>
<a id="trunkSourceWebCoremathmlMathMLElementh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/mathml/MathMLElement.h (205132 => 205133)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/mathml/MathMLElement.h 2016-08-29 18:54:38 UTC (rev 205132)
+++ trunk/Source/WebCore/mathml/MathMLElement.h 2016-08-29 19:07:22 UTC (rev 205133)
</span><span class="lines">@@ -44,7 +44,7 @@
</span><span class="cx">
</span><span class="cx"> virtual bool isMathMLToken() const { return false; }
</span><span class="cx"> virtual bool isSemanticAnnotation() const { return false; }
</span><del>- virtual bool isPresentationMathML() const;
</del><ins>+ virtual bool isPresentationMathML() const { return false; }
</ins><span class="cx">
</span><span class="cx"> bool hasTagName(const MathMLQualifiedName& name) const { return hasLocalName(name.localName()); }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoremathmlMathMLPresentationElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/mathml/MathMLPresentationElement.cpp (205132 => 205133)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/mathml/MathMLPresentationElement.cpp 2016-08-29 18:54:38 UTC (rev 205132)
+++ trunk/Source/WebCore/mathml/MathMLPresentationElement.cpp 2016-08-29 19:07:22 UTC (rev 205133)
</span><span class="lines">@@ -47,12 +47,12 @@
</span><span class="cx"> return adoptRef(*new MathMLPresentationElement(tagName, document));
</span><span class="cx"> }
</span><span class="cx">
</span><del>-RenderPtr<RenderElement> MathMLPresentationElement::createElementRenderer(RenderStyle&& style, const RenderTreePosition&)
</del><ins>+RenderPtr<RenderElement> MathMLPresentationElement::createElementRenderer(RenderStyle&& style, const RenderTreePosition& insertionPosition)
</ins><span class="cx"> {
</span><span class="cx"> if (hasTagName(mtableTag))
</span><span class="cx"> return createRenderer<RenderMathMLTable>(*this, WTFMove(style));
</span><span class="cx">
</span><del>- return createRenderer<RenderMathMLBlock>(*this, WTFMove(style));
</del><ins>+ return MathMLElement::createElementRenderer(WTFMove(style), insertionPosition);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool MathMLPresentationElement::acceptsDisplayStyleAttribute()
</span></span></pre></div>
<a id="trunkSourceWebCoremathmlmathtagsin"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/mathml/mathtags.in (205132 => 205133)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/mathml/mathtags.in 2016-08-29 18:54:38 UTC (rev 205132)
+++ trunk/Source/WebCore/mathml/mathtags.in 2016-08-29 19:07:22 UTC (rev 205133)
</span><span class="lines">@@ -29,8 +29,8 @@
</span><span class="cx"> msub interfaceName=MathMLScriptsElement
</span><span class="cx"> msup interfaceName=MathMLScriptsElement
</span><span class="cx"> mtable interfaceName=MathMLPresentationElement
</span><del>-mtr interfaceName=MathMLElement
-mtd interfaceName=MathMLElement
</del><ins>+mtr interfaceName=MathMLPresentationElement
+mtd interfaceName=MathMLPresentationElement
</ins><span class="cx"> mmultiscripts interfaceName=MathMLScriptsElement
</span><span class="cx"> mprescripts interfaceName=MathMLPresentationElement
</span><span class="cx"> menclose interfaceName=MathMLMencloseElement
</span><span class="lines">@@ -37,14 +37,14 @@
</span><span class="cx"> none interfaceName=MathMLPresentationElement
</span><span class="cx"> semantics interfaceName=MathMLSelectElement
</span><span class="cx">
</span><del>-maligngroup interfaceName=MathMLElement
-malignmark interfaceName=MathMLElement
-mglyph interfaceName=MathMLElement
-mlabeledtr interfaceName=MathMLElement
-mlongdiv interfaceName=MathMLElement
-mscarries interfaceName=MathMLElement
-mscarry interfaceName=MathMLElement
-msgroup interfaceName=MathMLElement
-msline interfaceName=MathMLElement
-msrow interfaceName=MathMLElement
-mstack interfaceName=MathMLElement
</del><ins>+maligngroup interfaceName=MathMLPresentationElement
+malignmark interfaceName=MathMLPresentationElement
+mglyph interfaceName=MathMLPresentationElement
+mlabeledtr interfaceName=MathMLPresentationElement
+mlongdiv interfaceName=MathMLPresentationElement
+mscarries interfaceName=MathMLPresentationElement
+mscarry interfaceName=MathMLPresentationElement
+msgroup interfaceName=MathMLPresentationElement
+msline interfaceName=MathMLPresentationElement
+msrow interfaceName=MathMLPresentationElement
+mstack interfaceName=MathMLPresentationElement
</ins></span></pre>
</div>
</div>
</body>
</html>