<!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>[205018] 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/205018">205018</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2016-08-26 09:41:48 -0700 (Fri, 26 Aug 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>The annotation-xml element does not need to be behave as an mrow
https://bugs.webkit.org/show_bug.cgi?id=161230
Patch by Frederic Wang <fwang@igalia.com> on 2016-08-26
Reviewed by Manuel Rego Casasnovas.
Source/WebCore:
In <a href="http://trac.webkit.org/projects/webkit/changeset/204779">r204779</a>, MathMLAnnotationElement was made a MathMLRowElement just because the
annotation-xml element is generating a RenderMathMLRow. This later point is actually not
needed since annotation-xml is just a wrapper for foreign elements and so does not need to
handle special MathML features like operator spacing or stretching. We can thus move back
MathMLAnnotationElement to a generic MathMLPresentationElement and instead make the
annotation-xml element generate a generic RenderMathMLBlock renderer.
No new tests, semantics annotations already covered by existing tests.
* mathml/MathMLAnnotationElement.cpp: Replace RenderMathMLRow.h with RenderMathMLBlock.h
(WebCore::MathMLAnnotationElement::MathMLAnnotationElement): Inherit from
MathMLPresentationElement instead of MathMLRowElement.
(WebCore::MathMLAnnotationElement::createElementRenderer): Make annotation-xml create a
RenderMathMLBlock instead of a RenderMathMLRow.
(WebCore::MathMLAnnotationElement::attributeChanged): Inherit from MathMLPresentationElement
instead of MathMLRowElement.
* mathml/MathMLAnnotationElement.h: Ditto.
LayoutTests:
* platform/efl/accessibility/math-foreign-content-expected.txt: Remove the AXGroup from the
test expectation, which that was used for annotation-xml.
* platform/gtk/accessibility/math-foreign-content-expected.txt: Ditto.
* platform/mac/accessibility/math-foreign-content-expected.txt: Ditto.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsplatformeflaccessibilitymathforeigncontentexpectedtxt">trunk/LayoutTests/platform/efl/accessibility/math-foreign-content-expected.txt</a></li>
<li><a href="#trunkLayoutTestsplatformgtkaccessibilitymathforeigncontentexpectedtxt">trunk/LayoutTests/platform/gtk/accessibility/math-foreign-content-expected.txt</a></li>
<li><a href="#trunkLayoutTestsplatformmacaccessibilitymathforeigncontentexpectedtxt">trunk/LayoutTests/platform/mac/accessibility/math-foreign-content-expected.txt</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoremathmlMathMLAnnotationElementcpp">trunk/Source/WebCore/mathml/MathMLAnnotationElement.cpp</a></li>
<li><a href="#trunkSourceWebCoremathmlMathMLAnnotationElementh">trunk/Source/WebCore/mathml/MathMLAnnotationElement.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (205017 => 205018)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2016-08-26 16:36:29 UTC (rev 205017)
+++ trunk/LayoutTests/ChangeLog 2016-08-26 16:41:48 UTC (rev 205018)
</span><span class="lines">@@ -1,3 +1,15 @@
</span><ins>+2016-08-26 Frederic Wang <fwang@igalia.com>
+
+ The annotation-xml element does not need to be behave as an mrow
+ https://bugs.webkit.org/show_bug.cgi?id=161230
+
+ Reviewed by Manuel Rego Casasnovas.
+
+ * platform/efl/accessibility/math-foreign-content-expected.txt: Remove the AXGroup from the
+ test expectation, which that was used for annotation-xml.
+ * platform/gtk/accessibility/math-foreign-content-expected.txt: Ditto.
+ * platform/mac/accessibility/math-foreign-content-expected.txt: Ditto.
+
</ins><span class="cx"> 2016-08-26 Alexey Proskuryakov <ap@apple.com>
</span><span class="cx">
</span><span class="cx"> Reinstate flakiness expectations for viewport tests, as they are still flaky.
</span></span></pre></div>
<a id="trunkLayoutTestsplatformeflaccessibilitymathforeigncontentexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/efl/accessibility/math-foreign-content-expected.txt (205017 => 205018)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/efl/accessibility/math-foreign-content-expected.txt 2016-08-26 16:36:29 UTC (rev 205017)
+++ trunk/LayoutTests/platform/efl/accessibility/math-foreign-content-expected.txt 2016-08-26 16:41:48 UTC (rev 205018)
</span><span class="lines">@@ -5,8 +5,7 @@
</span><span class="cx">
</span><span class="cx"> AXRole: AXMath
</span><span class="cx"> AXRole: AXGroup
</span><del>- AXRole: AXGroup
- AXRole: AXSection AXValue: SVG
</del><ins>+ AXRole: AXSection AXValue: SVG
</ins><span class="cx"> AXRole: AXStatic AXValue: HTML
</span><span class="cx"> PASS successfullyParsed is true
</span><span class="cx">
</span></span></pre></div>
<a id="trunkLayoutTestsplatformgtkaccessibilitymathforeigncontentexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/gtk/accessibility/math-foreign-content-expected.txt (205017 => 205018)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/gtk/accessibility/math-foreign-content-expected.txt 2016-08-26 16:36:29 UTC (rev 205017)
+++ trunk/LayoutTests/platform/gtk/accessibility/math-foreign-content-expected.txt 2016-08-26 16:41:48 UTC (rev 205018)
</span><span class="lines">@@ -5,8 +5,7 @@
</span><span class="cx">
</span><span class="cx"> AXRole: AXMath
</span><span class="cx"> AXRole: AXGroup
</span><del>- AXRole: AXGroup
- AXRole: AXSection AXValue: SVG
</del><ins>+ AXRole: AXSection AXValue: SVG
</ins><span class="cx"> AXRole: AXStatic AXValue: HTML
</span><span class="cx"> PASS successfullyParsed is true
</span><span class="cx">
</span></span></pre></div>
<a id="trunkLayoutTestsplatformmacaccessibilitymathforeigncontentexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/mac/accessibility/math-foreign-content-expected.txt (205017 => 205018)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac/accessibility/math-foreign-content-expected.txt 2016-08-26 16:36:29 UTC (rev 205017)
+++ trunk/LayoutTests/platform/mac/accessibility/math-foreign-content-expected.txt 2016-08-26 16:41:48 UTC (rev 205018)
</span><span class="lines">@@ -5,9 +5,8 @@
</span><span class="cx">
</span><span class="cx"> AXRole: AXGroup AXSubrole: AXDocumentMath AXValue:
</span><span class="cx"> AXRole: AXGroup AXSubrole: AXMathRow AXValue:
</span><del>- AXRole: AXGroup AXSubrole: AXMathRow AXValue:
- AXRole: AXGroup AXSubrole: AXValue:
- AXRole: AXStaticText AXSubrole: AXValue: SVG
</del><ins>+ AXRole: AXGroup AXSubrole: AXValue:
+ AXRole: AXStaticText AXSubrole: AXValue: SVG
</ins><span class="cx"> AXRole: AXGroup AXSubrole: AXMathText AXValue:
</span><span class="cx"> AXRole: AXStaticText AXSubrole: AXValue: HTML
</span><span class="cx"> PASS successfullyParsed is true
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (205017 => 205018)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-08-26 16:36:29 UTC (rev 205017)
+++ trunk/Source/WebCore/ChangeLog 2016-08-26 16:41:48 UTC (rev 205018)
</span><span class="lines">@@ -1,3 +1,28 @@
</span><ins>+2016-08-26 Frederic Wang <fwang@igalia.com>
+
+ The annotation-xml element does not need to be behave as an mrow
+ https://bugs.webkit.org/show_bug.cgi?id=161230
+
+ Reviewed by Manuel Rego Casasnovas.
+
+ In r204779, MathMLAnnotationElement was made a MathMLRowElement just because the
+ annotation-xml element is generating a RenderMathMLRow. This later point is actually not
+ needed since annotation-xml is just a wrapper for foreign elements and so does not need to
+ handle special MathML features like operator spacing or stretching. We can thus move back
+ MathMLAnnotationElement to a generic MathMLPresentationElement and instead make the
+ annotation-xml element generate a generic RenderMathMLBlock renderer.
+
+ No new tests, semantics annotations already covered by existing tests.
+
+ * mathml/MathMLAnnotationElement.cpp: Replace RenderMathMLRow.h with RenderMathMLBlock.h
+ (WebCore::MathMLAnnotationElement::MathMLAnnotationElement): Inherit from
+ MathMLPresentationElement instead of MathMLRowElement.
+ (WebCore::MathMLAnnotationElement::createElementRenderer): Make annotation-xml create a
+ RenderMathMLBlock instead of a RenderMathMLRow.
+ (WebCore::MathMLAnnotationElement::attributeChanged): Inherit from MathMLPresentationElement
+ instead of MathMLRowElement.
+ * mathml/MathMLAnnotationElement.h: Ditto.
+
</ins><span class="cx"> 2016-08-26 Csaba Osztrogonác <ossy@webkit.org>
</span><span class="cx">
</span><span class="cx"> Typo fix after r56209
</span></span></pre></div>
<a id="trunkSourceWebCoremathmlMathMLAnnotationElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/mathml/MathMLAnnotationElement.cpp (205017 => 205018)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/mathml/MathMLAnnotationElement.cpp 2016-08-26 16:36:29 UTC (rev 205017)
+++ trunk/Source/WebCore/mathml/MathMLAnnotationElement.cpp 2016-08-26 16:41:48 UTC (rev 205018)
</span><span class="lines">@@ -33,7 +33,7 @@
</span><span class="cx"> #include "MathMLMathElement.h"
</span><span class="cx"> #include "MathMLNames.h"
</span><span class="cx"> #include "MathMLSelectElement.h"
</span><del>-#include "RenderMathMLRow.h"
</del><ins>+#include "RenderMathMLBlock.h"
</ins><span class="cx"> #include "SVGSVGElement.h"
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="lines">@@ -41,7 +41,7 @@
</span><span class="cx"> using namespace MathMLNames;
</span><span class="cx">
</span><span class="cx"> MathMLAnnotationElement::MathMLAnnotationElement(const QualifiedName& tagName, Document& document)
</span><del>- : MathMLRowElement(tagName, document)
</del><ins>+ : MathMLPresentationElement(tagName, document)
</ins><span class="cx"> {
</span><span class="cx"> ASSERT(hasTagName(annotationTag) || hasTagName(annotation_xmlTag));
</span><span class="cx"> }
</span><span class="lines">@@ -56,9 +56,8 @@
</span><span class="cx"> if (hasTagName(MathMLNames::annotationTag))
</span><span class="cx"> return MathMLElement::createElementRenderer(WTFMove(style), insertionPosition);
</span><span class="cx">
</span><del>- // FIXME: Do we really need to create a RenderMathMLRow?
</del><span class="cx"> ASSERT(hasTagName(annotation_xmlTag));
</span><del>- return createRenderer<RenderMathMLRow>(*this, WTFMove(style));
</del><ins>+ return createRenderer<RenderMathMLBlock>(*this, WTFMove(style));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool MathMLAnnotationElement::childShouldCreateRenderer(const Node& child) const
</span><span class="lines">@@ -100,7 +99,7 @@
</span><span class="cx"> if (is<MathMLElement>(parent) && parent->hasTagName(semanticsTag))
</span><span class="cx"> downcast<MathMLElement>(*parent).updateSelectedChild();
</span><span class="cx"> }
</span><del>- MathMLRowElement::attributeChanged(name, oldValue, newValue, reason);
</del><ins>+ MathMLPresentationElement::attributeChanged(name, oldValue, newValue, reason);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoremathmlMathMLAnnotationElementh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/mathml/MathMLAnnotationElement.h (205017 => 205018)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/mathml/MathMLAnnotationElement.h 2016-08-26 16:36:29 UTC (rev 205017)
+++ trunk/Source/WebCore/mathml/MathMLAnnotationElement.h 2016-08-26 16:41:48 UTC (rev 205018)
</span><span class="lines">@@ -27,11 +27,11 @@
</span><span class="cx">
</span><span class="cx"> #if ENABLE(MATHML)
</span><span class="cx">
</span><del>-#include "MathMLRowElement.h"
</del><ins>+#include "MathMLPresentationElement.h"
</ins><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><del>-class MathMLAnnotationElement final : public MathMLRowElement {
</del><ins>+class MathMLAnnotationElement final : public MathMLPresentationElement {
</ins><span class="cx"> public:
</span><span class="cx"> static Ref<MathMLAnnotationElement> create(const QualifiedName& tagName, Document&);
</span><span class="cx"> private:
</span></span></pre>
</div>
</div>
</body>
</html>