<!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>[176447] 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/176447">176447</a></dd>
<dt>Author</dt> <dd>cfleizach@apple.com</dd>
<dt>Date</dt> <dd>2014-11-21 07:55:01 -0800 (Fri, 21 Nov 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>AX: MathML expressions are misread by VoiceOver
https://bugs.webkit.org/show_bug.cgi?id=138948
Reviewed by Mario Sanchez Prada.
Source/WebCore:
The logic for deciding what's the radicand and an index was too tied to children placement.
We should instead pull directly from the source.
Test: platform/mac/accessibility/mathml-root.html
* accessibility/AccessibilityRenderObject.cpp:
(WebCore::AccessibilityRenderObject::mathRadicandObject):
(WebCore::AccessibilityRenderObject::mathRootIndexObject):
* rendering/mathml/RenderMathMLRoot.h:
LayoutTests:
* platform/mac/accessibility/mathml-root-expected.txt: Added.
* platform/mac/accessibility/mathml-root.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="#trunkSourceWebCoreaccessibilityAccessibilityRenderObjectcpp">trunk/Source/WebCore/accessibility/AccessibilityRenderObject.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingmathmlRenderMathMLRooth">trunk/Source/WebCore/rendering/mathml/RenderMathMLRoot.h</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsplatformmacaccessibilitymathmlrootexpectedtxt">trunk/LayoutTests/platform/mac/accessibility/mathml-root-expected.txt</a></li>
<li><a href="#trunkLayoutTestsplatformmacaccessibilitymathmlroothtml">trunk/LayoutTests/platform/mac/accessibility/mathml-root.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (176446 => 176447)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2014-11-21 15:26:06 UTC (rev 176446)
+++ trunk/LayoutTests/ChangeLog 2014-11-21 15:55:01 UTC (rev 176447)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2014-11-21 Chris Fleizach <cfleizach@apple.com>
+
+ AX: MathML expressions are misread by VoiceOver
+ https://bugs.webkit.org/show_bug.cgi?id=138948
+
+ Reviewed by Mario Sanchez Prada.
+
+ * platform/mac/accessibility/mathml-root-expected.txt: Added.
+ * platform/mac/accessibility/mathml-root.html: Added.
+
</ins><span class="cx"> 2014-11-20 Daniel Bates <dabates@apple.com>
</span><span class="cx">
</span><span class="cx"> [iOS] Skip some tests that fail with stderr
</span></span></pre></div>
<a id="trunkLayoutTestsplatformmacaccessibilitymathmlrootexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/platform/mac/accessibility/mathml-root-expected.txt (0 => 176447)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac/accessibility/mathml-root-expected.txt (rev 0)
+++ trunk/LayoutTests/platform/mac/accessibility/mathml-root-expected.txt 2014-11-21 15:55:01 UTC (rev 176447)
</span><span class="lines">@@ -0,0 +1,15 @@
</span><ins>+8
+3
+This tests ensures that both root index and radicand work in this case.
+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+
+PASS root.role is 'AXRole: AXGroup'
+PASS root.subrole is 'AXSubrole: AXMathRoot'
+PASS rootRadicand.childAtIndex(0).stringValue is 'AXValue: 8'
+PASS rootIndex.childAtIndex(0).stringValue is 'AXValue: 3'
+PASS successfullyParsed is true
+
+TEST COMPLETE
+
</ins></span></pre></div>
<a id="trunkLayoutTestsplatformmacaccessibilitymathmlroothtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/platform/mac/accessibility/mathml-root.html (0 => 176447)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac/accessibility/mathml-root.html (rev 0)
+++ trunk/LayoutTests/platform/mac/accessibility/mathml-root.html 2014-11-21 15:55:01 UTC (rev 176447)
</span><span class="lines">@@ -0,0 +1,29 @@
</span><ins>+<!DOCTYPE HTML>
+<html>
+<body>
+<script src="../../../resources/js-test-pre.js"></script>
+
+<math id="root"><mroot><mn>8</mn> <mn>3</mn></mroot></math>
+
+<div id="console"></div>
+<script>
+
+description("This tests ensures that both root index and radicand work in this case.")
+
+if (window.testRunner && window.accessibilityController) {
+
+ // Generic root
+ var root = accessibilityController.accessibleElementById("root").childAtIndex(0);
+ shouldBe("root.role", "'AXRole: AXGroup'");
+ shouldBe("root.subrole", "'AXSubrole: AXMathRoot'");
+ var rootIndex = root.uiElementAttributeValue("AXMathRootIndex");
+ var rootRadicand = root.uiElementAttributeValue("AXMathRootRadicand");
+ shouldBe("rootRadicand.childAtIndex(0).stringValue", "'AXValue: 8'");
+ shouldBe("rootIndex.childAtIndex(0).stringValue", "'AXValue: 3'");
+}
+
+</script>
+
+<script src="../../../resources/js-test-post.js"></script>
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (176446 => 176447)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-11-21 15:26:06 UTC (rev 176446)
+++ trunk/Source/WebCore/ChangeLog 2014-11-21 15:55:01 UTC (rev 176447)
</span><span class="lines">@@ -1,3 +1,20 @@
</span><ins>+2014-11-21 Chris Fleizach <cfleizach@apple.com>
+
+ AX: MathML expressions are misread by VoiceOver
+ https://bugs.webkit.org/show_bug.cgi?id=138948
+
+ Reviewed by Mario Sanchez Prada.
+
+ The logic for deciding what's the radicand and an index was too tied to children placement.
+ We should instead pull directly from the source.
+
+ Test: platform/mac/accessibility/mathml-root.html
+
+ * accessibility/AccessibilityRenderObject.cpp:
+ (WebCore::AccessibilityRenderObject::mathRadicandObject):
+ (WebCore::AccessibilityRenderObject::mathRootIndexObject):
+ * rendering/mathml/RenderMathMLRoot.h:
+
</ins><span class="cx"> 2014-11-20 Benjamin Poulain <bpoulain@apple.com>
</span><span class="cx">
</span><span class="cx"> Remove the remaining vestiges of minimal-ui
</span></span></pre></div>
<a id="trunkSourceWebCoreaccessibilityAccessibilityRenderObjectcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/accessibility/AccessibilityRenderObject.cpp (176446 => 176447)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/accessibility/AccessibilityRenderObject.cpp 2014-11-21 15:26:06 UTC (rev 176446)
+++ trunk/Source/WebCore/accessibility/AccessibilityRenderObject.cpp 2014-11-21 15:55:01 UTC (rev 176447)
</span><span class="lines">@@ -82,6 +82,7 @@
</span><span class="cx"> #include "RenderMathMLBlock.h"
</span><span class="cx"> #include "RenderMathMLFraction.h"
</span><span class="cx"> #include "RenderMathMLOperator.h"
</span><ins>+#include "RenderMathMLRoot.h"
</ins><span class="cx"> #include "RenderMenuList.h"
</span><span class="cx"> #include "RenderSVGRoot.h"
</span><span class="cx"> #include "RenderSVGShape.h"
</span><span class="lines">@@ -3623,27 +3624,26 @@
</span><span class="cx"> {
</span><span class="cx"> if (!isMathRoot())
</span><span class="cx"> return nullptr;
</span><del>-
- const auto& children = this->children();
- if (children.size() < 1)
- return 0;
-
- // The radicand is the value being rooted and must be listed first.
- return children[0].get();
</del><ins>+ RenderMathMLRoot* root = &downcast<RenderMathMLRoot>(*m_renderer);
+ AccessibilityObject* rootRadicandWrapper = axObjectCache()->getOrCreate(root->baseWrapper());
+ if (!rootRadicandWrapper)
+ return nullptr;
+ AccessibilityObject* rootRadicand = rootRadicandWrapper->children().first().get();
+ ASSERT(rootRadicand && children().contains(rootRadicand));
+ return rootRadicand;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> AccessibilityObject* AccessibilityRenderObject::mathRootIndexObject()
</span><span class="cx"> {
</span><span class="cx"> if (!isMathRoot())
</span><span class="cx"> return nullptr;
</span><del>-
- const auto& children = this->children();
- if (children.size() != 2)
</del><ins>+ RenderMathMLRoot* root = &downcast<RenderMathMLRoot>(*m_renderer);
+ AccessibilityObject* rootIndexWrapper = axObjectCache()->getOrCreate(root->indexWrapper());
+ if (!rootIndexWrapper)
</ins><span class="cx"> return nullptr;
</span><del>-
- // The index in a root is the value which determines if it's a square, cube, etc, root
- // and must be listed second.
- return children[1].get();
</del><ins>+ AccessibilityObject* rootIndex = rootIndexWrapper->children().first().get();
+ ASSERT(rootIndex && children().contains(rootIndex));
+ return rootIndex;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> AccessibilityObject* AccessibilityRenderObject::mathNumeratorObject()
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingmathmlRenderMathMLRooth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/mathml/RenderMathMLRoot.h (176446 => 176447)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/mathml/RenderMathMLRoot.h 2014-11-21 15:26:06 UTC (rev 176446)
+++ trunk/Source/WebCore/rendering/mathml/RenderMathMLRoot.h 2014-11-21 15:55:01 UTC (rev 176447)
</span><span class="lines">@@ -49,6 +49,9 @@
</span><span class="cx"> virtual void styleDidChange(StyleDifference, const RenderStyle* oldStyle) override;
</span><span class="cx"> virtual void updateFromElement() override;
</span><span class="cx">
</span><ins>+ RenderMathMLRootWrapper* baseWrapper() const;
+ RenderMathMLRootWrapper* indexWrapper() const;
+
</ins><span class="cx"> protected:
</span><span class="cx"> virtual void layout() override;
</span><span class="cx">
</span><span class="lines">@@ -61,9 +64,7 @@
</span><span class="cx"> void updateStyle();
</span><span class="cx"> void restructureWrappers();
</span><span class="cx">
</span><del>- RenderMathMLRootWrapper* baseWrapper() const;
</del><span class="cx"> RenderMathMLBlock* radicalWrapper() const;
</span><del>- RenderMathMLRootWrapper* indexWrapper() const;
</del><span class="cx"> RenderMathMLRadicalOperator* radicalOperator() const;
</span><span class="cx">
</span><span class="cx"> LayoutUnit m_verticalGap;
</span></span></pre>
</div>
</div>
</body>
</html>