<!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>[176556] 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/176556">176556</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2014-11-28 01:00:54 -0800 (Fri, 28 Nov 2014)</dd>
</dl>

<h3>Log Message</h3>
<pre>[ATK] Allowing the use of AccessibilityUIElement::columnHeaders method for table.
https://bugs.webkit.org/show_bug.cgi?id=139044

Patch by Andrzej Badowski &lt;a.badowski@samsung.com&gt; on 2014-11-28
Reviewed by Chris Fleizach.

ATK method AccessibilityUIElement::columnHeaders currently focused only on the object table cell.
The proposed solution will enable the use of this method for the object table.
Existing test shows the result.

Tools:

* WebKitTestRunner/InjectedBundle/atk/AccessibilityUIElementAtk.cpp:
(WTR::AccessibilityUIElement::columnHeaders):

LayoutTests:

* accessibility/table-column-headers-with-captions.html: Updated for ATK platform.
* platform/efl/accessibility/table-column-headers-with-captions-expected.txt: Added.
* platform/gtk/TestExpectations: Updated for GTK.
* platform/gtk/accessibility/table-column-headers-with-captions-expected.txt: Added.</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsaccessibilitytablecolumnheaderswithcaptionshtml">trunk/LayoutTests/accessibility/table-column-headers-with-captions.html</a></li>
<li><a href="#trunkLayoutTestsplatformgtkTestExpectations">trunk/LayoutTests/platform/gtk/TestExpectations</a></li>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsWebKitTestRunnerInjectedBundleatkAccessibilityUIElementAtkcpp">trunk/Tools/WebKitTestRunner/InjectedBundle/atk/AccessibilityUIElementAtk.cpp</a></li>
</ul>

