<!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>[215236] 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/215236">215236</a></dd>
<dt>Author</dt> <dd>cfleizach@apple.com</dd>
<dt>Date</dt> <dd>2017-04-11 10:00:29 -0700 (Tue, 11 Apr 2017)</dd>
</dl>

<h3>Log Message</h3>
<pre>AX: Web article navigation does not work (article rotor for Facebook, Twitter, Messages etc.)
https://bugs.webkit.org/show_bug.cgi?id=170330
&lt;rdar://problem/31366105&gt;

Reviewed by Joanmarie Diggs.

Source/WebCore:

Add a search ability for the &quot;article&quot; role.

Test: accessibility/mac/search-predicate-article.html

* accessibility/AccessibilityObject.cpp:
(WebCore::AccessibilityObject::isAccessibilityObjectSearchMatchAtIndex):
* accessibility/AccessibilityObject.h:
* accessibility/ios/WebAccessibilityObjectWrapperIOS.mm:
(-[WebAccessibilityObjectWrapper _accessibilityArticleAncestor]):
* accessibility/mac/WebAccessibilityObjectWrapperBase.mm:
(createAccessibilitySearchKeyMap):

LayoutTests:

* accessibility/mac/search-predicate-article-expected.txt:
* accessibility/mac/search-predicate-article.html:</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreaccessibilityAccessibilityObjectcpp">trunk/Source/WebCore/accessibility/AccessibilityObject.cpp</a></li>
<li><a href="#trunkSourceWebCoreaccessibilityAccessibilityObjecth">trunk/Source/WebCore/accessibility/AccessibilityObject.h</a></li>
<li><a href="#trunkSourceWebCoreaccessibilityiosWebAccessibilityObjectWrapperIOSmm">trunk/Source/WebCore/accessibility/ios/WebAccessibilityObjectWrapperIOS.mm</a></li>
<li><a href="#trunkSourceWebCoreaccessibilitymacWebAccessibilityObjectWrapperBasemm">trunk/Source/WebCore/accessibility/mac/WebAccessibilityObjectWrapperBase.mm</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (215235 => 215236)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog        2017-04-11 16:54:49 UTC (rev 215235)
+++ trunk/LayoutTests/ChangeLog        2017-04-11 17:00:29 UTC (rev 215236)
</span><span class="lines">@@ -1,3 +1,14 @@
</span><ins>+2017-04-11  Chris Fleizach  &lt;cfleizach@apple.com&gt;
+
+        AX: Web article navigation does not work (article rotor for Facebook, Twitter, Messages etc.)
+        https://bugs.webkit.org/show_bug.cgi?id=170330
+        &lt;rdar://problem/31366105&gt;
+
+        Reviewed by Joanmarie Diggs.
+
+        * accessibility/mac/search-predicate-article-expected.txt:
+        * accessibility/mac/search-predicate-article.html:
+
</ins><span class="cx"> 2017-04-11  Joseph Pecoraro  &lt;pecoraro@apple.com&gt;
</span><span class="cx"> 
</span><span class="cx">         test262: test262/test/annexB/language/comments/multi-line-html-close.js
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (215235 => 215236)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog        2017-04-11 16:54:49 UTC (rev 215235)
+++ trunk/Source/WebCore/ChangeLog        2017-04-11 17:00:29 UTC (rev 215236)
</span><span class="lines">@@ -1,5 +1,25 @@
</span><span class="cx"> 2017-04-11  Chris Fleizach  &lt;cfleizach@apple.com&gt;
</span><span class="cx"> 
</span><ins>+        AX: Web article navigation does not work (article rotor for Facebook, Twitter, Messages etc.)
+        https://bugs.webkit.org/show_bug.cgi?id=170330
+        &lt;rdar://problem/31366105&gt;
+
+        Reviewed by Joanmarie Diggs.
+
+        Add a search ability for the &quot;article&quot; role.
+
+        Test: accessibility/mac/search-predicate-article.html
+
+        * accessibility/AccessibilityObject.cpp:
+        (WebCore::AccessibilityObject::isAccessibilityObjectSearchMatchAtIndex):
+        * accessibility/AccessibilityObject.h:
+        * accessibility/ios/WebAccessibilityObjectWrapperIOS.mm:
+        (-[WebAccessibilityObjectWrapper _accessibilityArticleAncestor]):
+        * accessibility/mac/WebAccessibilityObjectWrapperBase.mm:
+        (createAccessibilitySearchKeyMap):
+
+2017-04-11  Chris Fleizach  &lt;cfleizach@apple.com&gt;
+
</ins><span class="cx">         AX: PDF plugin needs to support PDF-DOM Mode
</span><span class="cx">         https://bugs.webkit.org/show_bug.cgi?id=170589
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkSourceWebCoreaccessibilityAccessibilityObjectcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/accessibility/AccessibilityObject.cpp (215235 => 215236)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/accessibility/AccessibilityObject.cpp        2017-04-11 16:54:49 UTC (rev 215235)
+++ trunk/Source/WebCore/accessibility/AccessibilityObject.cpp        2017-04-11 17:00:29 UTC (rev 215236)
</span><span class="lines">@@ -128,6 +128,9 @@
</span><span class="cx">     case AnyTypeSearchKey:
</span><span class="cx">         return true;
</span><span class="cx">         
</span><ins>+    case ArticleSearchKey:
+        return axObject-&gt;roleValue() == DocumentArticleRole;
+            
</ins><span class="cx">     case BlockquoteSameLevelSearchKey:
</span><span class="cx">         return criteria-&gt;startObject
</span><span class="cx">             &amp;&amp; axObject-&gt;isBlockquote()
</span></span></pre></div>
<a id="trunkSourceWebCoreaccessibilityAccessibilityObjecth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/accessibility/AccessibilityObject.h (215235 => 215236)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/accessibility/AccessibilityObject.h        2017-04-11 16:54:49 UTC (rev 215235)
+++ trunk/Source/WebCore/accessibility/AccessibilityObject.h        2017-04-11 17:00:29 UTC (rev 215236)
</span><span class="lines">@@ -315,6 +315,7 @@
</span><span class="cx"> 
</span><span class="cx"> enum AccessibilitySearchKey {
</span><span class="cx">     AnyTypeSearchKey = 1,
</span><ins>+    ArticleSearchKey,
</ins><span class="cx">     BlockquoteSameLevelSearchKey,
</span><span class="cx">     BlockquoteSearchKey,
</span><span class="cx">     BoldFontSearchKey,
</span></span></pre></div>
<a id="trunkSourceWebCoreaccessibilityiosWebAccessibilityObjectWrapperIOSmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/accessibility/ios/WebAccessibilityObjectWrapperIOS.mm (215235 => 215236)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/accessibility/ios/WebAccessibilityObjectWrapperIOS.mm        2017-04-11 16:54:49 UTC (rev 215235)
+++ trunk/Source/WebCore/accessibility/ios/WebAccessibilityObjectWrapperIOS.mm        2017-04-11 17:00:29 UTC (rev 215236)
</span><span class="lines">@@ -555,6 +555,15 @@
</span><span class="cx">     return nil;
</span><span class="cx"> }
</span><span class="cx"> 
</span><ins>+- (AccessibilityObjectWrapper*)_accessibilityArticleAncestor
+{
+    if (const AccessibilityObject* parent = AccessibilityObject::matchedParent(*m_object, false, [self] (const AccessibilityObject&amp; object) {
+        return object.roleValue() == DocumentArticleRole;
+    }))
+        return parent-&gt;wrapper();
+    return nil;
+}
+
</ins><span class="cx"> - (AccessibilityObjectWrapper*)_accessibilityLandmarkAncestor
</span><span class="cx"> {
</span><span class="cx">     if (const AccessibilityObject* parent = AccessibilityObject::matchedParent(*m_object, false, [self] (const AccessibilityObject&amp; object) {
</span></span></pre></div>
<a id="trunkSourceWebCoreaccessibilitymacWebAccessibilityObjectWrapperBasemm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/accessibility/mac/WebAccessibilityObjectWrapperBase.mm (215235 => 215236)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/accessibility/mac/WebAccessibilityObjectWrapperBase.mm        2017-04-11 16:54:49 UTC (rev 215235)
+++ trunk/Source/WebCore/accessibility/mac/WebAccessibilityObjectWrapperBase.mm        2017-04-11 17:00:29 UTC (rev 215236)
</span><span class="lines">@@ -72,6 +72,10 @@
</span><span class="cx"> #define NSAccessibilityAnyTypeSearchKey @&quot;AXAnyTypeSearchKey&quot;
</span><span class="cx"> #endif
</span><span class="cx"> 
</span><ins>+#ifndef NSAccessibilityArticleSearchKey
+#define NSAccessibilityArticleSearchKey @&quot;AXArticleSearchKey&quot;
+#endif
+
</ins><span class="cx"> #ifndef NSAccessibilityBlockquoteSameLevelSearchKey
</span><span class="cx"> #define NSAccessibilityBlockquoteSameLevelSearchKey @&quot;AXBlockquoteSameLevelSearchKey&quot;
</span><span class="cx"> #endif
</span><span class="lines">@@ -649,6 +653,7 @@
</span><span class="cx"> {
</span><span class="cx">     const SearchKeyEntry searchKeys[] = {
</span><span class="cx">         { NSAccessibilityAnyTypeSearchKey, AnyTypeSearchKey },
</span><ins>+        { NSAccessibilityArticleSearchKey, ArticleSearchKey },
</ins><span class="cx">         { NSAccessibilityBlockquoteSameLevelSearchKey, BlockquoteSameLevelSearchKey },
</span><span class="cx">         { NSAccessibilityBlockquoteSearchKey, BlockquoteSearchKey },
</span><span class="cx">         { NSAccessibilityBoldFontSearchKey, BoldFontSearchKey },
</span></span></pre>
</div>
</div>

</body>
</html>