<!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>[159867] 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/159867">159867</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2013-11-29 03:38:18 -0800 (Fri, 29 Nov 2013)</dd>
</dl>
<h3>Log Message</h3>
<pre>[ATK] Added support for isAttributeSettable in AccessibilityUIElementAtk
https://bugs.webkit.org/show_bug.cgi?id=124923
Patch by Krzysztof Czech <k.czech@samsung.com> on 2013-11-29
Reviewed by Mario Sanchez Prada.
Tools:
Added missing implementation of isAttributeSettable. Using
ATK_STATE_EDITABLE for checking whether attribute is settable.
* DumpRenderTree/atk/AccessibilityUIElementAtk.cpp:
(AccessibilityUIElement::isAttributeSettable):
* WebKitTestRunner/InjectedBundle/atk/AccessibilityUIElementAtk.cpp:
(WTR::AccessibilityUIElement::isAttributeSettable):
LayoutTests:
Test could be reused by EFL and GTK as well.
* accessibility/content-editable-expected.txt: Renamed from LayoutTests/platform/mac/accessibility/content-editable-expected.txt.
* accessibility/content-editable.html: Renamed from LayoutTests/platform/mac/accessibility/content-editable.html.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsDumpRenderTreeatkAccessibilityUIElementAtkcpp">trunk/Tools/DumpRenderTree/atk/AccessibilityUIElementAtk.cpp</a></li>
<li><a href="#trunkToolsWebKitTestRunnerInjectedBundleatkAccessibilityUIElementAtkcpp">trunk/Tools/WebKitTestRunner/InjectedBundle/atk/AccessibilityUIElementAtk.cpp</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsaccessibilitycontenteditableexpectedtxt">trunk/LayoutTests/accessibility/content-editable-expected.txt</a></li>
<li><a href="#trunkLayoutTestsaccessibilitycontenteditablehtml">trunk/LayoutTests/accessibility/content-editable.html</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsplatformmacaccessibilitycontenteditableexpectedtxt">trunk/LayoutTests/platform/mac/accessibility/content-editable-expected.txt</a></li>
<li><a href="#trunkLayoutTestsplatformmacaccessibilitycontenteditablehtml">trunk/LayoutTests/platform/mac/accessibility/content-editable.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (159866 => 159867)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2013-11-29 10:51:50 UTC (rev 159866)
+++ trunk/LayoutTests/ChangeLog 2013-11-29 11:38:18 UTC (rev 159867)
</span><span class="lines">@@ -1,3 +1,15 @@
</span><ins>+2013-11-29 Krzysztof Czech <k.czech@samsung.com>
+
+ [ATK] Added support for isAttributeSettable in AccessibilityUIElementAtk
+ https://bugs.webkit.org/show_bug.cgi?id=124923
+
+ Reviewed by Mario Sanchez Prada.
+
+ Test could be reused by EFL and GTK as well.
+
+ * accessibility/content-editable-expected.txt: Renamed from LayoutTests/platform/mac/accessibility/content-editable-expected.txt.
+ * accessibility/content-editable.html: Renamed from LayoutTests/platform/mac/accessibility/content-editable.html.
+
</ins><span class="cx"> 2013-11-28 Antti Koivisto <antti@apple.com>
</span><span class="cx">
</span><span class="cx"> Remove an oddly named css variables test
</span></span></pre></div>
<a id="trunkLayoutTestsaccessibilitycontenteditableexpectedtxtfromrev159866trunkLayoutTestsplatformmacaccessibilitycontenteditableexpectedtxt"></a>
<div class="copfile"><h4>Copied: trunk/LayoutTests/accessibility/content-editable-expected.txt (from rev 159866, trunk/LayoutTests/platform/mac/accessibility/content-editable-expected.txt) (0 => 159867)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/accessibility/content-editable-expected.txt (rev 0)
+++ trunk/LayoutTests/accessibility/content-editable-expected.txt 2013-11-29 11:38:18 UTC (rev 159867)
</span><span class="lines">@@ -0,0 +1,4 @@
</span><ins>+Text
+Is settable: true
+
+
</ins></span></pre></div>
<a id="trunkLayoutTestsaccessibilitycontenteditablehtmlfromrev159866trunkLayoutTestsplatformmacaccessibilitycontenteditablehtml"></a>
<div class="copfile"><h4>Copied: trunk/LayoutTests/accessibility/content-editable.html (from rev 159866, trunk/LayoutTests/platform/mac/accessibility/content-editable.html) (0 => 159867)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/accessibility/content-editable.html (rev 0)
+++ trunk/LayoutTests/accessibility/content-editable.html 2013-11-29 11:38:18 UTC (rev 159867)
</span><span class="lines">@@ -0,0 +1,28 @@
</span><ins>+<html>
+<script>
+ if (window.testRunner)
+ testRunner.dumpAsText();
+</script>
+<body id="body" contenteditable>
+
+ <!-- this test should show that the iframe has a writable AXValue because it has a
+ contenteditable attribute -->
+
+ Text
+
+ <div id="result"></div>
+
+
+ <script>
+ if (window.accessibilityController) {
+ var result = document.getElementById("result");
+
+ var body = document.getElementById("body");
+ body.focus();
+ body = accessibilityController.focusedElement;
+
+ result.innerText += "Is settable: " + body.isAttributeSettable("AXValue") + "\n\n";
+ }
+ </script>
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkLayoutTestsplatformmacaccessibilitycontenteditableexpectedtxt"></a>
<div class="delfile"><h4>Deleted: trunk/LayoutTests/platform/mac/accessibility/content-editable-expected.txt (159866 => 159867)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac/accessibility/content-editable-expected.txt 2013-11-29 10:51:50 UTC (rev 159866)
+++ trunk/LayoutTests/platform/mac/accessibility/content-editable-expected.txt 2013-11-29 11:38:18 UTC (rev 159867)
</span><span class="lines">@@ -1,4 +0,0 @@
</span><del>-Text
-Is settable: true
-
-
</del></span></pre></div>
<a id="trunkLayoutTestsplatformmacaccessibilitycontenteditablehtml"></a>
<div class="delfile"><h4>Deleted: trunk/LayoutTests/platform/mac/accessibility/content-editable.html (159866 => 159867)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac/accessibility/content-editable.html 2013-11-29 10:51:50 UTC (rev 159866)
+++ trunk/LayoutTests/platform/mac/accessibility/content-editable.html 2013-11-29 11:38:18 UTC (rev 159867)
</span><span class="lines">@@ -1,28 +0,0 @@
</span><del>-<html>
-<script>
- if (window.testRunner)
- testRunner.dumpAsText();
-</script>
-<body id="body" contenteditable>
-
- <!-- this test should show that the iframe has a writable AXValue because it has a
- contenteditable attribute -->
-
- Text
-
- <div id="result"></div>
-
-
- <script>
- if (window.accessibilityController) {
- var result = document.getElementById("result");
-
- var body = document.getElementById("body");
- body.focus();
- body = accessibilityController.focusedElement;
-
- result.innerText += "Is settable: " + body.isAttributeSettable("AXValue") + "\n\n";
- }
- </script>
-</body>
-</html>
</del></span></pre></div>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (159866 => 159867)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2013-11-29 10:51:50 UTC (rev 159866)
+++ trunk/Tools/ChangeLog 2013-11-29 11:38:18 UTC (rev 159867)
</span><span class="lines">@@ -1,3 +1,18 @@
</span><ins>+2013-11-29 Krzysztof Czech <k.czech@samsung.com>
+
+ [ATK] Added support for isAttributeSettable in AccessibilityUIElementAtk
+ https://bugs.webkit.org/show_bug.cgi?id=124923
+
+ Reviewed by Mario Sanchez Prada.
+
+ Added missing implementation of isAttributeSettable. Using
+ ATK_STATE_EDITABLE for checking whether attribute is settable.
+
+ * DumpRenderTree/atk/AccessibilityUIElementAtk.cpp:
+ (AccessibilityUIElement::isAttributeSettable):
+ * WebKitTestRunner/InjectedBundle/atk/AccessibilityUIElementAtk.cpp:
+ (WTR::AccessibilityUIElement::isAttributeSettable):
+
</ins><span class="cx"> 2013-11-28 Commit Queue <commit-queue@webkit.org>
</span><span class="cx">
</span><span class="cx"> Unreviewed, rolling out r159839.
</span></span></pre></div>
<a id="trunkToolsDumpRenderTreeatkAccessibilityUIElementAtkcpp"></a>
<div class="modfile"><h4>Modified: trunk/Tools/DumpRenderTree/atk/AccessibilityUIElementAtk.cpp (159866 => 159867)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/DumpRenderTree/atk/AccessibilityUIElementAtk.cpp 2013-11-29 10:51:50 UTC (rev 159866)
+++ trunk/Tools/DumpRenderTree/atk/AccessibilityUIElementAtk.cpp 2013-11-29 11:38:18 UTC (rev 159867)
</span><span class="lines">@@ -81,13 +81,18 @@
</span><span class="cx"> { "AXUnknownSortDirection", "unknown" }
</span><span class="cx"> };
</span><span class="cx">
</span><del>-String coreAttributeToAtkAttribute(JSStringRef attribute)
</del><ins>+String jsStringToWTFString(JSStringRef attribute)
</ins><span class="cx"> {
</span><span class="cx"> size_t bufferSize = JSStringGetMaximumUTF8CStringSize(attribute);
</span><span class="cx"> GOwnPtr<gchar> buffer(static_cast<gchar*>(g_malloc(bufferSize)));
</span><span class="cx"> JSStringGetUTF8CString(attribute, buffer.get(), bufferSize);
</span><span class="cx">
</span><del>- String attributeString = String::fromUTF8(buffer.get());
</del><ins>+ return String::fromUTF8(buffer.get());
+}
+
+String coreAttributeToAtkAttribute(JSStringRef attribute)
+{
+ String attributeString = jsStringToWTFString(attribute);
</ins><span class="cx"> for (int i = 0; i < NumberOfAttributes; ++i) {
</span><span class="cx"> if (attributesMap[i][CoreDomain] == attributeString)
</span><span class="cx"> return attributesMap[i][AtkDomain];
</span><span class="lines">@@ -1169,7 +1174,13 @@
</span><span class="cx">
</span><span class="cx"> bool AccessibilityUIElement::isAttributeSettable(JSStringRef attribute)
</span><span class="cx"> {
</span><del>- // FIXME: implement
</del><ins>+ if (!ATK_IS_OBJECT(m_element))
+ return false;
+
+ String attributeString = jsStringToWTFString(attribute);
+ if (attributeString == "AXValue")
+ return checkElementState(m_element, ATK_STATE_EDITABLE);
+
</ins><span class="cx"> return false;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkToolsWebKitTestRunnerInjectedBundleatkAccessibilityUIElementAtkcpp"></a>
<div class="modfile"><h4>Modified: trunk/Tools/WebKitTestRunner/InjectedBundle/atk/AccessibilityUIElementAtk.cpp (159866 => 159867)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/WebKitTestRunner/InjectedBundle/atk/AccessibilityUIElementAtk.cpp 2013-11-29 10:51:50 UTC (rev 159866)
+++ trunk/Tools/WebKitTestRunner/InjectedBundle/atk/AccessibilityUIElementAtk.cpp 2013-11-29 11:38:18 UTC (rev 159867)
</span><span class="lines">@@ -85,13 +85,18 @@
</span><span class="cx"> { "AXUnknownSortDirection", "unknown" }
</span><span class="cx"> };
</span><span class="cx">
</span><del>-String coreAttributeToAtkAttribute(JSStringRef attribute)
</del><ins>+String jsStringToWTFString(JSStringRef attribute)
</ins><span class="cx"> {
</span><span class="cx"> size_t bufferSize = JSStringGetMaximumUTF8CStringSize(attribute);
</span><span class="cx"> GOwnPtr<gchar> buffer(static_cast<gchar*>(g_malloc(bufferSize)));
</span><span class="cx"> JSStringGetUTF8CString(attribute, buffer.get(), bufferSize);
</span><span class="cx">
</span><del>- String attributeString = String::fromUTF8(buffer.get());
</del><ins>+ return String::fromUTF8(buffer.get());
+}
+
+String coreAttributeToAtkAttribute(JSStringRef attribute)
+{
+ String attributeString = jsStringToWTFString(attribute);
</ins><span class="cx"> for (int i = 0; i < NumberOfAttributes; ++i) {
</span><span class="cx"> if (attributesMap[i][CoreDomain] == attributeString)
</span><span class="cx"> return attributesMap[i][AtkDomain];
</span><span class="lines">@@ -751,7 +756,13 @@
</span><span class="cx">
</span><span class="cx"> bool AccessibilityUIElement::isAttributeSettable(JSStringRef attribute)
</span><span class="cx"> {
</span><del>- // FIXME: implement
</del><ins>+ if (!ATK_IS_OBJECT(m_element.get()))
+ return false;
+
+ String attributeString = jsStringToWTFString(attribute);
+ if (attributeString == "AXValue")
+ return checkElementState(m_element.get(), ATK_STATE_EDITABLE);
+
</ins><span class="cx"> return false;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>