- Revision
- 215236
- Author
- [email protected]
- Date
- 2017-04-11 10:00:29 -0700 (Tue, 11 Apr 2017)
Log Message
AX: Web article navigation does not work (article rotor for Facebook, Twitter, Messages etc.)
https://bugs.webkit.org/show_bug.cgi?id=170330
<rdar://problem/31366105>
Reviewed by Joanmarie Diggs.
Source/WebCore:
Add a search ability for the "article" 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:
Modified Paths
Diff
Modified: trunk/LayoutTests/ChangeLog (215235 => 215236)
--- trunk/LayoutTests/ChangeLog 2017-04-11 16:54:49 UTC (rev 215235)
+++ trunk/LayoutTests/ChangeLog 2017-04-11 17:00:29 UTC (rev 215236)
@@ -1,3 +1,14 @@
+2017-04-11 Chris Fleizach <[email protected]>
+
+ AX: Web article navigation does not work (article rotor for Facebook, Twitter, Messages etc.)
+ https://bugs.webkit.org/show_bug.cgi?id=170330
+ <rdar://problem/31366105>
+
+ Reviewed by Joanmarie Diggs.
+
+ * accessibility/mac/search-predicate-article-expected.txt:
+ * accessibility/mac/search-predicate-article.html:
+
2017-04-11 Joseph Pecoraro <[email protected]>
test262: test262/test/annexB/language/comments/multi-line-html-close.js
Modified: trunk/Source/WebCore/ChangeLog (215235 => 215236)
--- 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)
@@ -1,5 +1,25 @@
2017-04-11 Chris Fleizach <[email protected]>
+ AX: Web article navigation does not work (article rotor for Facebook, Twitter, Messages etc.)
+ https://bugs.webkit.org/show_bug.cgi?id=170330
+ <rdar://problem/31366105>
+
+ Reviewed by Joanmarie Diggs.
+
+ Add a search ability for the "article" 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 <[email protected]>
+
AX: PDF plugin needs to support PDF-DOM Mode
https://bugs.webkit.org/show_bug.cgi?id=170589
Modified: trunk/Source/WebCore/accessibility/AccessibilityObject.cpp (215235 => 215236)
--- 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)
@@ -128,6 +128,9 @@
case AnyTypeSearchKey:
return true;
+ case ArticleSearchKey:
+ return axObject->roleValue() == DocumentArticleRole;
+
case BlockquoteSameLevelSearchKey:
return criteria->startObject
&& axObject->isBlockquote()
Modified: trunk/Source/WebCore/accessibility/AccessibilityObject.h (215235 => 215236)
--- 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)
@@ -315,6 +315,7 @@
enum AccessibilitySearchKey {
AnyTypeSearchKey = 1,
+ ArticleSearchKey,
BlockquoteSameLevelSearchKey,
BlockquoteSearchKey,
BoldFontSearchKey,
Modified: trunk/Source/WebCore/accessibility/ios/WebAccessibilityObjectWrapperIOS.mm (215235 => 215236)
--- 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)
@@ -555,6 +555,15 @@
return nil;
}
+- (AccessibilityObjectWrapper*)_accessibilityArticleAncestor
+{
+ if (const AccessibilityObject* parent = AccessibilityObject::matchedParent(*m_object, false, [self] (const AccessibilityObject& object) {
+ return object.roleValue() == DocumentArticleRole;
+ }))
+ return parent->wrapper();
+ return nil;
+}
+
- (AccessibilityObjectWrapper*)_accessibilityLandmarkAncestor
{
if (const AccessibilityObject* parent = AccessibilityObject::matchedParent(*m_object, false, [self] (const AccessibilityObject& object) {
Modified: trunk/Source/WebCore/accessibility/mac/WebAccessibilityObjectWrapperBase.mm (215235 => 215236)
--- 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)
@@ -72,6 +72,10 @@
#define NSAccessibilityAnyTypeSearchKey @"AXAnyTypeSearchKey"
#endif
+#ifndef NSAccessibilityArticleSearchKey
+#define NSAccessibilityArticleSearchKey @"AXArticleSearchKey"
+#endif
+
#ifndef NSAccessibilityBlockquoteSameLevelSearchKey
#define NSAccessibilityBlockquoteSameLevelSearchKey @"AXBlockquoteSameLevelSearchKey"
#endif
@@ -649,6 +653,7 @@
{
const SearchKeyEntry searchKeys[] = {
{ NSAccessibilityAnyTypeSearchKey, AnyTypeSearchKey },
+ { NSAccessibilityArticleSearchKey, ArticleSearchKey },
{ NSAccessibilityBlockquoteSameLevelSearchKey, BlockquoteSameLevelSearchKey },
{ NSAccessibilityBlockquoteSearchKey, BlockquoteSearchKey },
{ NSAccessibilityBoldFontSearchKey, BoldFontSearchKey },
