<!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>[201270] releases/WebKitGTK/webkit-2.12</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/201270">201270</a></dd>
<dt>Author</dt> <dd>carlosgc@webkit.org</dd>
<dt>Date</dt> <dd>2016-05-23 04:03:44 -0700 (Mon, 23 May 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/200677">r200677</a> - [GTK] accessibility/aria-readonly.html is failing
https://bugs.webkit.org/show_bug.cgi?id=98357
Reviewed by Chris Fleizach.
Source/WebCore:
Add support for ATK_STATE_READ_ONLY and expose the value of aria-readonly
as an AtkObject attribute. In order to eliminate duplicate checks, remove
isReadOnly() and just use canSetAttributeValue(), moving all the logic into
AccessibilityNodeObject. Add AccessibilityObject::supportsARIAReadOnly() so
that we can explicitly expose the implicit value for aria-readonly on roles
which support this property. Also add support for ATK_STATE_CHECKABLE, both
because this state was missing and because it serves a similar function to
ATK_STATE_EDITABLE for the purpose of verifying exposure of toggle-able
elements that are not read-only.
Test: accessibility/form-control-value-settable.html
* accessibility/AccessibilityNodeObject.cpp:
(WebCore::AccessibilityNodeObject::canSetValueAttribute):
(WebCore::AccessibilityNodeObject::isRequired): Deleted.
(WebCore::AccessibilityNodeObject::supportsRequiredAttribute): Deleted.
* accessibility/AccessibilityNodeObject.h:
* accessibility/AccessibilityObject.cpp:
(WebCore::AccessibilityObject::supportsARIAReadOnly):
(WebCore::AccessibilityObject::ariaReadOnlyValue):
* accessibility/AccessibilityObject.h:
(WebCore::AccessibilityObject::isUnvisited): Deleted.
* accessibility/AccessibilityRenderObject.cpp:
(WebCore::AccessibilityRenderObject::clickPoint):
(WebCore::AccessibilityRenderObject::isOffScreen): Deleted.
(WebCore::AccessibilityRenderObject::anchorElement): Deleted.
(WebCore::AccessibilityRenderObject::internalLinkElement): Deleted.
(WebCore::AccessibilityRenderObject::textChanged): Deleted.
(WebCore::AccessibilityRenderObject::clearChildren): Deleted.
(WebCore::AccessibilityRenderObject::addImageMapChildren): Deleted.
* accessibility/AccessibilityRenderObject.h:
* accessibility/atk/WebKitAccessibleInterfaceText.cpp:
(getAttributeSetForAccessibilityObject):
* accessibility/atk/WebKitAccessibleWrapperAtk.cpp:
(webkitAccessibleGetAttributes):
(setAtkStateSetFromCoreObject):
(getInterfaceMaskFromObject):
* inspector/InspectorDOMAgent.cpp:
(WebCore::InspectorDOMAgent::buildObjectForAccessibilityProperties):
Source/WebKit/win:
Call AccessibilityNode::canSetValueAttribute() to determine if STATE_SYSTEM_READONLY
should be added and if editable text should be supported.
* AccessibleBase.cpp:
(AccessibleBase::state):
* AccessibleTextImpl.cpp:
(AccessibleText::deleteText):
(AccessibleText::insertText):
(AccessibleText::cutText):
(AccessibleText::pasteText):
(AccessibleText::replaceText):
Tools:
Add checks to isAttributeSettable() for ATK_STATE_READ_ONLY and the 'readonly'
AtkObject attribute along with ATK_STATE_CHECKABLE for toggle-able elements,
ATK_STATE_SELECTABLE for select elements, and ATK_STATE_FOCUSABLE combined
with range verification for inputs which implement AtkValue. The latter two
additions are admittedly a heuristic workaround for platform accessibility
API differences. But they should be sufficient to facilitate cross-platform
testing of isAttributeSettable() for form elements which lack ARIA attributes.
Bump the minimum version of at-spi2-core and at-spi2-atk
to 2.15.4 (earliest version that supports STATE_READ_ONLY).
* WebKitTestRunner/InjectedBundle/atk/AccessibilityUIElementAtk.cpp:
(WTR::AccessibilityUIElement::isAttributeSettable):
* gtk/jhbuild.modules:
LayoutTests:
As part of this change, a new AtkObject attribute and state are being exposed.
Update two tests accordingly. Also unskip the previously-failing test. Lastly,
move the Mac form-control-value-settable.html test to the shared test set,
with a minor tweak to check the platform for several elements' expectations.
* accessibility/form-control-value-settable.html: Moved to shared tests.
* accessibility/gtk/xml-roles-exposed-expected.txt: Updated.
* platform/gtk/TestExpectations: Unskipped previously-failing test.
* platform/gtk/accessibility/form-control-value-settable-expected.txt: Added.
* platform/gtk/accessibility/table-detection-expected.txt: Updated.
* platform/mac/accessibility/form-control-value-settable-expected.txt: Moved.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#releasesWebKitGTKwebkit212LayoutTestsChangeLog">releases/WebKitGTK/webkit-2.12/LayoutTests/ChangeLog</a></li>
<li><a href="#releasesWebKitGTKwebkit212LayoutTestsaccessibilitygtkxmlrolesexposedexpectedtxt">releases/WebKitGTK/webkit-2.12/LayoutTests/accessibility/gtk/xml-roles-exposed-expected.txt</a></li>
<li><a href="#releasesWebKitGTKwebkit212LayoutTestsplatformgtkaccessibilitytabledetectionexpectedtxt">releases/WebKitGTK/webkit-2.12/LayoutTests/platform/gtk/accessibility/table-detection-expected.txt</a></li>
<li><a href="#releasesWebKitGTKwebkit212SourceWebCoreChangeLog">releases/WebKitGTK/webkit-2.12/Source/WebCore/ChangeLog</a></li>
<li><a href="#releasesWebKitGTKwebkit212SourceWebCoreaccessibilityAccessibilityNodeObjectcpp">releases/WebKitGTK/webkit-2.12/Source/WebCore/accessibility/AccessibilityNodeObject.cpp</a></li>
<li><a href="#releasesWebKitGTKwebkit212SourceWebCoreaccessibilityAccessibilityNodeObjecth">releases/WebKitGTK/webkit-2.12/Source/WebCore/accessibility/AccessibilityNodeObject.h</a></li>
<li><a href="#releasesWebKitGTKwebkit212SourceWebCoreaccessibilityAccessibilityObjectcpp">releases/WebKitGTK/webkit-2.12/Source/WebCore/accessibility/AccessibilityObject.cpp</a></li>
<li><a href="#releasesWebKitGTKwebkit212SourceWebCoreaccessibilityAccessibilityObjecth">releases/WebKitGTK/webkit-2.12/Source/WebCore/accessibility/AccessibilityObject.h</a></li>
<li><a href="#releasesWebKitGTKwebkit212SourceWebCoreaccessibilityAccessibilityRenderObjectcpp">releases/WebKitGTK/webkit-2.12/Source/WebCore/accessibility/AccessibilityRenderObject.cpp</a></li>
<li><a href="#releasesWebKitGTKwebkit212SourceWebCoreaccessibilityAccessibilityRenderObjecth">releases/WebKitGTK/webkit-2.12/Source/WebCore/accessibility/AccessibilityRenderObject.h</a></li>
<li><a href="#releasesWebKitGTKwebkit212SourceWebCoreaccessibilityatkWebKitAccessibleInterfaceTextcpp">releases/WebKitGTK/webkit-2.12/Source/WebCore/accessibility/atk/WebKitAccessibleInterfaceText.cpp</a></li>
<li><a href="#releasesWebKitGTKwebkit212SourceWebCoreaccessibilityatkWebKitAccessibleWrapperAtkcpp">releases/WebKitGTK/webkit-2.12/Source/WebCore/accessibility/atk/WebKitAccessibleWrapperAtk.cpp</a></li>
<li><a href="#releasesWebKitGTKwebkit212SourceWebCoreinspectorInspectorDOMAgentcpp">releases/WebKitGTK/webkit-2.12/Source/WebCore/inspector/InspectorDOMAgent.cpp</a></li>
<li><a href="#releasesWebKitGTKwebkit212SourceWebKitwinAccessibleBasecpp">releases/WebKitGTK/webkit-2.12/Source/WebKit/win/AccessibleBase.cpp</a></li>
<li><a href="#releasesWebKitGTKwebkit212SourceWebKitwinAccessibleTextImplcpp">releases/WebKitGTK/webkit-2.12/Source/WebKit/win/AccessibleTextImpl.cpp</a></li>
<li><a href="#releasesWebKitGTKwebkit212SourceWebKitwinChangeLog">releases/WebKitGTK/webkit-2.12/Source/WebKit/win/ChangeLog</a></li>
<li><a href="#releasesWebKitGTKwebkit212ToolsChangeLog">releases/WebKitGTK/webkit-2.12/Tools/ChangeLog</a></li>
<li><a href="#releasesWebKitGTKwebkit212ToolsWebKitTestRunnerInjectedBundleatkAccessibilityUIElementAtkcpp">releases/WebKitGTK/webkit-2.12/Tools/WebKitTestRunner/InjectedBundle/atk/AccessibilityUIElementAtk.cpp</a></li>
<li><a href="#releasesWebKitGTKwebkit212Toolsgtkjhbuildmodules">releases/WebKitGTK/webkit-2.12/Tools/gtk/jhbuild.modules</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#releasesWebKitGTKwebkit212LayoutTestsaccessibilityformcontrolvaluesettablehtml">releases/WebKitGTK/webkit-2.12/LayoutTests/accessibility/form-control-value-settable.html</a></li>
<li><a href="#releasesWebKitGTKwebkit212LayoutTestsplatformgtkaccessibilityformcontrolvaluesettableexpectedtxt">releases/WebKitGTK/webkit-2.12/LayoutTests/platform/gtk/accessibility/form-control-value-settable-expected.txt</a></li>
<li><a href="#releasesWebKitGTKwebkit212LayoutTestsplatformmacaccessibilityformcontrolvaluesettableexpectedtxt">releases/WebKitGTK/webkit-2.12/LayoutTests/platform/mac/accessibility/form-control-value-settable-expected.txt</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#releasesWebKitGTKwebkit212LayoutTestsaccessibilitymacformcontrolvaluesettableexpectedtxt">releases/WebKitGTK/webkit-2.12/LayoutTests/accessibility/mac/form-control-value-settable-expected.txt</a></li>
<li><a href="#releasesWebKitGTKwebkit212LayoutTestsaccessibilitymacformcontrolvaluesettablehtml">releases/WebKitGTK/webkit-2.12/LayoutTests/accessibility/mac/form-control-value-settable.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="releasesWebKitGTKwebkit212LayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.12/LayoutTests/ChangeLog (201269 => 201270)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.12/LayoutTests/ChangeLog 2016-05-23 11:02:42 UTC (rev 201269)
+++ releases/WebKitGTK/webkit-2.12/LayoutTests/ChangeLog 2016-05-23 11:03:44 UTC (rev 201270)
</span><span class="lines">@@ -1,3 +1,22 @@
</span><ins>+2016-05-11 Joanmarie Diggs <jdiggs@igalia.com>
+
+ [GTK] accessibility/aria-readonly.html is failing
+ https://bugs.webkit.org/show_bug.cgi?id=98357
+
+ Reviewed by Chris Fleizach.
+
+ As part of this change, a new AtkObject attribute and state are being exposed.
+ Update two tests accordingly. Also unskip the previously-failing test. Lastly,
+ move the Mac form-control-value-settable.html test to the shared test set,
+ with a minor tweak to check the platform for several elements' expectations.
+
+ * accessibility/form-control-value-settable.html: Moved to shared tests.
+ * accessibility/gtk/xml-roles-exposed-expected.txt: Updated.
+ * platform/gtk/TestExpectations: Unskipped previously-failing test.
+ * platform/gtk/accessibility/form-control-value-settable-expected.txt: Added.
+ * platform/gtk/accessibility/table-detection-expected.txt: Updated.
+ * platform/mac/accessibility/form-control-value-settable-expected.txt: Moved.
+
</ins><span class="cx"> 2016-05-03 Joanmarie Diggs <jdiggs@igalia.com>
</span><span class="cx">
</span><span class="cx"> [ATK] accessibility/content-editable-as-textarea.html fails
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit212LayoutTestsaccessibilityformcontrolvaluesettablehtmlfromrev201269releasesWebKitGTKwebkit212LayoutTestsaccessibilitymacformcontrolvaluesettablehtml"></a>
<div class="copfile"><h4>Copied: releases/WebKitGTK/webkit-2.12/LayoutTests/accessibility/form-control-value-settable.html (from rev 201269, releases/WebKitGTK/webkit-2.12/LayoutTests/accessibility/mac/form-control-value-settable.html) (0 => 201270)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.12/LayoutTests/accessibility/form-control-value-settable.html (rev 0)
+++ releases/WebKitGTK/webkit-2.12/LayoutTests/accessibility/form-control-value-settable.html 2016-05-23 11:03:44 UTC (rev 201270)
</span><span class="lines">@@ -0,0 +1,79 @@
</span><ins>+<!DOCTYPE HTML>
+<html>
+<body>
+<script src="../resources/js-test-pre.js"></script>
+
+<div>
+ <input id="text1" type="text" value="Value">
+ <input id="checkbox1" type="checkbox" checked>
+ <input id="number1" type="number" value="123">
+ <input id="radio1" type="radio" checked>
+ <input id="slider1" type="range" min="1" max="10" value="5">
+ <input id="submit1" type="submit">
+ <select id="combobox1"><option>1<option selected>2</select>
+ <select multiple id="listbox1"><option>1<option selected>2</select>
+ <textarea id="textarea1">Textarea</textarea>
+</div>
+
+<div contentEditable>
+ <input id="text2" type="text" value="Value">
+ <input id="checkbox2" type="checkbox" checked>
+ <input id="number2" type="number" value="123">
+ <input id="radio2" type="radio" checked>
+ <input id="slider2" type="range" min="1" max="10" value="5">
+ <input id="submit2" type="submit">
+ <select id="combobox2"><option>1<option selected>2</select>
+ <select multiple id="listbox2"><option>1<option selected>2</select>
+ <textarea id="textarea2">Textarea</textarea>
+</div>
+
+<div id="console"></div>
+<script>
+description("This tests whether AXValue is writable for various form controls.");
+
+if (window.testRunner && window.accessibilityController) {
+ window.testRunner.dumpAsText();
+
+ function check(id1, id2, expected1) {
+ debug(id1);
+ window.element1 = document.getElementById(id1);
+ element1.focus();
+ shouldBe("document.activeElement == element1", "true");
+ window.axElement1 = accessibilityController.focusedElement;
+
+ debug(id2);
+ window.element2 = document.getElementById(id2);
+ element2.focus();
+ shouldBe("document.activeElement == element2", "true");
+ window.axElement2 = accessibilityController.focusedElement;
+
+ shouldBe("axElement1.isAttributeSettable('AXValue')", String(expected1));
+ // If contentEditable, AXValue is always writable.
+ shouldBe("axElement2.isAttributeSettable('AXValue')", "true");
+ debug("");
+ }
+
+ // All text-like form controls should have a writable AXValue.
+ check("text1", "text2", true);
+ check("number1", "number2", true);
+ check("textarea1", "textarea2", true);
+
+ // A slider can set AXValue.
+ check("slider1", "slider2", true);
+
+ // Other controls whose contents or state can be user modified should have a read-only
+ // AXValue for non-ATK-based platforms, unless those controls are inside contentEditable,
+ // then everything should have a writable AXValue.
+ isATK = accessibilityController.platformName == "atk";
+ check("checkbox1", "checkbox2", isATK ? true : false);
+ check("radio1", "radio2", isATK ? true : false);
+ check("submit1", "submit2", false);
+ check("combobox1", "combobox2", isATK ? true : false);
+ check("listbox1", "listbox2", isATK ? true : false);
+}
+
+</script>
+
+<script src="../resources/js-test-post.js"></script>
+</body>
+</html>
</ins></span></pre></div>
<a id="releasesWebKitGTKwebkit212LayoutTestsaccessibilitygtkxmlrolesexposedexpectedtxt"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.12/LayoutTests/accessibility/gtk/xml-roles-exposed-expected.txt (201269 => 201270)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.12/LayoutTests/accessibility/gtk/xml-roles-exposed-expected.txt 2016-05-23 11:02:42 UTC (rev 201269)
+++ releases/WebKitGTK/webkit-2.12/LayoutTests/accessibility/gtk/xml-roles-exposed-expected.txt 2016-05-23 11:03:44 UTC (rev 201270)
</span><span class="lines">@@ -135,7 +135,7 @@
</span><span class="cx"> AXExpanded: 0
</span><span class="cx"> AXRequired: 0
</span><span class="cx"> AXChecked: 0
</span><del>-AXPlatformAttributes: computed-role:checkbox, xml-roles:checkbox, tag:div, toolkit:WebKitGtk
</del><ins>+AXPlatformAttributes: computed-role:checkbox, xml-roles:checkbox, readonly:false, tag:div, toolkit:WebKitGtk
</ins><span class="cx"> ------------
</span><span class="cx"> AXRole: AXComboBox
</span><span class="cx"> AXParent: AXWebArea
</span><span class="lines">@@ -154,7 +154,7 @@
</span><span class="cx"> AXExpanded: 0
</span><span class="cx"> AXRequired: 0
</span><span class="cx"> AXChecked: 0
</span><del>-AXPlatformAttributes: computed-role:combobox, xml-roles:combobox, tag:div, toolkit:WebKitGtk
</del><ins>+AXPlatformAttributes: computed-role:combobox, xml-roles:combobox, readonly:false, tag:div, toolkit:WebKitGtk
</ins><span class="cx"> ------------
</span><span class="cx"> AXRole: AXLandmarkComplementary
</span><span class="cx"> AXParent: AXWebArea
</span><span class="lines">@@ -592,7 +592,7 @@
</span><span class="cx"> AXExpanded: 0
</span><span class="cx"> AXRequired: 0
</span><span class="cx"> AXChecked: 0
</span><del>-AXPlatformAttributes: computed-role:searchbox, xml-roles:searchbox, tag:div, toolkit:WebKitGtk
</del><ins>+AXPlatformAttributes: computed-role:searchbox, xml-roles:searchbox, readonly:false, tag:div, toolkit:WebKitGtk
</ins><span class="cx"> ------------
</span><span class="cx"> AXRole: AXSeparator
</span><span class="cx"> AXParent: AXWebArea
</span><span class="lines">@@ -630,7 +630,7 @@
</span><span class="cx"> AXExpanded: 0
</span><span class="cx"> AXRequired: 0
</span><span class="cx"> AXChecked: 0
</span><del>-AXPlatformAttributes: computed-role:slider, xml-roles:slider, tag:div, toolkit:WebKitGtk
</del><ins>+AXPlatformAttributes: computed-role:slider, xml-roles:slider, readonly:false, tag:div, toolkit:WebKitGtk
</ins><span class="cx"> ------------
</span><span class="cx"> AXRole: AXSpinButton
</span><span class="cx"> AXParent: AXWebArea
</span><span class="lines">@@ -649,7 +649,7 @@
</span><span class="cx"> AXExpanded: 0
</span><span class="cx"> AXRequired: 0
</span><span class="cx"> AXChecked: 0
</span><del>-AXPlatformAttributes: computed-role:spinbutton, xml-roles:spinbutton, tag:div, toolkit:WebKitGtk
</del><ins>+AXPlatformAttributes: computed-role:spinbutton, xml-roles:spinbutton, readonly:false, tag:div, toolkit:WebKitGtk
</ins><span class="cx"> ------------
</span><span class="cx"> AXRole: AXStatusBar
</span><span class="cx"> AXParent: AXWebArea
</span><span class="lines">@@ -687,7 +687,7 @@
</span><span class="cx"> AXExpanded: 0
</span><span class="cx"> AXRequired: 0
</span><span class="cx"> AXChecked: 0
</span><del>-AXPlatformAttributes: computed-role:switch, xml-roles:switch, tag:div, toolkit:WebKitGtk
</del><ins>+AXPlatformAttributes: computed-role:switch, xml-roles:switch, readonly:false, tag:div, toolkit:WebKitGtk
</ins><span class="cx"> ------------
</span><span class="cx"> AXRole: AXTextField
</span><span class="cx"> AXParent: AXWebArea
</span><span class="lines">@@ -706,7 +706,7 @@
</span><span class="cx"> AXExpanded: 0
</span><span class="cx"> AXRequired: 0
</span><span class="cx"> AXChecked: 0
</span><del>-AXPlatformAttributes: tag:div, toolkit:WebKitGtk
</del><ins>+AXPlatformAttributes: readonly:false, tag:div, toolkit:WebKitGtk
</ins><span class="cx"> ------------
</span><span class="cx"> AXRole: AXTimer
</span><span class="cx"> AXParent: AXWebArea
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit212LayoutTestsaccessibilitymacformcontrolvaluesettableexpectedtxt"></a>
<div class="delfile"><h4>Deleted: releases/WebKitGTK/webkit-2.12/LayoutTests/accessibility/mac/form-control-value-settable-expected.txt (201269 => 201270)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.12/LayoutTests/accessibility/mac/form-control-value-settable-expected.txt 2016-05-23 11:02:42 UTC (rev 201269)
+++ releases/WebKitGTK/webkit-2.12/LayoutTests/accessibility/mac/form-control-value-settable-expected.txt 2016-05-23 11:03:44 UTC (rev 201270)
</span><span class="lines">@@ -1,74 +0,0 @@
</span><del>-
-
-This tests whether AXValue is writable for various form controls.
-
-On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
-
-
-text1
-PASS document.activeElement == element1 is true
-text2
-PASS document.activeElement == element2 is true
-PASS axElement1.isAttributeSettable('AXValue') is true
-PASS axElement2.isAttributeSettable('AXValue') is true
-
-number1
-PASS document.activeElement == element1 is true
-number2
-PASS document.activeElement == element2 is true
-PASS axElement1.isAttributeSettable('AXValue') is true
-PASS axElement2.isAttributeSettable('AXValue') is true
-
-textarea1
-PASS document.activeElement == element1 is true
-textarea2
-PASS document.activeElement == element2 is true
-PASS axElement1.isAttributeSettable('AXValue') is true
-PASS axElement2.isAttributeSettable('AXValue') is true
-
-slider1
-PASS document.activeElement == element1 is true
-slider2
-PASS document.activeElement == element2 is true
-PASS axElement1.isAttributeSettable('AXValue') is true
-PASS axElement2.isAttributeSettable('AXValue') is true
-
-checkbox1
-PASS document.activeElement == element1 is true
-checkbox2
-PASS document.activeElement == element2 is true
-PASS axElement1.isAttributeSettable('AXValue') is false
-PASS axElement2.isAttributeSettable('AXValue') is true
-
-radio1
-PASS document.activeElement == element1 is true
-radio2
-PASS document.activeElement == element2 is true
-PASS axElement1.isAttributeSettable('AXValue') is false
-PASS axElement2.isAttributeSettable('AXValue') is true
-
-submit1
-PASS document.activeElement == element1 is true
-submit2
-PASS document.activeElement == element2 is true
-PASS axElement1.isAttributeSettable('AXValue') is false
-PASS axElement2.isAttributeSettable('AXValue') is true
-
-combobox1
-PASS document.activeElement == element1 is true
-combobox2
-PASS document.activeElement == element2 is true
-PASS axElement1.isAttributeSettable('AXValue') is false
-PASS axElement2.isAttributeSettable('AXValue') is true
-
-listbox1
-PASS document.activeElement == element1 is true
-listbox2
-PASS document.activeElement == element2 is true
-PASS axElement1.isAttributeSettable('AXValue') is false
-PASS axElement2.isAttributeSettable('AXValue') is true
-
-PASS successfullyParsed is true
-
-TEST COMPLETE
-
</del></span></pre></div>
<a id="releasesWebKitGTKwebkit212LayoutTestsaccessibilitymacformcontrolvaluesettablehtml"></a>
<div class="delfile"><h4>Deleted: releases/WebKitGTK/webkit-2.12/LayoutTests/accessibility/mac/form-control-value-settable.html (201269 => 201270)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.12/LayoutTests/accessibility/mac/form-control-value-settable.html 2016-05-23 11:02:42 UTC (rev 201269)
+++ releases/WebKitGTK/webkit-2.12/LayoutTests/accessibility/mac/form-control-value-settable.html 2016-05-23 11:03:44 UTC (rev 201270)
</span><span class="lines">@@ -1,77 +0,0 @@
</span><del>-<!DOCTYPE HTML>
-<html>
-<body>
-<script src="../../resources/js-test-pre.js"></script>
-
-<div>
- <input id="text1" type="text" value="Value">
- <input id="checkbox1" type="checkbox" checked>
- <input id="number1" type="number" value="123">
- <input id="radio1" type="radio" checked>
- <input id="slider1" type="range" min="1" max="10" value="5">
- <input id="submit1" type="submit">
- <select id="combobox1"><option>1<option selected>2</select>
- <select multiple id="listbox1"><option>1<option selected>2</select>
- <textarea id="textarea1">Textarea</textarea>
-</div>
-
-<div contentEditable>
- <input id="text2" type="text" value="Value">
- <input id="checkbox2" type="checkbox" checked>
- <input id="number2" type="number" value="123">
- <input id="radio2" type="radio" checked>
- <input id="slider2" type="range" min="1" max="10" value="5">
- <input id="submit2" type="submit">
- <select id="combobox2"><option>1<option selected>2</select>
- <select multiple id="listbox2"><option>1<option selected>2</select>
- <textarea id="textarea2">Textarea</textarea>
-</div>
-
-<div id="console"></div>
-<script>
-description("This tests whether AXValue is writable for various form controls.");
-
-if (window.testRunner && window.accessibilityController) {
- window.testRunner.dumpAsText();
-
- function check(id1, id2, expected1) {
- debug(id1);
- window.element1 = document.getElementById(id1);
- element1.focus();
- shouldBe("document.activeElement == element1", "true");
- window.axElement1 = accessibilityController.focusedElement;
-
- debug(id2);
- window.element2 = document.getElementById(id2);
- element2.focus();
- shouldBe("document.activeElement == element2", "true");
- window.axElement2 = accessibilityController.focusedElement;
-
- shouldBe("axElement1.isAttributeSettable('AXValue')", String(expected1));
- // If contentEditable, AXValue is always writable.
- shouldBe("axElement2.isAttributeSettable('AXValue')", "true");
- debug("");
- }
-
- // All text-like form controls should have a writable AXValue.
- check("text1", "text2", true);
- check("number1", "number2", true);
- check("textarea1", "textarea2", true);
-
- // A slider can set AXValue.
- check("slider1", "slider2", true);
-
- // Other form controls, even toggleable ones, should have a read-only AXValue -
- // unless they're inside contentEditable, then everything should have writable AXValue.
- check("checkbox1", "checkbox2", false);
- check("radio1", "radio2", false);
- check("submit1", "submit2", false);
- check("combobox1", "combobox2", false);
- check("listbox1", "listbox2", false);
-}
-
-</script>
-
-<script src="../../resources/js-test-post.js"></script>
-</body>
-</html>
</del></span></pre></div>
<a id="releasesWebKitGTKwebkit212LayoutTestsplatformgtkaccessibilityformcontrolvaluesettableexpectedtxtfromrev201269releasesWebKitGTKwebkit212LayoutTestsaccessibilitymacformcontrolvaluesettableexpectedtxt"></a>
<div class="copfile"><h4>Copied: releases/WebKitGTK/webkit-2.12/LayoutTests/platform/gtk/accessibility/form-control-value-settable-expected.txt (from rev 201269, releases/WebKitGTK/webkit-2.12/LayoutTests/accessibility/mac/form-control-value-settable-expected.txt) (0 => 201270)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.12/LayoutTests/platform/gtk/accessibility/form-control-value-settable-expected.txt (rev 0)
+++ releases/WebKitGTK/webkit-2.12/LayoutTests/platform/gtk/accessibility/form-control-value-settable-expected.txt 2016-05-23 11:03:44 UTC (rev 201270)
</span><span class="lines">@@ -0,0 +1,74 @@
</span><ins>+
+
+This tests whether AXValue is writable for various form controls.
+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+
+text1
+PASS document.activeElement == element1 is true
+text2
+PASS document.activeElement == element2 is true
+PASS axElement1.isAttributeSettable('AXValue') is true
+PASS axElement2.isAttributeSettable('AXValue') is true
+
+number1
+PASS document.activeElement == element1 is true
+number2
+PASS document.activeElement == element2 is true
+PASS axElement1.isAttributeSettable('AXValue') is true
+PASS axElement2.isAttributeSettable('AXValue') is true
+
+textarea1
+PASS document.activeElement == element1 is true
+textarea2
+PASS document.activeElement == element2 is true
+PASS axElement1.isAttributeSettable('AXValue') is true
+PASS axElement2.isAttributeSettable('AXValue') is true
+
+slider1
+PASS document.activeElement == element1 is true
+slider2
+PASS document.activeElement == element2 is true
+PASS axElement1.isAttributeSettable('AXValue') is true
+PASS axElement2.isAttributeSettable('AXValue') is true
+
+checkbox1
+PASS document.activeElement == element1 is true
+checkbox2
+PASS document.activeElement == element2 is true
+PASS axElement1.isAttributeSettable('AXValue') is true
+PASS axElement2.isAttributeSettable('AXValue') is true
+
+radio1
+PASS document.activeElement == element1 is true
+radio2
+PASS document.activeElement == element2 is true
+PASS axElement1.isAttributeSettable('AXValue') is true
+PASS axElement2.isAttributeSettable('AXValue') is true
+
+submit1
+PASS document.activeElement == element1 is true
+submit2
+PASS document.activeElement == element2 is true
+PASS axElement1.isAttributeSettable('AXValue') is false
+PASS axElement2.isAttributeSettable('AXValue') is true
+
+combobox1
+PASS document.activeElement == element1 is true
+combobox2
+PASS document.activeElement == element2 is true
+PASS axElement1.isAttributeSettable('AXValue') is true
+PASS axElement2.isAttributeSettable('AXValue') is true
+
+listbox1
+PASS document.activeElement == element1 is true
+listbox2
+PASS document.activeElement == element2 is true
+PASS axElement1.isAttributeSettable('AXValue') is true
+PASS axElement2.isAttributeSettable('AXValue') is true
+
+PASS successfullyParsed is true
+
+TEST COMPLETE
+
</ins></span></pre></div>
<a id="releasesWebKitGTKwebkit212LayoutTestsplatformgtkaccessibilitytabledetectionexpectedtxt"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.12/LayoutTests/platform/gtk/accessibility/table-detection-expected.txt (201269 => 201270)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.12/LayoutTests/platform/gtk/accessibility/table-detection-expected.txt 2016-05-23 11:02:42 UTC (rev 201269)
+++ releases/WebKitGTK/webkit-2.12/LayoutTests/platform/gtk/accessibility/table-detection-expected.txt 2016-05-23 11:03:44 UTC (rev 201270)
</span><span class="lines">@@ -285,6 +285,7 @@
</span><span class="cx"> AXSize: { 64.000000, 26.000000 }
</span><span class="cx"> AXTitle:
</span><span class="cx"> AXDescription:
</span><ins>+AXValue: asdf asdf<\n>
</ins><span class="cx"> AXFocusable: 1
</span><span class="cx"> AXFocused: 0
</span><span class="cx"> AXSelectable: 0
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit212LayoutTestsplatformmacaccessibilityformcontrolvaluesettableexpectedtxtfromrev201269releasesWebKitGTKwebkit212LayoutTestsaccessibilitymacformcontrolvaluesettableexpectedtxt"></a>
<div class="copfile"><h4>Copied: releases/WebKitGTK/webkit-2.12/LayoutTests/platform/mac/accessibility/form-control-value-settable-expected.txt (from rev 201269, releases/WebKitGTK/webkit-2.12/LayoutTests/accessibility/mac/form-control-value-settable-expected.txt) (0 => 201270)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.12/LayoutTests/platform/mac/accessibility/form-control-value-settable-expected.txt (rev 0)
+++ releases/WebKitGTK/webkit-2.12/LayoutTests/platform/mac/accessibility/form-control-value-settable-expected.txt 2016-05-23 11:03:44 UTC (rev 201270)
</span><span class="lines">@@ -0,0 +1,74 @@
</span><ins>+
+
+This tests whether AXValue is writable for various form controls.
+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+
+text1
+PASS document.activeElement == element1 is true
+text2
+PASS document.activeElement == element2 is true
+PASS axElement1.isAttributeSettable('AXValue') is true
+PASS axElement2.isAttributeSettable('AXValue') is true
+
+number1
+PASS document.activeElement == element1 is true
+number2
+PASS document.activeElement == element2 is true
+PASS axElement1.isAttributeSettable('AXValue') is true
+PASS axElement2.isAttributeSettable('AXValue') is true
+
+textarea1
+PASS document.activeElement == element1 is true
+textarea2
+PASS document.activeElement == element2 is true
+PASS axElement1.isAttributeSettable('AXValue') is true
+PASS axElement2.isAttributeSettable('AXValue') is true
+
+slider1
+PASS document.activeElement == element1 is true
+slider2
+PASS document.activeElement == element2 is true
+PASS axElement1.isAttributeSettable('AXValue') is true
+PASS axElement2.isAttributeSettable('AXValue') is true
+
+checkbox1
+PASS document.activeElement == element1 is true
+checkbox2
+PASS document.activeElement == element2 is true
+PASS axElement1.isAttributeSettable('AXValue') is false
+PASS axElement2.isAttributeSettable('AXValue') is true
+
+radio1
+PASS document.activeElement == element1 is true
+radio2
+PASS document.activeElement == element2 is true
+PASS axElement1.isAttributeSettable('AXValue') is false
+PASS axElement2.isAttributeSettable('AXValue') is true
+
+submit1
+PASS document.activeElement == element1 is true
+submit2
+PASS document.activeElement == element2 is true
+PASS axElement1.isAttributeSettable('AXValue') is false
+PASS axElement2.isAttributeSettable('AXValue') is true
+
+combobox1
+PASS document.activeElement == element1 is true
+combobox2
+PASS document.activeElement == element2 is true
+PASS axElement1.isAttributeSettable('AXValue') is false
+PASS axElement2.isAttributeSettable('AXValue') is true
+
+listbox1
+PASS document.activeElement == element1 is true
+listbox2
+PASS document.activeElement == element2 is true
+PASS axElement1.isAttributeSettable('AXValue') is false
+PASS axElement2.isAttributeSettable('AXValue') is true
+
+PASS successfullyParsed is true
+
+TEST COMPLETE
+
</ins></span></pre></div>
<a id="releasesWebKitGTKwebkit212SourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.12/Source/WebCore/ChangeLog (201269 => 201270)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.12/Source/WebCore/ChangeLog 2016-05-23 11:02:42 UTC (rev 201269)
+++ releases/WebKitGTK/webkit-2.12/Source/WebCore/ChangeLog 2016-05-23 11:03:44 UTC (rev 201270)
</span><span class="lines">@@ -1,3 +1,50 @@
</span><ins>+2016-05-11 Joanmarie Diggs <jdiggs@igalia.com>
+
+ [GTK] accessibility/aria-readonly.html is failing
+ https://bugs.webkit.org/show_bug.cgi?id=98357
+
+ Reviewed by Chris Fleizach.
+
+ Add support for ATK_STATE_READ_ONLY and expose the value of aria-readonly
+ as an AtkObject attribute. In order to eliminate duplicate checks, remove
+ isReadOnly() and just use canSetAttributeValue(), moving all the logic into
+ AccessibilityNodeObject. Add AccessibilityObject::supportsARIAReadOnly() so
+ that we can explicitly expose the implicit value for aria-readonly on roles
+ which support this property. Also add support for ATK_STATE_CHECKABLE, both
+ because this state was missing and because it serves a similar function to
+ ATK_STATE_EDITABLE for the purpose of verifying exposure of toggle-able
+ elements that are not read-only.
+
+ Test: accessibility/form-control-value-settable.html
+
+ * accessibility/AccessibilityNodeObject.cpp:
+ (WebCore::AccessibilityNodeObject::canSetValueAttribute):
+ (WebCore::AccessibilityNodeObject::isRequired): Deleted.
+ (WebCore::AccessibilityNodeObject::supportsRequiredAttribute): Deleted.
+ * accessibility/AccessibilityNodeObject.h:
+ * accessibility/AccessibilityObject.cpp:
+ (WebCore::AccessibilityObject::supportsARIAReadOnly):
+ (WebCore::AccessibilityObject::ariaReadOnlyValue):
+ * accessibility/AccessibilityObject.h:
+ (WebCore::AccessibilityObject::isUnvisited): Deleted.
+ * accessibility/AccessibilityRenderObject.cpp:
+ (WebCore::AccessibilityRenderObject::clickPoint):
+ (WebCore::AccessibilityRenderObject::isOffScreen): Deleted.
+ (WebCore::AccessibilityRenderObject::anchorElement): Deleted.
+ (WebCore::AccessibilityRenderObject::internalLinkElement): Deleted.
+ (WebCore::AccessibilityRenderObject::textChanged): Deleted.
+ (WebCore::AccessibilityRenderObject::clearChildren): Deleted.
+ (WebCore::AccessibilityRenderObject::addImageMapChildren): Deleted.
+ * accessibility/AccessibilityRenderObject.h:
+ * accessibility/atk/WebKitAccessibleInterfaceText.cpp:
+ (getAttributeSetForAccessibilityObject):
+ * accessibility/atk/WebKitAccessibleWrapperAtk.cpp:
+ (webkitAccessibleGetAttributes):
+ (setAtkStateSetFromCoreObject):
+ (getInterfaceMaskFromObject):
+ * inspector/InspectorDOMAgent.cpp:
+ (WebCore::InspectorDOMAgent::buildObjectForAccessibilityProperties):
+
</ins><span class="cx"> 2016-05-03 Joanmarie Diggs <jdiggs@igalia.com>
</span><span class="cx">
</span><span class="cx"> [ATK] accessibility/content-editable-as-textarea.html fails
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit212SourceWebCoreaccessibilityAccessibilityNodeObjectcpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.12/Source/WebCore/accessibility/AccessibilityNodeObject.cpp (201269 => 201270)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.12/Source/WebCore/accessibility/AccessibilityNodeObject.cpp 2016-05-23 11:02:42 UTC (rev 201269)
+++ releases/WebKitGTK/webkit-2.12/Source/WebCore/accessibility/AccessibilityNodeObject.cpp 2016-05-23 11:03:44 UTC (rev 201270)
</span><span class="lines">@@ -739,24 +739,6 @@
</span><span class="cx"> return node() && node()->hasTagName(selectTag) && downcast<HTMLSelectElement>(*node()).multiple();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool AccessibilityNodeObject::isReadOnly() const
-{
- Node* node = this->node();
- if (!node)
- return true;
-
- if (is<HTMLTextAreaElement>(*node))
- return downcast<HTMLTextAreaElement>(*node).isReadOnly();
-
- if (is<HTMLInputElement>(*node)) {
- HTMLInputElement& input = downcast<HTMLInputElement>(*node);
- if (input.isTextField())
- return input.isReadOnly();
- }
-
- return !node->hasEditableStyle();
-}
-
</del><span class="cx"> bool AccessibilityNodeObject::isRequired() const
</span><span class="cx"> {
</span><span class="cx"> // Explicit aria-required values should trump native required attributes.
</span><span class="lines">@@ -1978,6 +1960,57 @@
</span><span class="cx"> return element.supportsFocus();
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+bool AccessibilityNodeObject::canSetValueAttribute() const
+{
+ Node* node = this->node();
+ if (!node)
+ return false;
+
+ // The host-language readonly attribute trumps aria-readonly.
+ if (is<HTMLTextAreaElement>(*node))
+ return !downcast<HTMLTextAreaElement>(*node).isReadOnly();
+ if (is<HTMLInputElement>(*node)) {
+ HTMLInputElement& input = downcast<HTMLInputElement>(*node);
+ if (input.isTextField())
+ return !input.isReadOnly();
+ }
+
+ String readOnly = ariaReadOnlyValue();
+ if (!readOnly.isEmpty())
+ return readOnly == "true" ? false : true;
+
+ if (isNonNativeTextControl())
+ return true;
+
+ if (isMeter())
+ return false;
+
+ if (isProgressIndicator() || isSlider())
+ return true;
+
+#if PLATFORM(GTK) || PLATFORM(EFL)
+ // In ATK, input types which support aria-readonly are treated as having a
+ // settable value if the user can modify the widget's value or its state.
+ if (supportsARIAReadOnly() || isRadioButton())
+ return true;
+#endif
+
+ if (isWebArea()) {
+ Document* document = this->document();
+ if (!document)
+ return false;
+
+ if (HTMLElement* body = document->bodyOrFrameset()) {
+ if (body->hasEditableStyle())
+ return true;
+ }
+
+ return document->hasEditableStyle();
+ }
+
+ return node->hasEditableStyle();
+}
+
</ins><span class="cx"> AccessibilityRole AccessibilityNodeObject::determineAriaRoleAttribute() const
</span><span class="cx"> {
</span><span class="cx"> const AtomicString& ariaRole = getAttribute(roleAttr);
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit212SourceWebCoreaccessibilityAccessibilityNodeObjecth"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.12/Source/WebCore/accessibility/AccessibilityNodeObject.h (201269 => 201270)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.12/Source/WebCore/accessibility/AccessibilityNodeObject.h 2016-05-23 11:02:42 UTC (rev 201269)
+++ releases/WebKitGTK/webkit-2.12/Source/WebCore/accessibility/AccessibilityNodeObject.h 2016-05-23 11:03:44 UTC (rev 201270)
</span><span class="lines">@@ -97,7 +97,6 @@
</span><span class="cx"> virtual bool isEnabled() const override;
</span><span class="cx"> virtual bool isIndeterminate() const override;
</span><span class="cx"> virtual bool isPressed() const override;
</span><del>- virtual bool isReadOnly() const override;
</del><span class="cx"> virtual bool isRequired() const override;
</span><span class="cx"> virtual bool supportsRequiredAttribute() const override;
</span><span class="cx">
</span><span class="lines">@@ -110,6 +109,8 @@
</span><span class="cx"> virtual bool canSetFocusAttribute() const override;
</span><span class="cx"> virtual int headingLevel() const override;
</span><span class="cx">
</span><ins>+ bool canSetValueAttribute() const override;
+
</ins><span class="cx"> virtual String valueDescription() const override;
</span><span class="cx"> virtual float valueForRange() const override;
</span><span class="cx"> virtual float maxValueForRange() const override;
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit212SourceWebCoreaccessibilityAccessibilityObjectcpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.12/Source/WebCore/accessibility/AccessibilityObject.cpp (201269 => 201270)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.12/Source/WebCore/accessibility/AccessibilityObject.cpp 2016-05-23 11:02:42 UTC (rev 201269)
+++ releases/WebKitGTK/webkit-2.12/Source/WebCore/accessibility/AccessibilityObject.cpp 2016-05-23 11:03:44 UTC (rev 201270)
</span><span class="lines">@@ -1538,6 +1538,37 @@
</span><span class="cx"> return contentEditableAttributeIsEnabled(element());
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+bool AccessibilityObject::supportsARIAReadOnly() const
+{
+ AccessibilityRole role = roleValue();
+
+ return role == CheckBoxRole
+ || role == ColumnHeaderRole
+ || role == ComboBoxRole
+ || role == GridRole
+ || role == GridCellRole
+ || role == ListBoxRole
+ || role == MenuItemCheckboxRole
+ || role == MenuItemRadioRole
+ || role == RadioGroupRole
+ || role == RowHeaderRole
+ || role == SearchFieldRole
+ || role == SliderRole
+ || role == SpinButtonRole
+ || role == SwitchRole
+ || role == TextFieldRole
+ || role == TreeGridRole
+ || isPasswordField();
+}
+
+String AccessibilityObject::ariaReadOnlyValue() const
+{
+ if (!hasAttribute(aria_readonlyAttr))
+ return ariaRoleAttribute() != UnknownRole && supportsARIAReadOnly() ? "false" : String();
+
+ return String(getAttribute(aria_readonlyAttr)).convertToASCIILowercase();
+}
+
</ins><span class="cx"> bool AccessibilityObject::contentEditableAttributeIsEnabled(Element* element)
</span><span class="cx"> {
</span><span class="cx"> if (!element)
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit212SourceWebCoreaccessibilityAccessibilityObjecth"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.12/Source/WebCore/accessibility/AccessibilityObject.h (201269 => 201270)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.12/Source/WebCore/accessibility/AccessibilityObject.h 2016-05-23 11:02:42 UTC (rev 201269)
+++ releases/WebKitGTK/webkit-2.12/Source/WebCore/accessibility/AccessibilityObject.h 2016-05-23 11:03:44 UTC (rev 201270)
</span><span class="lines">@@ -553,7 +553,6 @@
</span><span class="cx"> virtual bool isMultiSelectable() const { return false; }
</span><span class="cx"> virtual bool isOffScreen() const { return false; }
</span><span class="cx"> virtual bool isPressed() const { return false; }
</span><del>- virtual bool isReadOnly() const { return false; }
</del><span class="cx"> virtual bool isUnvisited() const { return false; }
</span><span class="cx"> virtual bool isVisited() const { return false; }
</span><span class="cx"> virtual bool isRequired() const { return false; }
</span><span class="lines">@@ -902,6 +901,9 @@
</span><span class="cx"> static bool liveRegionStatusIsEnabled(const AtomicString&);
</span><span class="cx"> static bool contentEditableAttributeIsEnabled(Element*);
</span><span class="cx"> bool hasContentEditableAttributeSet() const;
</span><ins>+
+ bool supportsARIAReadOnly() const;
+ String ariaReadOnlyValue() const;
</ins><span class="cx">
</span><span class="cx"> bool supportsARIAAttributes() const;
</span><span class="cx">
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit212SourceWebCoreaccessibilityAccessibilityRenderObjectcpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.12/Source/WebCore/accessibility/AccessibilityRenderObject.cpp (201269 => 201270)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.12/Source/WebCore/accessibility/AccessibilityRenderObject.cpp 2016-05-23 11:02:42 UTC (rev 201269)
+++ releases/WebKitGTK/webkit-2.12/Source/WebCore/accessibility/AccessibilityRenderObject.cpp 2016-05-23 11:03:44 UTC (rev 201270)
</span><span class="lines">@@ -521,23 +521,7 @@
</span><span class="cx">
</span><span class="cx"> return false;
</span><span class="cx"> }
</span><del>-
-bool AccessibilityRenderObject::isReadOnly() const
-{
- ASSERT(m_renderer);
-
- if (isWebArea()) {
- if (HTMLElement* body = m_renderer->document().bodyOrFrameset()) {
- if (body->hasEditableStyle())
- return false;
- }
</del><span class="cx">
</span><del>- return !m_renderer->document().hasEditableStyle();
- }
-
- return AccessibilityNodeObject::isReadOnly();
-}
-
</del><span class="cx"> bool AccessibilityRenderObject::isOffScreen() const
</span><span class="cx"> {
</span><span class="cx"> ASSERT(m_renderer);
</span><span class="lines">@@ -921,7 +905,7 @@
</span><span class="cx"> return children()[0]->clickPoint();
</span><span class="cx">
</span><span class="cx"> // use the default position unless this is an editable web area, in which case we use the selection bounds.
</span><del>- if (!isWebArea() || isReadOnly())
</del><ins>+ if (!isWebArea() || !canSetValueAttribute())
</ins><span class="cx"> return AccessibilityObject::clickPoint();
</span><span class="cx">
</span><span class="cx"> VisibleSelection visSelection = selection();
</span><span class="lines">@@ -2856,34 +2840,6 @@
</span><span class="cx"> return equalLettersIgnoringASCIICase(ariaExpanded, "true") || equalLettersIgnoringASCIICase(ariaExpanded, "false");
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool AccessibilityRenderObject::canSetValueAttribute() const
-{
-
- // In the event of a (Boolean)@readonly and (True/False/Undefined)@aria-readonly
- // value mismatch, the host language native attribute value wins.
- if (isNativeTextControl())
- return !isReadOnly();
-
- if (isMeter())
- return false;
-
- auto& readOnly = getAttribute(aria_readonlyAttr);
- if (equalLettersIgnoringASCIICase(readOnly, "true"))
- return false;
- if (equalLettersIgnoringASCIICase(readOnly, "false"))
- return true;
-
- if (isProgressIndicator() || isSlider())
- return true;
-
- if (isTextControl() && !isNativeTextControl())
- return true;
-
- // Any node could be contenteditable, so isReadOnly should be relied upon
- // for this information for all elements.
- return !isReadOnly();
-}
-
</del><span class="cx"> bool AccessibilityRenderObject::canSetTextRangeAttributes() const
</span><span class="cx"> {
</span><span class="cx"> return isTextControl();
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit212SourceWebCoreaccessibilityAccessibilityRenderObjecth"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.12/Source/WebCore/accessibility/AccessibilityRenderObject.h (201269 => 201270)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.12/Source/WebCore/accessibility/AccessibilityRenderObject.h 2016-05-23 11:02:42 UTC (rev 201269)
+++ releases/WebKitGTK/webkit-2.12/Source/WebCore/accessibility/AccessibilityRenderObject.h 2016-05-23 11:03:44 UTC (rev 201270)
</span><span class="lines">@@ -70,7 +70,6 @@
</span><span class="cx"> virtual bool isFocused() const override;
</span><span class="cx"> virtual bool isLoaded() const override;
</span><span class="cx"> virtual bool isOffScreen() const override;
</span><del>- virtual bool isReadOnly() const override;
</del><span class="cx"> virtual bool isUnvisited() const override;
</span><span class="cx"> virtual bool isVisited() const override;
</span><span class="cx"> virtual bool isLinked() const override;
</span><span class="lines">@@ -83,7 +82,6 @@
</span><span class="cx"> virtual bool hasUnderline() const override;
</span><span class="cx">
</span><span class="cx"> virtual bool canSetTextRangeAttributes() const override;
</span><del>- virtual bool canSetValueAttribute() const override;
</del><span class="cx"> virtual bool canSetExpandedAttribute() const override;
</span><span class="cx">
</span><span class="cx"> virtual void setAccessibleName(const AtomicString&) override;
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit212SourceWebCoreaccessibilityatkWebKitAccessibleInterfaceTextcpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.12/Source/WebCore/accessibility/atk/WebKitAccessibleInterfaceText.cpp (201269 => 201270)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.12/Source/WebCore/accessibility/atk/WebKitAccessibleInterfaceText.cpp 2016-05-23 11:02:42 UTC (rev 201269)
+++ releases/WebKitGTK/webkit-2.12/Source/WebCore/accessibility/atk/WebKitAccessibleInterfaceText.cpp 2016-05-23 11:03:44 UTC (rev 201270)
</span><span class="lines">@@ -198,7 +198,7 @@
</span><span class="cx">
</span><span class="cx"> result = addToAtkAttributeSet(result, atk_text_attribute_get_name(ATK_TEXT_ATTR_INVISIBLE), (style->visibility() == HIDDEN) ? "true" : "false");
</span><span class="cx">
</span><del>- result = addToAtkAttributeSet(result, atk_text_attribute_get_name(ATK_TEXT_ATTR_EDITABLE), object->isReadOnly() ? "false" : "true");
</del><ins>+ result = addToAtkAttributeSet(result, atk_text_attribute_get_name(ATK_TEXT_ATTR_EDITABLE), object->canSetValueAttribute() ? "true" : "false");
</ins><span class="cx">
</span><span class="cx"> String language = object->language();
</span><span class="cx"> if (!language.isEmpty())
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit212SourceWebCoreaccessibilityatkWebKitAccessibleWrapperAtkcpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.12/Source/WebCore/accessibility/atk/WebKitAccessibleWrapperAtk.cpp (201269 => 201270)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.12/Source/WebCore/accessibility/atk/WebKitAccessibleWrapperAtk.cpp 2016-05-23 11:02:42 UTC (rev 201269)
+++ releases/WebKitGTK/webkit-2.12/Source/WebCore/accessibility/atk/WebKitAccessibleWrapperAtk.cpp 2016-05-23 11:03:44 UTC (rev 201270)
</span><span class="lines">@@ -454,6 +454,10 @@
</span><span class="cx"> if (coreObject->supportsARIASetSize())
</span><span class="cx"> attributeSet = addToAtkAttributeSet(attributeSet, "setsize", String::number(coreObject->ariaSetSize()).utf8().data());
</span><span class="cx">
</span><ins>+ String isReadOnly = coreObject->ariaReadOnlyValue();
+ if (!isReadOnly.isEmpty())
+ attributeSet = addToAtkAttributeSet(attributeSet, "readonly", isReadOnly.utf8().data());
+
</ins><span class="cx"> // According to the W3C Core Accessibility API Mappings 1.1, section 5.4.1 General Rules:
</span><span class="cx"> // "User agents must expose the WAI-ARIA role string if the API supports a mechanism to do so."
</span><span class="cx"> // In the case of ATK, the mechanism to do so is an object attribute pair (xml-roles:"string").
</span><span class="lines">@@ -762,16 +766,15 @@
</span><span class="cx"> if (isListBoxOption && coreObject->isSelectedOptionActive())
</span><span class="cx"> atk_state_set_add_state(stateSet, ATK_STATE_ACTIVE);
</span><span class="cx">
</span><ins>+#if ATK_CHECK_VERSION(2,11,2)
+ if (coreObject->supportsChecked() && coreObject->canSetValueAttribute())
+ atk_state_set_add_state(stateSet, ATK_STATE_CHECKABLE);
+#endif
+
</ins><span class="cx"> if (coreObject->isChecked())
</span><span class="cx"> atk_state_set_add_state(stateSet, ATK_STATE_CHECKED);
</span><span class="cx">
</span><del>- // FIXME: isReadOnly does not seem to do the right thing for
- // controls, so check explicitly for them. In addition, because
- // isReadOnly is false for listBoxOptions, we need to add one
- // more check so that we do not present them as being "editable".
- if ((!coreObject->isReadOnly()
- || (coreObject->isControl() && coreObject->canSetValueAttribute()))
- && !isListBoxOption)
</del><ins>+ if ((coreObject->isTextControl() || coreObject->isNonNativeTextControl()) && coreObject->canSetValueAttribute())
</ins><span class="cx"> atk_state_set_add_state(stateSet, ATK_STATE_EDITABLE);
</span><span class="cx">
</span><span class="cx"> // FIXME: Put both ENABLED and SENSITIVE together here for now
</span><span class="lines">@@ -816,6 +819,11 @@
</span><span class="cx"> if (coreObject->isPressed())
</span><span class="cx"> atk_state_set_add_state(stateSet, ATK_STATE_PRESSED);
</span><span class="cx">
</span><ins>+#if ATK_CHECK_VERSION(2,15,3)
+ if (!coreObject->canSetValueAttribute() && (coreObject->supportsARIAReadOnly()))
+ atk_state_set_add_state(stateSet, ATK_STATE_READ_ONLY);
+#endif
+
</ins><span class="cx"> if (coreObject->isRequired())
</span><span class="cx"> atk_state_set_add_state(stateSet, ATK_STATE_REQUIRED);
</span><span class="cx">
</span><span class="lines">@@ -1105,9 +1113,9 @@
</span><span class="cx"> // Text, Editable Text & Hypertext
</span><span class="cx"> if (role == StaticTextRole || coreObject->isMenuListOption())
</span><span class="cx"> interfaceMask |= 1 << WAIText;
</span><del>- else if (coreObject->isTextControl()) {
</del><ins>+ else if (coreObject->isTextControl() || coreObject->isNonNativeTextControl()) {
</ins><span class="cx"> interfaceMask |= 1 << WAIText;
</span><del>- if (!coreObject->isReadOnly())
</del><ins>+ if (coreObject->canSetValueAttribute())
</ins><span class="cx"> interfaceMask |= 1 << WAIEditableText;
</span><span class="cx"> } else if (!coreObject->isWebArea()) {
</span><span class="cx"> if (role != TableRole) {
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit212SourceWebCoreinspectorInspectorDOMAgentcpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.12/Source/WebCore/inspector/InspectorDOMAgent.cpp (201269 => 201270)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.12/Source/WebCore/inspector/InspectorDOMAgent.cpp 2016-05-23 11:02:42 UTC (rev 201269)
+++ releases/WebKitGTK/webkit-2.12/Source/WebCore/inspector/InspectorDOMAgent.cpp 2016-05-23 11:03:44 UTC (rev 201270)
</span><span class="lines">@@ -1703,7 +1703,7 @@
</span><span class="cx"> pressed = axObject->isPressed();
</span><span class="cx">
</span><span class="cx"> if (axObject->isTextControl())
</span><del>- readonly = axObject->isReadOnly();
</del><ins>+ readonly = !axObject->canSetValueAttribute();
</ins><span class="cx">
</span><span class="cx"> supportsRequired = axObject->supportsRequiredAttribute();
</span><span class="cx"> if (supportsRequired)
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit212SourceWebKitwinAccessibleBasecpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.12/Source/WebKit/win/AccessibleBase.cpp (201269 => 201270)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.12/Source/WebKit/win/AccessibleBase.cpp 2016-05-23 11:02:42 UTC (rev 201269)
+++ releases/WebKitGTK/webkit-2.12/Source/WebKit/win/AccessibleBase.cpp 2016-05-23 11:03:44 UTC (rev 201270)
</span><span class="lines">@@ -488,7 +488,7 @@
</span><span class="cx"> if (!m_object->isEnabled())
</span><span class="cx"> state |= STATE_SYSTEM_UNAVAILABLE;
</span><span class="cx">
</span><del>- if (m_object->isReadOnly())
</del><ins>+ if (!m_object->canSetValueAttribute())
</ins><span class="cx"> state |= STATE_SYSTEM_READONLY;
</span><span class="cx">
</span><span class="cx"> if (m_object->isOffScreen())
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit212SourceWebKitwinAccessibleTextImplcpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.12/Source/WebKit/win/AccessibleTextImpl.cpp (201269 => 201270)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.12/Source/WebKit/win/AccessibleTextImpl.cpp 2016-05-23 11:02:42 UTC (rev 201269)
+++ releases/WebKitGTK/webkit-2.12/Source/WebKit/win/AccessibleTextImpl.cpp 2016-05-23 11:03:44 UTC (rev 201270)
</span><span class="lines">@@ -563,7 +563,7 @@
</span><span class="cx">
</span><span class="cx"> HRESULT AccessibleText::deleteText(long startOffset, long endOffset)
</span><span class="cx"> {
</span><del>- if (m_object->isReadOnly())
</del><ins>+ if (!m_object->canSetValueAttribute())
</ins><span class="cx"> return S_FALSE;
</span><span class="cx">
</span><span class="cx"> if (initialCheck() == E_POINTER)
</span><span class="lines">@@ -581,7 +581,7 @@
</span><span class="cx">
</span><span class="cx"> HRESULT AccessibleText::insertText(long offset, BSTR* text)
</span><span class="cx"> {
</span><del>- if (m_object->isReadOnly())
</del><ins>+ if (!m_object->canSetValueAttribute())
</ins><span class="cx"> return S_FALSE;
</span><span class="cx">
</span><span class="cx"> if (initialCheck() == E_POINTER)
</span><span class="lines">@@ -601,7 +601,7 @@
</span><span class="cx">
</span><span class="cx"> HRESULT AccessibleText::cutText(long startOffset, long endOffset)
</span><span class="cx"> {
</span><del>- if (m_object->isReadOnly())
</del><ins>+ if (!m_object->canSetValueAttribute())
</ins><span class="cx"> return S_FALSE;
</span><span class="cx">
</span><span class="cx"> if (initialCheck() == E_POINTER)
</span><span class="lines">@@ -622,7 +622,7 @@
</span><span class="cx">
</span><span class="cx"> HRESULT AccessibleText::pasteText(long offset)
</span><span class="cx"> {
</span><del>- if (m_object->isReadOnly())
</del><ins>+ if (!m_object->canSetValueAttribute())
</ins><span class="cx"> return S_FALSE;
</span><span class="cx">
</span><span class="cx"> if (initialCheck() == E_POINTER)
</span><span class="lines">@@ -642,7 +642,7 @@
</span><span class="cx">
</span><span class="cx"> HRESULT AccessibleText::replaceText(long startOffset, long endOffset, BSTR* text)
</span><span class="cx"> {
</span><del>- if (m_object->isReadOnly())
</del><ins>+ if (!m_object->canSetValueAttribute())
</ins><span class="cx"> return S_FALSE;
</span><span class="cx">
</span><span class="cx"> if (initialCheck() == E_POINTER)
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit212SourceWebKitwinChangeLog"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.12/Source/WebKit/win/ChangeLog (201269 => 201270)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.12/Source/WebKit/win/ChangeLog 2016-05-23 11:02:42 UTC (rev 201269)
+++ releases/WebKitGTK/webkit-2.12/Source/WebKit/win/ChangeLog 2016-05-23 11:03:44 UTC (rev 201270)
</span><span class="lines">@@ -1,3 +1,22 @@
</span><ins>+2016-05-11 Joanmarie Diggs <jdiggs@igalia.com>
+
+ [GTK] accessibility/aria-readonly.html is failing
+ https://bugs.webkit.org/show_bug.cgi?id=98357
+
+ Reviewed by Chris Fleizach.
+
+ Call AccessibilityNode::canSetValueAttribute() to determine if STATE_SYSTEM_READONLY
+ should be added and if editable text should be supported.
+
+ * AccessibleBase.cpp:
+ (AccessibleBase::state):
+ * AccessibleTextImpl.cpp:
+ (AccessibleText::deleteText):
+ (AccessibleText::insertText):
+ (AccessibleText::cutText):
+ (AccessibleText::pasteText):
+ (AccessibleText::replaceText):
+
</ins><span class="cx"> 2016-02-16 Andreas Kling <akling@apple.com>
</span><span class="cx">
</span><span class="cx"> Drop StyleResolver and SelectorQueryCache when entering PageCache.
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit212ToolsChangeLog"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.12/Tools/ChangeLog (201269 => 201270)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.12/Tools/ChangeLog 2016-05-23 11:02:42 UTC (rev 201269)
+++ releases/WebKitGTK/webkit-2.12/Tools/ChangeLog 2016-05-23 11:03:44 UTC (rev 201270)
</span><span class="lines">@@ -1,3 +1,25 @@
</span><ins>+2016-05-11 Joanmarie Diggs <jdiggs@igalia.com>
+
+ [GTK] accessibility/aria-readonly.html is failing
+ https://bugs.webkit.org/show_bug.cgi?id=98357
+
+ Reviewed by Chris Fleizach.
+
+ Add checks to isAttributeSettable() for ATK_STATE_READ_ONLY and the 'readonly'
+ AtkObject attribute along with ATK_STATE_CHECKABLE for toggle-able elements,
+ ATK_STATE_SELECTABLE for select elements, and ATK_STATE_FOCUSABLE combined
+ with range verification for inputs which implement AtkValue. The latter two
+ additions are admittedly a heuristic workaround for platform accessibility
+ API differences. But they should be sufficient to facilitate cross-platform
+ testing of isAttributeSettable() for form elements which lack ARIA attributes.
+
+ Bump the minimum version of at-spi2-core and at-spi2-atk
+ to 2.15.4 (earliest version that supports STATE_READ_ONLY).
+
+ * WebKitTestRunner/InjectedBundle/atk/AccessibilityUIElementAtk.cpp:
+ (WTR::AccessibilityUIElement::isAttributeSettable):
+ * gtk/jhbuild.modules:
+
</ins><span class="cx"> 2016-05-03 Joanmarie Diggs <jdiggs@igalia.com>
</span><span class="cx">
</span><span class="cx"> [ATK] accessibility/content-editable-as-textarea.html fails
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit212ToolsWebKitTestRunnerInjectedBundleatkAccessibilityUIElementAtkcpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.12/Tools/WebKitTestRunner/InjectedBundle/atk/AccessibilityUIElementAtk.cpp (201269 => 201270)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.12/Tools/WebKitTestRunner/InjectedBundle/atk/AccessibilityUIElementAtk.cpp 2016-05-23 11:02:42 UTC (rev 201269)
+++ releases/WebKitGTK/webkit-2.12/Tools/WebKitTestRunner/InjectedBundle/atk/AccessibilityUIElementAtk.cpp 2016-05-23 11:03:44 UTC (rev 201270)
</span><span class="lines">@@ -1041,9 +1041,52 @@
</span><span class="cx"> return false;
</span><span class="cx">
</span><span class="cx"> String attributeString = jsStringToWTFString(attribute);
</span><del>- if (attributeString == "AXValue")
- return checkElementState(m_element.get(), ATK_STATE_EDITABLE);
</del><ins>+ if (attributeString != "AXValue")
+ return false;
</ins><span class="cx">
</span><ins>+ // ATK does not have a single state or property to indicate whether or not the value
+ // of an accessible object can be set. ATs look at several states and properties based
+ // on the type of object. If nothing explicitly indicates the value can or cannot be
+ // set, ATs make role- and interface-based decisions. We'll do something similar here.
+
+ // This state is expected to be present only for text widgets and contenteditable elements.
+ if (checkElementState(m_element.get(), ATK_STATE_EDITABLE))
+ return true;
+
+#if ATK_CHECK_VERSION(2,11,2)
+ // This state is applicable to checkboxes, radiobuttons, switches, etc.
+ if (checkElementState(m_element.get(), ATK_STATE_CHECKABLE))
+ return true;
+#endif
+
+#if ATK_CHECK_VERSION(2,15,3)
+ // This state is expected to be present only for controls and only if explicitly set.
+ if (checkElementState(m_element.get(), ATK_STATE_READ_ONLY))
+ return false;
+#endif
+
+ // We expose an object attribute to ATs when there is an author-provided ARIA property
+ // and also when there is a supported ARIA role but no author-provided value.
+ String isReadOnly = getAttributeSetValueForId(ATK_OBJECT(m_element.get()), ObjectAttributeType, "readonly");
+ if (!isReadOnly.isEmpty())
+ return isReadOnly == "true" ? false : true;
+
+ // If we have a native listbox or combobox and the value can be set, the options should
+ // have ATK_STATE_SELECTABLE.
+ AtkRole role = atk_object_get_role(ATK_OBJECT(m_element.get()));
+ if (role == ATK_ROLE_LIST_BOX || role == ATK_ROLE_COMBO_BOX) {
+ if (GRefPtr<AtkObject> child = adoptGRef(atk_object_ref_accessible_child(ATK_OBJECT(m_element.get()), 0))) {
+ if (atk_object_get_role(ATK_OBJECT(child.get())) == ATK_ROLE_MENU)
+ child = adoptGRef(atk_object_ref_accessible_child(ATK_OBJECT(child.get()), 0));
+ return child && checkElementState(child.get(), ATK_STATE_SELECTABLE);
+ }
+ }
+
+ // If we have a native element which exposes a range whose value can be set, it should
+ // be focusable and have a true range.
+ if (ATK_IS_VALUE(m_element.get()) && checkElementState(m_element.get(), ATK_STATE_FOCUSABLE))
+ return minValue() != maxValue();
+
</ins><span class="cx"> return false;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit212Toolsgtkjhbuildmodules"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.12/Tools/gtk/jhbuild.modules (201269 => 201270)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.12/Tools/gtk/jhbuild.modules 2016-05-23 11:02:42 UTC (rev 201269)
+++ releases/WebKitGTK/webkit-2.12/Tools/gtk/jhbuild.modules 2016-05-23 11:03:44 UTC (rev 201270)
</span><span class="lines">@@ -289,9 +289,9 @@
</span><span class="cx">
</span><span class="cx"> <autotools id="at-spi2-core"
</span><span class="cx"> autogenargs="--disable-introspection">
</span><del>- <branch module="pub/GNOME/sources/at-spi2-core/2.10/at-spi2-core-2.10.0.tar.xz" version="2.10.0"
</del><ins>+ <branch module="pub/GNOME/sources/at-spi2-core/2.15/at-spi2-core-2.15.4.tar.xz" version="2.15.4"
</ins><span class="cx"> repo="ftp.gnome.org"
</span><del>- hash="sha256:964155c7574220a00e11e1c0d91f2d3017ed603920eb1333ff9cbdb6a22744db">
</del><ins>+ hash="sha256:0e3b01af6ba06d98faf7b85891ece394897fe145b0760b7846e810b57f1b809f">
</ins><span class="cx"> </branch>
</span><span class="cx"> <dependencies>
</span><span class="cx"> <dep package="glib"/>
</span><span class="lines">@@ -299,9 +299,9 @@
</span><span class="cx"> </autotools>
</span><span class="cx">
</span><span class="cx"> <autotools id="at-spi2-atk">
</span><del>- <branch module="pub/GNOME/sources/at-spi2-atk/2.10/at-spi2-atk-2.10.0.tar.xz" version="2.10.0"
</del><ins>+ <branch module="pub/GNOME/sources/at-spi2-atk/2.15/at-spi2-atk-2.15.4.tar.xz" version="2.15.4"
</ins><span class="cx"> repo="ftp.gnome.org"
</span><del>- hash="sha256:dea7ff2f9bc9bbdb0351112616d738de718b55739cd2511afecac51604c31a94">
</del><ins>+ hash="sha256:3283aa5207b81e4c77d24c4e8b1c0abe6c850b11a2e62cd873cc07af0b403501">
</ins><span class="cx"> </branch>
</span><span class="cx"> <dependencies>
</span><span class="cx"> <dep package="glib"/>
</span></span></pre>
</div>
</div>
</body>
</html>