<!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>[182464] releases/WebKitGTK/webkit-2.4</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/182464">182464</a></dd>
<dt>Author</dt> <dd>carlosgc@webkit.org</dd>
<dt>Date</dt> <dd>2015-04-07 05:25:26 -0700 (Tue, 07 Apr 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/176091">r176091</a> - AX: [ATK] Do not return ATK_ROLE_UNKNOWN for null or otherwise invalid accessible objects
https://bugs.webkit.org/show_bug.cgi?id=137867
Reviewed by Chris Fleizach.
Source/WebCore:
Return ATK_ROLE_INVALID for null or otherwise invalid accessible objects.
Test: platform/gtk/accessibility/detached-object-role.html
* accessibility/atk/WebKitAccessibleWrapperAtk.cpp:
(webkitAccessibleGetRole):
Tools:
Add ATK_ROLE_INVALID to roleToString. Remove the null AtkRole check in
AccessibilityUIElement::role: ATK_ROLE_INVALID = 0, and we need to be
able to test for the presence of ATK_ROLE_INVALID.
* WebKitTestRunner/InjectedBundle/atk/AccessibilityUIElementAtk.cpp:
(WTR::AccessibilityUIElement::role):
LayoutTests:
* platform/gtk/accessibility/detached-object-role-expected.txt: Added.
* platform/gtk/accessibility/detached-object-role.html: Added.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#releasesWebKitGTKwebkit24LayoutTestsChangeLog">releases/WebKitGTK/webkit-2.4/LayoutTests/ChangeLog</a></li>
<li><a href="#releasesWebKitGTKwebkit24SourceWebCoreChangeLog">releases/WebKitGTK/webkit-2.4/Source/WebCore/ChangeLog</a></li>
<li><a href="#releasesWebKitGTKwebkit24SourceWebCoreaccessibilityatkWebKitAccessibleWrapperAtkcpp">releases/WebKitGTK/webkit-2.4/Source/WebCore/accessibility/atk/WebKitAccessibleWrapperAtk.cpp</a></li>
<li><a href="#releasesWebKitGTKwebkit24ToolsChangeLog">releases/WebKitGTK/webkit-2.4/Tools/ChangeLog</a></li>
<li><a href="#releasesWebKitGTKwebkit24ToolsWebKitTestRunnerInjectedBundleatkAccessibilityUIElementAtkcpp">releases/WebKitGTK/webkit-2.4/Tools/WebKitTestRunner/InjectedBundle/atk/AccessibilityUIElementAtk.cpp</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#releasesWebKitGTKwebkit24LayoutTestsplatformgtkaccessibilitydetachedobjectroleexpectedtxt">releases/WebKitGTK/webkit-2.4/LayoutTests/platform/gtk/accessibility/detached-object-role-expected.txt</a></li>
<li><a href="#releasesWebKitGTKwebkit24LayoutTestsplatformgtkaccessibilitydetachedobjectrolehtml">releases/WebKitGTK/webkit-2.4/LayoutTests/platform/gtk/accessibility/detached-object-role.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="releasesWebKitGTKwebkit24LayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.4/LayoutTests/ChangeLog (182463 => 182464)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.4/LayoutTests/ChangeLog 2015-04-07 12:23:07 UTC (rev 182463)
+++ releases/WebKitGTK/webkit-2.4/LayoutTests/ChangeLog 2015-04-07 12:25:26 UTC (rev 182464)
</span><span class="lines">@@ -1,5 +1,15 @@
</span><span class="cx"> 2014-11-13 Joanmarie Diggs <jdiggs@igalia.com>
</span><span class="cx">
</span><ins>+ AX: [ATK] Do not return ATK_ROLE_UNKNOWN for null or otherwise invalid accessible objects
+ https://bugs.webkit.org/show_bug.cgi?id=137867
+
+ Reviewed by Chris Fleizach.
+
+ * platform/gtk/accessibility/detached-object-role-expected.txt: Added.
+ * platform/gtk/accessibility/detached-object-role.html: Added.
+
+2014-11-13 Joanmarie Diggs <jdiggs@igalia.com>
+
</ins><span class="cx"> AX: [ATK] Accessible focus events are emitted when the selection is changed in non-focused combo boxes
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=137866
</span><span class="cx">
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit24LayoutTestsplatformgtkaccessibilitydetachedobjectroleexpectedtxt"></a>
<div class="addfile"><h4>Added: releases/WebKitGTK/webkit-2.4/LayoutTests/platform/gtk/accessibility/detached-object-role-expected.txt (0 => 182464)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.4/LayoutTests/platform/gtk/accessibility/detached-object-role-expected.txt (rev 0)
+++ releases/WebKitGTK/webkit-2.4/LayoutTests/platform/gtk/accessibility/detached-object-role-expected.txt 2015-04-07 12:25:26 UTC (rev 182464)
</span><span class="lines">@@ -0,0 +1,11 @@
</span><ins>+This tests that detached accessible objects report the correct role.
+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+
+PASS role != detachedRole is true
+AXRole: AXButton AXRole: AXInvalid
+PASS successfullyParsed is true
+
+TEST COMPLETE
+ Button 2
</ins></span></pre></div>
<a id="releasesWebKitGTKwebkit24LayoutTestsplatformgtkaccessibilitydetachedobjectrolehtml"></a>
<div class="addfile"><h4>Added: releases/WebKitGTK/webkit-2.4/LayoutTests/platform/gtk/accessibility/detached-object-role.html (0 => 182464)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.4/LayoutTests/platform/gtk/accessibility/detached-object-role.html (rev 0)
+++ releases/WebKitGTK/webkit-2.4/LayoutTests/platform/gtk/accessibility/detached-object-role.html 2015-04-07 12:25:26 UTC (rev 182464)
</span><span class="lines">@@ -0,0 +1,29 @@
</span><ins>+<!DOCTYPE HTML>
+<html>
+<head>
+<script src="../../../resources/js-test-pre.js"></script>
+</head>
+<body>
+<button id="button1">Button 1</button>
+<button id="button2">Button 2</button>
+<script>
+description("This tests that detached accessible objects report the correct role.");
+
+if (window.testRunner && window.accessibilityController) {
+ testRunner.dumpAsText();
+
+ var button = document.getElementById('button1');
+ button.focus();
+
+ var axButton = accessibilityController.focusedElement;
+ var role = axButton.role;
+
+ document.body.removeChild(button);
+ var detachedRole = axButton.role;
+ shouldBeTrue("role != detachedRole");
+ debug(role + " " + detachedRole);
+}
+</script>
+<script src="../../../resources/js-test-post.js"></script>
+</body>
+</html>
</ins></span></pre></div>
<a id="releasesWebKitGTKwebkit24SourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.4/Source/WebCore/ChangeLog (182463 => 182464)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.4/Source/WebCore/ChangeLog 2015-04-07 12:23:07 UTC (rev 182463)
+++ releases/WebKitGTK/webkit-2.4/Source/WebCore/ChangeLog 2015-04-07 12:25:26 UTC (rev 182464)
</span><span class="lines">@@ -1,5 +1,19 @@
</span><span class="cx"> 2014-11-13 Joanmarie Diggs <jdiggs@igalia.com>
</span><span class="cx">
</span><ins>+ AX: [ATK] Do not return ATK_ROLE_UNKNOWN for null or otherwise invalid accessible objects
+ https://bugs.webkit.org/show_bug.cgi?id=137867
+
+ Reviewed by Chris Fleizach.
+
+ Return ATK_ROLE_INVALID for null or otherwise invalid accessible objects.
+
+ Test: platform/gtk/accessibility/detached-object-role.html
+
+ * accessibility/atk/WebKitAccessibleWrapperAtk.cpp:
+ (webkitAccessibleGetRole):
+
+2014-11-13 Joanmarie Diggs <jdiggs@igalia.com>
+
</ins><span class="cx"> AX: [ATK] Accessible focus events are emitted when the selection is changed in non-focused combo boxes
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=137866
</span><span class="cx">
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit24SourceWebCoreaccessibilityatkWebKitAccessibleWrapperAtkcpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.4/Source/WebCore/accessibility/atk/WebKitAccessibleWrapperAtk.cpp (182463 => 182464)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.4/Source/WebCore/accessibility/atk/WebKitAccessibleWrapperAtk.cpp 2015-04-07 12:23:07 UTC (rev 182463)
+++ releases/WebKitGTK/webkit-2.4/Source/WebCore/accessibility/atk/WebKitAccessibleWrapperAtk.cpp 2015-04-07 12:25:26 UTC (rev 182464)
</span><span class="lines">@@ -747,13 +747,15 @@
</span><span class="cx">
</span><span class="cx"> static AtkRole webkitAccessibleGetRole(AtkObject* object)
</span><span class="cx"> {
</span><del>- g_return_val_if_fail(WEBKIT_IS_ACCESSIBLE(object), ATK_ROLE_UNKNOWN);
- returnValIfWebKitAccessibleIsInvalid(WEBKIT_ACCESSIBLE(object), ATK_ROLE_UNKNOWN);
</del><ins>+ // ATK_ROLE_UNKNOWN should only be applied in cases where there is a valid
+ // WebCore accessible object for which the platform role mapping is unknown.
+ g_return_val_if_fail(WEBKIT_IS_ACCESSIBLE(object), ATK_ROLE_INVALID);
+ returnValIfWebKitAccessibleIsInvalid(WEBKIT_ACCESSIBLE(object), ATK_ROLE_INVALID);
</ins><span class="cx">
</span><span class="cx"> AccessibilityObject* coreObject = core(object);
</span><span class="cx">
</span><span class="cx"> if (!coreObject)
</span><del>- return ATK_ROLE_UNKNOWN;
</del><ins>+ return ATK_ROLE_INVALID;
</ins><span class="cx">
</span><span class="cx"> // Note: Why doesn't WebCore have a password field for this
</span><span class="cx"> if (coreObject->isPasswordField())
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit24ToolsChangeLog"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.4/Tools/ChangeLog (182463 => 182464)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.4/Tools/ChangeLog 2015-04-07 12:23:07 UTC (rev 182463)
+++ releases/WebKitGTK/webkit-2.4/Tools/ChangeLog 2015-04-07 12:25:26 UTC (rev 182464)
</span><span class="lines">@@ -1,3 +1,17 @@
</span><ins>+2014-11-13 Joanmarie Diggs <jdiggs@igalia.com>
+
+ AX: [ATK] Do not return ATK_ROLE_UNKNOWN for null or otherwise invalid accessible objects
+ https://bugs.webkit.org/show_bug.cgi?id=137867
+
+ Reviewed by Chris Fleizach.
+
+ Add ATK_ROLE_INVALID to roleToString. Remove the null AtkRole check in
+ AccessibilityUIElement::role: ATK_ROLE_INVALID = 0, and we need to be
+ able to test for the presence of ATK_ROLE_INVALID.
+
+ * WebKitTestRunner/InjectedBundle/atk/AccessibilityUIElementAtk.cpp:
+ (WTR::AccessibilityUIElement::role):
+
</ins><span class="cx"> 2014-10-07 Carlos Garcia Campos <cgarcia@igalia.com>
</span><span class="cx">
</span><span class="cx"> [SOUP] TLS errors should take precedence over HTTP authentication
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit24ToolsWebKitTestRunnerInjectedBundleatkAccessibilityUIElementAtkcpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.4/Tools/WebKitTestRunner/InjectedBundle/atk/AccessibilityUIElementAtk.cpp (182463 => 182464)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.4/Tools/WebKitTestRunner/InjectedBundle/atk/AccessibilityUIElementAtk.cpp 2015-04-07 12:23:07 UTC (rev 182463)
+++ releases/WebKitGTK/webkit-2.4/Tools/WebKitTestRunner/InjectedBundle/atk/AccessibilityUIElementAtk.cpp 2015-04-07 12:25:26 UTC (rev 182464)
</span><span class="lines">@@ -335,6 +335,8 @@
</span><span class="cx"> return "AXImage";
</span><span class="cx"> case ATK_ROLE_IMAGE_MAP:
</span><span class="cx"> return "AXImageMap";
</span><ins>+ case ATK_ROLE_INVALID:
+ return "AXInvalid";
</ins><span class="cx"> case ATK_ROLE_LABEL:
</span><span class="cx"> return "AXLabel";
</span><span class="cx"> case ATK_ROLE_LINK:
</span><span class="lines">@@ -884,9 +886,6 @@
</span><span class="cx"> if (!ATK_IS_OBJECT(m_element.get()))
</span><span class="cx"> return JSStringCreateWithCharacters(0, 0);
</span><span class="cx">
</span><del>- if (!atk_object_get_role(ATK_OBJECT(m_element.get())))
- return JSStringCreateWithCharacters(0, 0);
-
</del><span class="cx"> GUniquePtr<char> roleStringWithPrefix(g_strdup_printf("AXRole: %s", roleToString(ATK_OBJECT(m_element.get()))));
</span><span class="cx"> return JSStringCreateWithUTF8CString(roleStringWithPrefix.get());
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>