<!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>[167011] 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/167011">167011</a></dd>
<dt>Author</dt> <dd>mario.prada@samsung.com</dd>
<dt>Date</dt> <dd>2014-04-09 08:05:58 -0700 (Wed, 09 Apr 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>[AX][GTK] No new lines in some AX tests output
https://bugs.webkit.org/show_bug.cgi?id=131294
Reviewed by Martin Robinson.
Source/WebCore:
Do not implement Hypetext or AtkText for the WebArea. Those
interfaces will be implemented by the containers (automatically
generated or not) for the different parts of the DOM and the
render subtree under this element anyway.
* accessibility/atk/WebKitAccessibleWrapperAtk.cpp:
(getInterfaceMaskFromObject): Make sure we don't apply
WAIHypertext nor WAIText to objects with role WebAreaRole.
LayoutTests:
Removed failure expectations for tests now passing.
* platform/gtk/TestExpectations: Updated.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsplatformgtkTestExpectations">trunk/LayoutTests/platform/gtk/TestExpectations</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreaccessibilityatkWebKitAccessibleWrapperAtkcpp">trunk/Source/WebCore/accessibility/atk/WebKitAccessibleWrapperAtk.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (167010 => 167011)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2014-04-09 09:48:26 UTC (rev 167010)
+++ trunk/LayoutTests/ChangeLog 2014-04-09 15:05:58 UTC (rev 167011)
</span><span class="lines">@@ -1,5 +1,16 @@
</span><span class="cx"> 2014-04-09 Mario Sanchez Prada <mario.prada@samsung.com>
</span><span class="cx">
</span><ins>+ [AX][GTK] No new lines in some AX tests output
+ https://bugs.webkit.org/show_bug.cgi?id=131294
+
+ Reviewed by Martin Robinson.
+
+ Removed failure expectations for tests now passing.
+
+ * platform/gtk/TestExpectations: Updated.
+
+2014-04-09 Mario Sanchez Prada <mario.prada@samsung.com>
+
</ins><span class="cx"> Unreviewed gardening for GTK.
</span><span class="cx">
</span><span class="cx"> Updated test expectations after r166175, which removed an <hr>
</span></span></pre></div>
<a id="trunkLayoutTestsplatformgtkTestExpectations"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/gtk/TestExpectations (167010 => 167011)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/gtk/TestExpectations 2014-04-09 09:48:26 UTC (rev 167010)
+++ trunk/LayoutTests/platform/gtk/TestExpectations 2014-04-09 15:05:58 UTC (rev 167011)
</span><span class="lines">@@ -1055,14 +1055,6 @@
</span><span class="cx"> webkit.org/b/120401 fast/events [ Skip ]
</span><span class="cx"> webkit.org/b/120401 editing/selection [ Skip ]
</span><span class="cx">
</span><del>-# AX tests failing
-webkit.org/b/131294 accessibility/adjacent-continuations-cause-assertion-failure.html [ Failure ]
-webkit.org/b/131294 accessibility/deleting-iframe-destroys-axcache.html [ Failure ]
-webkit.org/b/131294 accessibility/div-within-anchors-causes-crash.html [ Failure ]
-webkit.org/b/131294 platform/gtk/accessibility/entry-and-password.html [ Failure ]
-webkit.org/b/131294 platform/gtk/accessibility/media-emits-object-replacement.html [ Failure ]
-webkit.org/b/131294 platform/gtk/accessibility/replaced-objects-in-anonymous-blocks.html [ Failure ]
-
</del><span class="cx"> webkit.org/b/106340 accessibility/img-fallsback-to-title.html [ Failure ]
</span><span class="cx">
</span><span class="cx"> webkit.org/b/131380 accessibility/children-changed-sends-notification.html [ Failure ]
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (167010 => 167011)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-04-09 09:48:26 UTC (rev 167010)
+++ trunk/Source/WebCore/ChangeLog 2014-04-09 15:05:58 UTC (rev 167011)
</span><span class="lines">@@ -1,3 +1,19 @@
</span><ins>+2014-04-09 Mario Sanchez Prada <mario.prada@samsung.com>
+
+ [AX][GTK] No new lines in some AX tests output
+ https://bugs.webkit.org/show_bug.cgi?id=131294
+
+ Reviewed by Martin Robinson.
+
+ Do not implement Hypetext or AtkText for the WebArea. Those
+ interfaces will be implemented by the containers (automatically
+ generated or not) for the different parts of the DOM and the
+ render subtree under this element anyway.
+
+ * accessibility/atk/WebKitAccessibleWrapperAtk.cpp:
+ (getInterfaceMaskFromObject): Make sure we don't apply
+ WAIHypertext nor WAIText to objects with role WebAreaRole.
+
</ins><span class="cx"> 2014-04-08 Conrad Shultz <conrad_shultz@apple.com>
</span><span class="cx">
</span><span class="cx"> nil should only be used for objects
</span></span></pre></div>
<a id="trunkSourceWebCoreaccessibilityatkWebKitAccessibleWrapperAtkcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/accessibility/atk/WebKitAccessibleWrapperAtk.cpp (167010 => 167011)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/accessibility/atk/WebKitAccessibleWrapperAtk.cpp 2014-04-09 09:48:26 UTC (rev 167010)
+++ trunk/Source/WebCore/accessibility/atk/WebKitAccessibleWrapperAtk.cpp 2014-04-09 15:05:58 UTC (rev 167011)
</span><span class="lines">@@ -1155,29 +1155,27 @@
</span><span class="cx"> if (coreObject->isLink() || (renderer && renderer->isReplaced()))
</span><span class="cx"> interfaceMask |= 1 << WAIHyperlink;
</span><span class="cx">
</span><del>- // Text & Editable Text
</del><ins>+ // Text, Editable Text & Hypertext
</ins><span class="cx"> if (role == StaticTextRole || coreObject->isMenuListOption())
</span><span class="cx"> interfaceMask |= 1 << WAIText;
</span><del>- else {
- if (coreObject->isTextControl()) {
- interfaceMask |= 1 << WAIText;
- if (!coreObject->isReadOnly())
- interfaceMask |= 1 << WAIEditableText;
- } else {
- if (role != TableRole) {
- interfaceMask |= 1 << WAIHypertext;
- if ((renderer && renderer->childrenInline()) || roleIsTextType(role))
- interfaceMask |= 1 << WAIText;
- }
</del><ins>+ else if (coreObject->isTextControl()) {
+ interfaceMask |= 1 << WAIText;
+ if (!coreObject->isReadOnly())
+ interfaceMask |= 1 << WAIEditableText;
+ } else if (!coreObject->isWebArea()) {
+ if (role != TableRole) {
+ interfaceMask |= 1 << WAIHypertext;
+ if ((renderer && renderer->childrenInline()) || roleIsTextType(role))
+ interfaceMask |= 1 << WAIText;
+ }
</ins><span class="cx">
</span><del>- // Add the TEXT interface for list items whose
- // first accessible child has a text renderer
- if (role == ListItemRole) {
- const AccessibilityObject::AccessibilityChildrenVector& children = coreObject->children();
- if (children.size()) {
- AccessibilityObject* axRenderChild = children.at(0).get();
- interfaceMask |= getInterfaceMaskFromObject(axRenderChild);
- }
</del><ins>+ // Add the TEXT interface for list items whose
+ // first accessible child has a text renderer
+ if (role == ListItemRole) {
+ const AccessibilityObject::AccessibilityChildrenVector& children = coreObject->children();
+ if (children.size()) {
+ AccessibilityObject* axRenderChild = children.at(0).get();
+ interfaceMask |= getInterfaceMaskFromObject(axRenderChild);
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>