<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsplatformeflaccessibilitytablecolumnheaderswithcaptionsexpectedtxt">trunk/LayoutTests/platform/efl/accessibility/table-column-headers-with-captions-expected.txt</a></li>
<li><a href="#trunkLayoutTestsplatformgtkaccessibilitytablecolumnheaderswithcaptionsexpectedtxt">trunk/LayoutTests/platform/gtk/accessibility/table-column-headers-with-captions-expected.txt</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (176555 => 176556)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog        2014-11-28 07:04:09 UTC (rev 176555)
+++ trunk/LayoutTests/ChangeLog        2014-11-28 09:00:54 UTC (rev 176556)
</span><span class="lines">@@ -1,3 +1,19 @@
</span><ins>+2014-11-28  Andrzej Badowski  &lt;a.badowski@samsung.com&gt;
+
+        [ATK] Allowing the use of AccessibilityUIElement::columnHeaders method for table.
+        https://bugs.webkit.org/show_bug.cgi?id=139044
+
+        Reviewed by Chris Fleizach.
+
+        ATK method AccessibilityUIElement::columnHeaders currently focused only on the object table cell.
+        The proposed solution will enable the use of this method for the object table.
+        Existing test shows the result.
+
+        * accessibility/table-column-headers-with-captions.html: Updated for ATK platform.
+        * platform/efl/accessibility/table-column-headers-with-captions-expected.txt: Added.
+        * platform/gtk/TestExpectations: Updated for GTK.
+        * platform/gtk/accessibility/table-column-headers-with-captions-expected.txt: Added.
+
</ins><span class="cx"> 2014-11-27  Joanmarie Diggs  &lt;jdiggs@igalia.com&gt;
</span><span class="cx"> 
</span><span class="cx">         AX: [ATK] Meter and Option elements do not expose their id attribute
</span></span></pre></div>
<a id="trunkLayoutTestsaccessibilitytablecolumnheaderswithcaptionshtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/accessibility/table-column-headers-with-captions.html (176555 => 176556)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/accessibility/table-column-headers-with-captions.html        2014-11-28 07:04:09 UTC (rev 176555)
+++ trunk/LayoutTests/accessibility/table-column-headers-with-captions.html        2014-11-28 09:00:54 UTC (rev 176556)
</span><span class="lines">@@ -26,9 +26,13 @@
</span><span class="cx"> 
</span><span class="cx">         var table = accessibilityController.accessibleElementById(&quot;table&quot;);
</span><span class="cx">         var colHeaders = table.columnHeaders();
</span><del>-
-        shouldBeTrue(&quot;colHeaders[0].isEqual(table.rowAtIndex(0).childAtIndex(0))&quot;);
-        shouldBeTrue(&quot;colHeaders[1].isEqual(table.rowAtIndex(0).childAtIndex(1))&quot;);
</del><ins>+        if (accessibilityController.platformName == &quot;atk&quot;) {
+            shouldBeTrue(&quot;colHeaders[0].isEqual(table.cellForColumnAndRow(0,0))&quot;);
+            shouldBeTrue(&quot;colHeaders[1].isEqual(table.cellForColumnAndRow(1,0))&quot;);
+        } else {
+            shouldBeTrue(&quot;colHeaders[0].isEqual(table.rowAtIndex(0).childAtIndex(0))&quot;);
+            shouldBeTrue(&quot;colHeaders[1].isEqual(table.rowAtIndex(0).childAtIndex(1))&quot;);
+        }
</ins><span class="cx">     }
</span><span class="cx"> 
</span><span class="cx"> &lt;/script&gt;
</span></span></pre></div>
<a id="trunkLayoutTestsplatformeflaccessibilitytablecolumnheaderswithcaptionsexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/platform/efl/accessibility/table-column-headers-with-captions-expected.txt (0 => 176556)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/efl/accessibility/table-column-headers-with-captions-expected.txt                                (rev 0)
+++ trunk/LayoutTests/platform/efl/accessibility/table-column-headers-with-captions-expected.txt        2014-11-28 09:00:54 UTC (rev 176556)
</span><span class="lines">@@ -0,0 +1,14 @@
</span><ins>+caption
+header1        header2
+a        b
+This tests that a table with a caption and an empty colgroup will still correctly report its headers.
+
+On success, you will see a series of &quot;PASS&quot; messages, followed by &quot;TEST COMPLETE&quot;.
+
+
+PASS colHeaders[0].isEqual(table.cellForColumnAndRow(0,0)) is true
+PASS colHeaders[1].isEqual(table.cellForColumnAndRow(1,0)) is true
+PASS successfullyParsed is true
+
+TEST COMPLETE
+
</ins></span></pre></div>
<a id="trunkLayoutTestsplatformgtkTestExpectations"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/gtk/TestExpectations (176555 => 176556)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/gtk/TestExpectations        2014-11-28 07:04:09 UTC (rev 176555)
+++ trunk/LayoutTests/platform/gtk/TestExpectations        2014-11-28 09:00:54 UTC (rev 176556)
</span><span class="lines">@@ -2231,7 +2231,6 @@
</span><span class="cx"> webkit.org/b/136754 css3/flexbox/csswg/flexbox_direction-row-reverse.html [ ImageOnlyFailure ]
</span><span class="cx"> 
</span><span class="cx"> webkit.org/b/137109 accessibility/legend-children-are-visible.html [ Failure ]
</span><del>-webkit.org/b/138069 accessibility/table-column-headers-with-captions.html [ Failure ]
</del><span class="cx"> 
</span><span class="cx"> webkit.org/b/137695 media/video-controls-audiotracks-trackmenu.html [ Failure ]
</span><span class="cx"> webkit.org/b/138074 media/video-volume-slider-drag.html [ Failure ]
</span></span></pre></div>
<a id="trunkLayoutTestsplatformgtkaccessibilitytablecolumnheaderswithcaptionsexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/platform/gtk/accessibility/table-column-headers-with-captions-expected.txt (0 => 176556)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/gtk/accessibility/table-column-headers-with-captions-expected.txt                                (rev 0)
+++ trunk/LayoutTests/platform/gtk/accessibility/table-column-headers-with-captions-expected.txt        2014-11-28 09:00:54 UTC (rev 176556)
</span><span class="lines">@@ -0,0 +1,14 @@
</span><ins>+caption
+header1        header2
+a        b
+This tests that a table with a caption and an empty colgroup will still correctly report its headers.
+
+On success, you will see a series of &quot;PASS&quot; messages, followed by &quot;TEST COMPLETE&quot;.
+
+
+PASS colHeaders[0].isEqual(table.cellForColumnAndRow(0,0)) is true
+PASS colHeaders[1].isEqual(table.cellForColumnAndRow(1,0)) is true
+PASS successfullyParsed is true
+
+TEST COMPLETE
+
</ins></span></pre></div>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (176555 => 176556)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog        2014-11-28 07:04:09 UTC (rev 176555)
+++ trunk/Tools/ChangeLog        2014-11-28 09:00:54 UTC (rev 176556)
</span><span class="lines">@@ -1,3 +1,17 @@
</span><ins>+2014-11-28  Andrzej Badowski  &lt;a.badowski@samsung.com&gt;
+
+        [ATK] Allowing the use of AccessibilityUIElement::columnHeaders method for table.
+        https://bugs.webkit.org/show_bug.cgi?id=139044
+
+        Reviewed by Chris Fleizach.
+
+        ATK method AccessibilityUIElement::columnHeaders currently focused only on the object table cell.
+        The proposed solution will enable the use of this method for the object table.
+        Existing test shows the result.
+
+        * WebKitTestRunner/InjectedBundle/atk/AccessibilityUIElementAtk.cpp:
+        (WTR::AccessibilityUIElement::columnHeaders):
+
</ins><span class="cx"> 2014-11-27  Ryuan Choi  &lt;ryuan.choi@navercorp.com&gt;
</span><span class="cx"> 
</span><span class="cx">         [EFL] Remove E_Dbus dependency
</span></span></pre></div>
<a id="trunkToolsWebKitTestRunnerInjectedBundleatkAccessibilityUIElementAtkcpp"></a>
<div class="modfile"><h4>Modified: trunk/Tools/WebKitTestRunner/InjectedBundle/atk/AccessibilityUIElementAtk.cpp (176555 => 176556)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/WebKitTestRunner/InjectedBundle/atk/AccessibilityUIElementAtk.cpp        2014-11-28 07:04:09 UTC (rev 176555)
+++ trunk/Tools/WebKitTestRunner/InjectedBundle/atk/AccessibilityUIElementAtk.cpp        2014-11-28 09:00:54 UTC (rev 176556)
</span><span class="lines">@@ -955,14 +955,18 @@
</span><span class="cx"> JSValueRef AccessibilityUIElement::columnHeaders() const
</span><span class="cx"> {
</span><span class="cx"> #if ATK_CHECK_VERSION(2,11,90)
</span><del>-    if (!ATK_IS_TABLE_CELL(m_element.get()))
</del><ins>+    if (!ATK_IS_TABLE_CELL(m_element.get()) &amp;&amp; !ATK_IS_TABLE(m_element.get()))
</ins><span class="cx">         return nullptr;
</span><span class="cx"> 
</span><del>-    GRefPtr&lt;GPtrArray&gt; array = adoptGRef(atk_table_cell_get_column_header_cells(ATK_TABLE_CELL(m_element.get())));
-    if (!array)
-        return nullptr;
</del><ins>+    Vector&lt;RefPtr&lt;AccessibilityUIElement&gt;&gt; columns;
+    if (ATK_IS_TABLE_CELL(m_element.get())) {
+        GRefPtr&lt;GPtrArray&gt; array = adoptGRef(atk_table_cell_get_column_header_cells(ATK_TABLE_CELL(m_element.get())));
+        if (!array)
+            return nullptr;
</ins><span class="cx"> 
</span><del>-    Vector&lt;RefPtr&lt;AccessibilityUIElement&gt;&gt; columns = convertGPtrArrayToVector(array.get());
</del><ins>+        columns = convertGPtrArrayToVector(array.get());
+    } else
+        columns = getColumnHeaders(ATK_TABLE(m_element.get()));
</ins><span class="cx">     return convertToJSObjectArray(columns);
</span><span class="cx"> #else
</span><span class="cx">     return nullptr;
</span></span></pre>
</div>
</div>

</body>
</html>